diff options
Diffstat (limited to 'src/CommonAPI/DBus/DBusFunctionalHash.cpp')
| -rw-r--r-- | src/CommonAPI/DBus/DBusFunctionalHash.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/CommonAPI/DBus/DBusFunctionalHash.cpp b/src/CommonAPI/DBus/DBusFunctionalHash.cpp index c02150a..7e5dad0 100644 --- a/src/CommonAPI/DBus/DBusFunctionalHash.cpp +++ b/src/CommonAPI/DBus/DBusFunctionalHash.cpp @@ -3,8 +3,6 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -#include <cstring> - #include <murmurhash/MurmurHash3.h> #include <CommonAPI/Logger.hpp> @@ -33,10 +31,10 @@ size_t hash<pair<const char*, const char*> >::operator()(const pair<const char*, uint32_t seed = static_cast<uint32_t>(SMHASHER_SEED_VALUE); if (NULL != a) { - MurmurHash3_x86_32(a, static_cast<unsigned int>(strlen(a)), seed, &seed); + MurmurHash3_x86_32(a, static_cast<unsigned int>(std::string(a).length()), seed, &seed); } if (NULL != b) { - MurmurHash3_x86_32(b, static_cast<unsigned int>(strlen(b)), seed, &seed); + MurmurHash3_x86_32(b, static_cast<unsigned int>(std::string(b).length()), seed, &seed); } return static_cast<size_t>(seed); @@ -44,7 +42,7 @@ size_t hash<pair<const char*, const char*> >::operator()(const pair<const char*, size_t hash<const char*>::operator()(const char* const t) const { uint32_t seed = static_cast<uint32_t>(SMHASHER_SEED_VALUE); - MurmurHash3_x86_32(t, static_cast<unsigned int>(strlen(t)), seed, &seed); + MurmurHash3_x86_32(t, static_cast<unsigned int>(std::string(t).length()), seed, &seed); return static_cast<size_t>(seed); } @@ -122,7 +120,7 @@ bool equal_to<pair<const char*, const char*> >::operator()(const pair<const char if (a.first == b.first && a.second == b.second) return true; - return !strcmp(a.first, b.first) && !strcmp(a.second, b.second); + return (std::string(a.first) == std::string(b.first)) && (std::string(a.second) == std::string(b.second)); } } // namespace std |