diff options
| author | 2017-01-28 10:37:40 -0800 | |
|---|---|---|
| committer | 2017-01-28 10:37:40 -0800 | |
| commit | ac4ea522cbe653f6362357ca108ca3bf726b6229 (patch) | |
| tree | 89c318b489a72d4d9fdf642f1bdaa80c067c2d37 /src/common/hash.h | |
| parent | Merge pull request #2484 from Kloen/killing-warnings-nihstro (diff) | |
| parent | common: add <cstddef> to hash.h (diff) | |
| download | yuzu-ac4ea522cbe653f6362357ca108ca3bf726b6229.tar.gz yuzu-ac4ea522cbe653f6362357ca108ca3bf726b6229.tar.xz yuzu-ac4ea522cbe653f6362357ca108ca3bf726b6229.zip | |
Merge pull request #2485 from Kloen/killing-warnings-computehash64
Switch ComputeHash64 len param to size_t instead of int
Diffstat (limited to 'src/common/hash.h')
| -rw-r--r-- | src/common/hash.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/hash.h b/src/common/hash.h index a3850be68..ee2560dad 100644 --- a/src/common/hash.h +++ b/src/common/hash.h | |||
| @@ -4,11 +4,12 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <cstddef> | ||
| 7 | #include "common/common_types.h" | 8 | #include "common/common_types.h" |
| 8 | 9 | ||
| 9 | namespace Common { | 10 | namespace Common { |
| 10 | 11 | ||
| 11 | void MurmurHash3_128(const void* key, int len, u32 seed, void* out); | 12 | void MurmurHash3_128(const void* key, size_t len, u32 seed, void* out); |
| 12 | 13 | ||
| 13 | /** | 14 | /** |
| 14 | * Computes a 64-bit hash over the specified block of data | 15 | * Computes a 64-bit hash over the specified block of data |
| @@ -16,7 +17,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 | 17 | * @param len Length of data (in bytes) to compute hash over |
| 17 | * @returns 64-bit hash value that was computed over the data block | 18 | * @returns 64-bit hash value that was computed over the data block |
| 18 | */ | 19 | */ |
| 19 | static inline u64 ComputeHash64(const void* data, int len) { | 20 | static inline u64 ComputeHash64(const void* data, size_t len) { |
| 20 | u64 res[2]; | 21 | u64 res[2]; |
| 21 | MurmurHash3_128(data, len, 0, res); | 22 | MurmurHash3_128(data, len, 0, res); |
| 22 | return res[0]; | 23 | return res[0]; |