diff options
Diffstat (limited to 'src/murmurhash/MurmurHash3.cpp')
| -rw-r--r-- | src/murmurhash/MurmurHash3.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/murmurhash/MurmurHash3.cpp b/src/murmurhash/MurmurHash3.cpp index 2e06040..86ca147 100644 --- a/src/murmurhash/MurmurHash3.cpp +++ b/src/murmurhash/MurmurHash3.cpp @@ -91,7 +91,7 @@ inline uint64_t fmix ( uint64_t k ) //----------------------------------------------------------------------------- -void MurmurHash3_x86_32 ( const void * key, int len, +void MurmurHash3_x86_32 ( const void * key, unsigned int len, uint32_t seed, void * out ) { const uint8_t * data = (const uint8_t*)key; @@ -129,8 +129,8 @@ void MurmurHash3_x86_32 ( const void * key, int len, switch(len & 3) { - case 3: k1 ^= tail[2] << 16; - case 2: k1 ^= tail[1] << 8; + case 3: k1 ^= uint32_t(tail[2] << 16); + case 2: k1 ^= uint32_t(tail[1] << 8); case 1: k1 ^= tail[0]; k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; }; @@ -147,7 +147,7 @@ void MurmurHash3_x86_32 ( const void * key, int len, //----------------------------------------------------------------------------- -void MurmurHash3_x86_128 ( const void * key, const int len, +void MurmurHash3_x86_128 ( const void * key, const unsigned int len, uint32_t seed, void * out ) { const uint8_t * data = (const uint8_t*)key; @@ -204,27 +204,27 @@ void MurmurHash3_x86_128 ( const void * key, const int len, switch(len & 15) { - case 15: k4 ^= tail[14] << 16; - case 14: k4 ^= tail[13] << 8; - case 13: k4 ^= tail[12] << 0; + case 15: k4 ^= uint32_t(tail[14] << 16); + case 14: k4 ^= uint32_t(tail[13] << 8); + case 13: k4 ^= tail[12]; k4 *= c4; k4 = ROTL32(k4,18); k4 *= c1; h4 ^= k4; - case 12: k3 ^= tail[11] << 24; - case 11: k3 ^= tail[10] << 16; - case 10: k3 ^= tail[ 9] << 8; - case 9: k3 ^= tail[ 8] << 0; + case 12: k3 ^= uint32_t(tail[11] << 24); + case 11: k3 ^= uint32_t(tail[10] << 16); + case 10: k3 ^= uint32_t(tail[ 9] << 8); + case 9: k3 ^= tail[ 8]; k3 *= c3; k3 = ROTL32(k3,17); k3 *= c4; h3 ^= k3; - case 8: k2 ^= tail[ 7] << 24; - case 7: k2 ^= tail[ 6] << 16; - case 6: k2 ^= tail[ 5] << 8; - case 5: k2 ^= tail[ 4] << 0; + case 8: k2 ^= uint32_t(tail[ 7] << 24); + case 7: k2 ^= uint32_t(tail[ 6] << 16); + case 6: k2 ^= uint32_t(tail[ 5] << 8); + case 5: k2 ^= tail[ 4]; k2 *= c2; k2 = ROTL32(k2,16); k2 *= c3; h2 ^= k2; - case 4: k1 ^= tail[ 3] << 24; - case 3: k1 ^= tail[ 2] << 16; - case 2: k1 ^= tail[ 1] << 8; - case 1: k1 ^= tail[ 0] << 0; + case 4: k1 ^= uint32_t(tail[ 3] << 24); + case 3: k1 ^= uint32_t(tail[ 2] << 16); + case 2: k1 ^= uint32_t(tail[ 1] << 8); + case 1: k1 ^= tail[ 0]; k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; }; @@ -252,7 +252,7 @@ void MurmurHash3_x86_128 ( const void * key, const int len, //----------------------------------------------------------------------------- -void MurmurHash3_x64_128 ( const void * key, const int len, +void MurmurHash3_x64_128 ( const void * key, const unsigned int len, const uint32_t seed, void * out ) { const uint8_t * data = (const uint8_t*)key; |