From 2aa5c74c2aaf711a2c6f46daf5fc99a808da12a9 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 1 Oct 2013 12:00:03 -0700 Subject: [PATCH] Add 64 bit output for MurmurHash --- src/beast/beast/utility/impl/Debug.cpp | 2 +- src/beast/modules/beast_core/maths/MurmurHash.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/beast/beast/utility/impl/Debug.cpp b/src/beast/beast/utility/impl/Debug.cpp index 85b8d25a26..0265f7996d 100644 --- a/src/beast/beast/utility/impl/Debug.cpp +++ b/src/beast/beast/utility/impl/Debug.cpp @@ -347,7 +347,7 @@ public: logMessage ("BEAST_DEBUG = " + String::fromNumber (beastDebug ())); logMessage ("BEAST_FORCE_DEBUG = " + String::fromNumber (beastForceDebug ())); logMessage ("BEAST_CATCH_UNHANDLED_EXCEPTIONS = " + String::fromNumber (beastCatchExceptions ())); - + logMessage ("sizeof(std::size_t) = " + String::fromNumber (sizeof(std::size_t))); bassertfalse; fail (); diff --git a/src/beast/modules/beast_core/maths/MurmurHash.h b/src/beast/modules/beast_core/maths/MurmurHash.h index 9ed0b0c582..7cdf570f7b 100644 --- a/src/beast/modules/beast_core/maths/MurmurHash.h +++ b/src/beast/modules/beast_core/maths/MurmurHash.h @@ -44,11 +44,27 @@ inline void Hash (const void* key, int len, uint32 seed, HashType* out) break; #if BEAST_64BIT + case 64: + { + HashType tmp[2]; + MurmurHash3_x64_128 (key, len, seed, &tmp[0]); + *out = tmp[0]; + } + break; + case 128: MurmurHash3_x64_128 (key, len, seed, out); break; #else + case 64: + { + HashType tmp[2]; + MurmurHash3_x86_128 (key, len, seed, &tmp[0]); + *out = tmp[0]; + } + break; + case 128: MurmurHash3_x86_128 (key, len, seed, out); break;