diff options
| author | 2018-09-19 19:53:11 +0800 | |
|---|---|---|
| committer | 2018-09-19 19:53:11 +0800 | |
| commit | c8f9bbbf859c0e38cf691b64c67761382fcebfc2 (patch) | |
| tree | 99529c2277a6b740a6e278985c5147fa649c5497 /src/common/hash.h | |
| parent | Add 1D sampler for TLDS - TexelFetch (Mario Rabbids) (diff) | |
| parent | Merge pull request #1348 from ogniK5377/GetImageSize (diff) | |
| download | yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.gz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.tar.xz yuzu-c8f9bbbf859c0e38cf691b64c67761382fcebfc2.zip | |
Merge branch 'master' into tlds
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 2c761e545..40194d1ee 100644 --- a/src/common/hash.h +++ b/src/common/hash.h | |||
| @@ -17,7 +17,7 @@ namespace Common { | |||
| 17 | * @param len Length of data (in bytes) to compute hash over | 17 | * @param len Length of data (in bytes) to compute hash over |
| 18 | * @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 |
| 19 | */ | 19 | */ |
| 20 | static inline u64 ComputeHash64(const void* data, size_t len) { | 20 | static inline u64 ComputeHash64(const void* data, std::size_t len) { |
| 21 | return CityHash64(static_cast<const char*>(data), len); | 21 | return CityHash64(static_cast<const char*>(data), len); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| @@ -63,7 +63,7 @@ struct HashableStruct { | |||
| 63 | return !(*this == o); | 63 | return !(*this == o); |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | size_t Hash() const { | 66 | std::size_t Hash() const { |
| 67 | return Common::ComputeStructHash64(state); | 67 | return Common::ComputeStructHash64(state); |
| 68 | } | 68 | } |
| 69 | }; | 69 | }; |