diff options
author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2022-01-05 03:53:31 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-05 04:23:05 +0000 |
commit | fefa965f8dd1f52e727a316ddb86aa18b0cf495f (patch) | |
tree | e9589f660eea262a87be94116c7f357399356a5c | |
parent | e1a3d63d9753d6922b36335603f37eb6cbb89c3f (diff) | |
download | mongo-fefa965f8dd1f52e727a316ddb86aa18b0cf495f.tar.gz |
Revert "SERVER-62333 use std::ptrdiff_t to avoid UB in MurmurHash3"
This reverts commit 863684a584bfa5b4beeffb8d2a79e735299c1de7.
-rw-r--r-- | src/third_party/murmurhash3/MurmurHash3.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/third_party/murmurhash3/MurmurHash3.cpp b/src/third_party/murmurhash3/MurmurHash3.cpp index 5250e81268d..b877baf52a3 100644 --- a/src/third_party/murmurhash3/MurmurHash3.cpp +++ b/src/third_party/murmurhash3/MurmurHash3.cpp @@ -83,8 +83,6 @@ FORCE_INLINE T nativeToLittle( T t ) return t; } -template <typename T> constexpr std::ptrdiff_t ssizeof = sizeof(T); - //----------------------------------------------------------------------------- // Block read - if your platform needs to do endian-swapping or can only // handle aligned reads, do the conversion here @@ -92,7 +90,7 @@ template <typename T> FORCE_INLINE T getblock( const void* p, int i ) { T t; - std::memcpy(&t, static_cast<const char*>(p) + i * ssizeof<T>, sizeof(T)); + std::memcpy(&t, static_cast<const char*>(p) + i * sizeof(T), sizeof(T)); return nativeToLittle(t); } @@ -111,7 +109,7 @@ template <typename T> FORCE_INLINE void putblock( void* p, int i, T t ) { t = nativeToLittle(t); - std::memcpy(static_cast<char*>(p) + i * ssizeof<T>, &t, sizeof(T)); + std::memcpy(static_cast<char*>(p) + i * sizeof(T), &t, sizeof(T)); } //----------------------------------------------------------------------------- |