diff options
Diffstat (limited to 'src/common/hash.cpp')
| -rw-r--r-- | src/common/hash.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 2309320bb..f3d390dc5 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp | |||
| @@ -16,7 +16,7 @@ namespace Common { | |||
| 16 | 16 | ||
| 17 | // Block read - if your platform needs to do endian-swapping or can only handle aligned reads, do | 17 | // Block read - if your platform needs to do endian-swapping or can only handle aligned reads, do |
| 18 | // the conversion here | 18 | // the conversion here |
| 19 | static FORCE_INLINE u64 getblock64(const u64* p, int i) { | 19 | static FORCE_INLINE u64 getblock64(const u64* p, size_t i) { |
| 20 | return p[i]; | 20 | return p[i]; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| @@ -34,9 +34,9 @@ static FORCE_INLINE u64 fmix64(u64 k) { | |||
| 34 | // This is the 128-bit variant of the MurmurHash3 hash function that is targeted for 64-bit | 34 | // This is the 128-bit variant of the MurmurHash3 hash function that is targeted for 64-bit |
| 35 | // platforms (MurmurHash3_x64_128). It was taken from: | 35 | // platforms (MurmurHash3_x64_128). It was taken from: |
| 36 | // https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp | 36 | // https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp |
| 37 | void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { | 37 | void MurmurHash3_128(const void* key, size_t len, u32 seed, void* out) { |
| 38 | const u8* data = (const u8*)key; | 38 | const u8* data = (const u8*)key; |
| 39 | const int nblocks = len / 16; | 39 | const size_t nblocks = len / 16; |
| 40 | 40 | ||
| 41 | u64 h1 = seed; | 41 | u64 h1 = seed; |
| 42 | u64 h2 = seed; | 42 | u64 h2 = seed; |
| @@ -48,7 +48,7 @@ void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { | |||
| 48 | 48 | ||
| 49 | const u64* blocks = (const u64*)(data); | 49 | const u64* blocks = (const u64*)(data); |
| 50 | 50 | ||
| 51 | for (int i = 0; i < nblocks; i++) { | 51 | for (size_t i = 0; i < nblocks; i++) { |
| 52 | u64 k1 = getblock64(blocks, i * 2 + 0); | 52 | u64 k1 = getblock64(blocks, i * 2 + 0); |
| 53 | u64 k2 = getblock64(blocks, i * 2 + 1); | 53 | u64 k2 = getblock64(blocks, i * 2 + 1); |
| 54 | 54 | ||