summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanjent@gmail.com <tanjent@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a>2011-05-20 23:00:53 +0000
committertanjent@gmail.com <tanjent@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a>2011-05-20 23:00:53 +0000
commitb35e562e2d80bc47a51b53ec92a305eb9a3383b4 (patch)
tree13c3083d7be701b37423a87ebb927f04c96c0b42
parentbb9b561f4c5b0ad049633ec880ffa16fe882fb80 (diff)
downloadsrc-b35e562e2d80bc47a51b53ec92a305eb9a3383b4.tar.gz
Fix typo in rotation constant for Murmur3_x86_32's tail, update verification value.
git-svn-id: http://smhasher.googlecode.com/svn/trunk@136 77a7d1d3-4c08-bdc2-d393-d5859734b01a
-rw-r--r--MurmurHash3.cpp2
-rw-r--r--main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/MurmurHash3.cpp b/MurmurHash3.cpp
index 97883fa..0bf7386 100644
--- a/MurmurHash3.cpp
+++ b/MurmurHash3.cpp
@@ -132,7 +132,7 @@ void MurmurHash3_x86_32 ( const void * key, int len,
case 3: k1 ^= tail[2] << 16;
case 2: k1 ^= tail[1] << 8;
case 1: k1 ^= tail[0];
- k1 *= c1; k1 = ROTL32(k1,16); k1 *= c2; h1 ^= k1;
+ k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
};
//----------
diff --git a/main.cpp b/main.cpp
index eca0848..bf25ce0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -69,7 +69,7 @@ HashInfo g_hashes[] =
// MurmurHash3
- { MurmurHash3_x86_32, 32, 0x3252D141, "Murmur3A", "MurmurHash3 for x86, 32-bit" },
+ { MurmurHash3_x86_32, 32, 0xB0F57EE3, "Murmur3A", "MurmurHash3 for x86, 32-bit" },
{ MurmurHash3_x86_128, 128, 0xB3ECE62A, "Murmur3C", "MurmurHash3 for x86, 128-bit" },
{ MurmurHash3_x64_128, 128, 0x6384BA69, "Murmur3F", "MurmurHash3 for x64, 128-bit" },