diff options
| author | 2017-01-28 14:45:21 +0100 | |
|---|---|---|
| committer | 2017-01-28 14:47:14 +0100 | |
| commit | 2fa0971cebb6728350dc8e9a8edd336d5dff4d99 (patch) | |
| tree | cefa734708278386f68cfb5589c60c551cef6979 /src/common/hash.h | |
| 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/common/hash.h')
| -rw-r--r-- | src/common/hash.h | 4 |
1 files changed, 2 insertions, 2 deletions
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]; |