diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-17 09:51:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-17 09:51:47 -0400 |
commit | 076add4ccddff3940e20fc320615e3d330f77119 (patch) | |
tree | bacabcfed8665974c276489509a1caa330ad36a2 /src/common/hash.h | |
parent | 3be048e50a2090caf1eeeb2373c7524ecc177ce8 (diff) | |
parent | 63c2e32e207d31ecadd9022e1d7cd705c9febac8 (diff) |
Merge pull request #1326 from FearlessTobi/port-4182
Port #4182 from Citra: "Prefix all size_t with std::"
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 { * @param len Length of data (in bytes) to compute hash over * @returns 64-bit hash value that was computed over the data block */ -static inline u64 ComputeHash64(const void* data, size_t len) { +static inline u64 ComputeHash64(const void* data, std::size_t len) { return CityHash64(static_cast<const char*>(data), len); } @@ -63,7 +63,7 @@ struct HashableStruct { return !(*this == o); }; - size_t Hash() const { + std::size_t Hash() const { return Common::ComputeStructHash64(state); } }; |