diff options
| author | 2015-09-21 21:29:55 -0400 | |
|---|---|---|
| committer | 2015-09-21 21:29:55 -0400 | |
| commit | 09f43c0975b303ca98072fbece37334b0d2b4e4b (patch) | |
| tree | 4590343a003cedb3116fbc2ecf1da83354e90c56 /src/common/hash.cpp | |
| parent | Merge pull request #1106 from Kloen/fix-connect (diff) | |
| parent | hash: Get rid of unused functions (diff) | |
| download | yuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.tar.gz yuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.tar.xz yuzu-09f43c0975b303ca98072fbece37334b0d2b4e4b.zip | |
Merge pull request #1160 from lioncash/clang
Silence some clang warnings
Diffstat (limited to 'src/common/hash.cpp')
| -rw-r--r-- | src/common/hash.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 413e9c6f1..c49c2f60e 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp | |||
| @@ -17,27 +17,11 @@ namespace Common { | |||
| 17 | 17 | ||
| 18 | // Block read - if your platform needs to do endian-swapping or can only handle aligned reads, do | 18 | // Block read - if your platform needs to do endian-swapping or can only handle aligned reads, do |
| 19 | // the conversion here | 19 | // the conversion here |
| 20 | |||
| 21 | static FORCE_INLINE u32 getblock32(const u32* p, int i) { | ||
| 22 | return p[i]; | ||
| 23 | } | ||
| 24 | |||
| 25 | static FORCE_INLINE u64 getblock64(const u64* p, int i) { | 20 | static FORCE_INLINE u64 getblock64(const u64* p, int i) { |
| 26 | return p[i]; | 21 | return p[i]; |
| 27 | } | 22 | } |
| 28 | 23 | ||
| 29 | // Finalization mix - force all bits of a hash block to avalanche | 24 | // Finalization mix - force all bits of a hash block to avalanche |
| 30 | |||
| 31 | static FORCE_INLINE u32 fmix32(u32 h) { | ||
| 32 | h ^= h >> 16; | ||
| 33 | h *= 0x85ebca6b; | ||
| 34 | h ^= h >> 13; | ||
| 35 | h *= 0xc2b2ae35; | ||
| 36 | h ^= h >> 16; | ||
| 37 | |||
| 38 | return h; | ||
| 39 | } | ||
| 40 | |||
| 41 | static FORCE_INLINE u64 fmix64(u64 k) { | 25 | static FORCE_INLINE u64 fmix64(u64 k) { |
| 42 | k ^= k >> 33; | 26 | k ^= k >> 33; |
| 43 | k *= 0xff51afd7ed558ccdllu; | 27 | k *= 0xff51afd7ed558ccdllu; |