diff options
| author | McKay.Davis@gmail.com <McKay.Davis@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> | 2011-03-19 17:52:18 +0000 |
|---|---|---|
| committer | McKay.Davis@gmail.com <McKay.Davis@gmail.com@77a7d1d3-4c08-bdc2-d393-d5859734b01a> | 2011-03-19 17:52:18 +0000 |
| commit | 3ef87613ed6bd520128d5ba169f1cb99b86b4018 (patch) | |
| tree | da46668d458354fb4478a7a8cf2f1be457110419 | |
| parent | 0eed080e82389d157b2b841dc9062d2ce45b4269 (diff) | |
| download | src-3ef87613ed6bd520128d5ba169f1cb99b86b4018.tar.gz | |
Fix x86_64 gcc 4.4.1 build errors:
/smhasher/MurmurHash1.cpp: In function ‘unsigned int MurmurHash1Aligned(const void*, int, unsigned int)’:
/smhasher/MurmurHash1.cpp:82: error: cast from ‘const unsigned char*’ to ‘int’ loses precision
/smhasher/MurmurHash2.cpp: In function ‘uint32_t MurmurHashAligned2(const void*, int, uint32_t)’:
/smhasher/MurmurHash2.cpp:382: error: cast from ‘const unsigned char*’ to ‘int’ loses precision
git-svn-id: http://smhasher.googlecode.com/svn/trunk@89 77a7d1d3-4c08-bdc2-d393-d5859734b01a
| -rw-r--r-- | MurmurHash1.cpp | 2 | ||||
| -rw-r--r-- | MurmurHash2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MurmurHash1.cpp b/MurmurHash1.cpp index 4322bb8..6499a3d 100644 --- a/MurmurHash1.cpp +++ b/MurmurHash1.cpp @@ -79,7 +79,7 @@ unsigned int MurmurHash1Aligned ( const void * key, int len, unsigned int seed ) unsigned int h = seed ^ (len * m);
- int align = (int)data & 3;
+ int align = (uint64_t)data & 3;
if(align && (len >= 4))
{
diff --git a/MurmurHash2.cpp b/MurmurHash2.cpp index 5e98330..e020628 100644 --- a/MurmurHash2.cpp +++ b/MurmurHash2.cpp @@ -379,7 +379,7 @@ uint32_t MurmurHashAligned2 ( const void * key, int len, uint32_t seed ) uint32_t h = seed ^ len;
- int align = (int)data & 3;
+ int align = (uint64_t)data & 3;
if(align && (len >= 4))
{
|