From: Chandler Carruth Date: Sun, 4 Mar 2012 10:23:15 +0000 (+0000) Subject: Teach the hashing facilities how to hash std::string objects. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9406da6e664a24c8e408cbba63daf162ca166ed9;p=oota-llvm.git Teach the hashing facilities how to hash std::string objects. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@152000 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/ADT/Hashing.h b/include/llvm/ADT/Hashing.h index 7bb540e8331..e4dc613652d 100644 --- a/include/llvm/ADT/Hashing.h +++ b/include/llvm/ADT/Hashing.h @@ -124,6 +124,10 @@ template hash_code hash_value(const T *ptr); template hash_code hash_value(const std::pair &arg); +/// \brief Compute a hash_code for a standard string. +template +hash_code hash_value(const std::basic_string &arg); + /// \brief Override the execution seed with a fixed value. /// @@ -748,6 +752,13 @@ hash_code hash_value(const std::pair &arg) { return hash_combine(arg.first, arg.second); } +// Declared and documented above, but defined here so that any of the hashing +// infrastructure is available. +template +hash_code hash_value(const std::basic_string &arg) { + return hash_combine_range(arg.begin(), arg.end()); +} + } // namespace llvm #endif diff --git a/unittests/ADT/HashingTest.cpp b/unittests/ADT/HashingTest.cpp index f00cac253f5..f5d6aed5b99 100644 --- a/unittests/ADT/HashingTest.cpp +++ b/unittests/ADT/HashingTest.cpp @@ -97,6 +97,23 @@ TEST(HashingTest, HashValueStdPair) { hash_value(std::make_pair(obj1, std::make_pair(obj2, obj3)))); } +TEST(HashingTest, HashValueStdString) { + std::string s = "Hello World!"; + EXPECT_EQ(hash_combine_range(s.c_str(), s.c_str() + s.size()), hash_value(s)); + EXPECT_EQ(hash_combine_range(s.c_str(), s.c_str() + s.size() - 1), + hash_value(s.substr(0, s.size() - 1))); + EXPECT_EQ(hash_combine_range(s.c_str() + 1, s.c_str() + s.size() - 1), + hash_value(s.substr(1, s.size() - 2))); + + std::wstring ws = L"Hello Wide World!"; + EXPECT_EQ(hash_combine_range(ws.c_str(), ws.c_str() + ws.size()), + hash_value(ws)); + EXPECT_EQ(hash_combine_range(ws.c_str(), ws.c_str() + ws.size() - 1), + hash_value(ws.substr(0, ws.size() - 1))); + EXPECT_EQ(hash_combine_range(ws.c_str() + 1, ws.c_str() + ws.size() - 1), + hash_value(ws.substr(1, ws.size() - 2))); +} + template T *begin(T (&arr)[N]) { return arr; } template T *end(T (&arr)[N]) { return arr + N; }