ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 64 bit output for MurmurHash

Browse Source
This commit is contained in:
Vinnie Falco
2013-10-01 12:00:03 -07:00
parent f3d97c76df
commit 2472a902dd
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beast/utility/impl/Debug.cpp
View File

@@ -347,7 +347,7 @@ public:
logMessage ("BEAST_DEBUG = " + String::fromNumber (beastDebug ())); logMessage ("BEAST_DEBUG = " + String::fromNumber (beastDebug ()));
logMessage ("BEAST_FORCE_DEBUG = " + String::fromNumber (beastForceDebug ())); logMessage ("BEAST_FORCE_DEBUG = " + String::fromNumber (beastForceDebug ()));
logMessage ("BEAST_CATCH_UNHANDLED_EXCEPTIONS = " + String::fromNumber (beastCatchExceptions ())); logMessage ("BEAST_CATCH_UNHANDLED_EXCEPTIONS = " + String::fromNumber (beastCatchExceptions ()));
logMessage ("sizeof(std::size_t) = " + String::fromNumber (sizeof(std::size_t)));
bassertfalse; bassertfalse;
fail (); fail ();

16
modules/beast_core/maths/MurmurHash.h
View File

@@ -44,11 +44,27 @@ inline void Hash (const void* key, int len, uint32 seed, HashType* out)
break; break;
#if BEAST_64BIT #if BEAST_64BIT
case 64:
{
HashType tmp[2];
MurmurHash3_x64_128 (key, len, seed, &tmp[0]);
*out = tmp[0];
}
break;
case 128: case 128:
MurmurHash3_x64_128 (key, len, seed, out); MurmurHash3_x64_128 (key, len, seed, out);
break; break;
#else #else
case 64:
{
HashType tmp[2];
MurmurHash3_x86_128 (key, len, seed, &tmp[0]);
*out = tmp[0];
}
break;
case 128: case 128:
MurmurHash3_x86_128 (key, len, seed, out); MurmurHash3_x86_128 (key, len, seed, out);
break; break;