diff options
| author | 2017-01-28 14:45:21 +0100 | |
|---|---|---|
| committer | 2017-01-28 14:47:14 +0100 | |
| commit | 2fa0971cebb6728350dc8e9a8edd336d5dff4d99 (patch) | |
| tree | cefa734708278386f68cfb5589c60c551cef6979 /src | |
| parent | Merge pull request #2478 from jfmherokiller/master (diff) | |
| download | yuzu-2fa0971cebb6728350dc8e9a8edd336d5dff4d99.tar.gz yuzu-2fa0971cebb6728350dc8e9a8edd336d5dff4d99.tar.xz yuzu-2fa0971cebb6728350dc8e9a8edd336d5dff4d99.zip | |
common: switch ComputeHash64 len param to size_t instead of int, fix warning on MSVC on dsp_dsp.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/hash.cpp | 8 | ||||
| -rw-r--r-- | src/common/hash.h | 4 |
2 files changed, 6 insertions, 6 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 | ||
diff --git a/src/common/hash.h b/src/common/hash.h index a3850be68..188d1c555 100644 --- a/src/common/hash.h +++ b/src/common/hash.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | namespace Common { | 9 | namespace Common { |
| 10 | 10 | ||
| 11 | void MurmurHash3_128(const void* key, int len, u32 seed, void* out); | 11 | void MurmurHash3_128(const void* key, size_t len, u32 seed, void* out); |
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | * Computes a 64-bit hash over the specified block of data | 14 | * Computes a 64-bit hash over the specified block of data |
| @@ -16,7 +16,7 @@ void MurmurHash3_128(const void* key, int len, u32 seed, void* out); | |||
| 16 | * @param len Length of data (in bytes) to compute hash over | 16 | * @param len Length of data (in bytes) to compute hash over |
| 17 | * @returns 64-bit hash value that was computed over the data block | 17 | * @returns 64-bit hash value that was computed over the data block |
| 18 | */ | 18 | */ |
| 19 | static inline u64 ComputeHash64(const void* data, int len) { | 19 | static inline u64 ComputeHash64(const void* data, size_t len) { |
| 20 | u64 res[2]; | 20 | u64 res[2]; |
| 21 | MurmurHash3_128(data, len, 0, res); | 21 | MurmurHash3_128(data, len, 0, res); |
| 22 | return res[0]; | 22 | return res[0]; |