Browse Source

Stop providing non-inlined MurmurHashSizeT

ref:7e797cda3221e4c1905f5e443a9342db82e66883
thegeorg 2 years ago
parent
commit
0b1d6ef63f
3 changed files with 6 additions and 10 deletions
  1. 1 3
      util/digest/murmur.cpp
  2. 2 5
      util/digest/murmur.h
  3. 3 2
      util/generic/string_hash.h

+ 1 - 3
util/digest/murmur.cpp

@@ -126,6 +126,4 @@ namespace NMurmurPrivate {
     }
 }
 
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept {
-    return MurmurHash<size_t>(buf, len);
-}
+template size_t MurmurHash<size_t>(const void* buf, size_t len) noexcept;

+ 2 - 5
util/digest/murmur.h

@@ -30,18 +30,15 @@ namespace NMurmurPrivate {
 }
 
 template <class T>
-static inline T MurmurHash(const void* buf, size_t len, T init) noexcept {
+inline T MurmurHash(const void* buf, size_t len, T init) noexcept {
     return (T)NMurmurPrivate::TMurHelper<8 * sizeof(T)>::MurmurHash(buf, len, init);
 }
 
 template <class T>
-static inline T MurmurHash(const void* buf, size_t len) noexcept {
+inline T MurmurHash(const void* buf, size_t len) noexcept {
     return MurmurHash<T>(buf, len, (T)0);
 }
 
-//non-inline version
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept;
-
 template <typename TOut = size_t>
 struct TMurmurHash {
     TOut operator()(const void* buf, size_t len) const noexcept {

+ 3 - 2
util/generic/string_hash.h

@@ -6,7 +6,8 @@
 #if defined(_64_) && !defined(NO_CITYHASH)
 ui64 CityHash64(const char* buf, size_t len) noexcept;
 #else
-size_t MurmurHashSizeT(const char* buf, size_t len) noexcept;
+template <typename T>
+T MurmurHash(const void* buf, size_t len) noexcept;
 #endif
 
 namespace NHashPrivate {
@@ -15,7 +16,7 @@ namespace NHashPrivate {
 #if defined(_64_) && !defined(NO_CITYHASH)
         return CityHash64((const char*)ptr, size * sizeof(C));
 #else
-        return MurmurHashSizeT((const char*)ptr, size * sizeof(C));
+        return MurmurHash<size_t>(ptr, size * sizeof(C));
 #endif
     }
 }