diff options
author | archshift <admin@archshift.com> | 2015-02-19 07:46:21 +0100 |
---|---|---|
committer | archshift <admin@archshift.com> | 2015-02-20 07:26:25 +0100 |
commit | 4fb75d220aeaa66d3e907cc2311acf6c29433800 (patch) | |
tree | 8fa12b7d7dd3fde83ce126c0ffe3c8011d839f4f /src/common/hash.cpp | |
parent | Remove duplication of INSERT_PADDING_WORDS between pica.h and gpu.h (diff) | |
download | yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.gz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.bz2 yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.lz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.xz yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.tar.zst yuzu-4fb75d220aeaa66d3e907cc2311acf6c29433800.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/hash.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 50c7cb5f9..0624dab8d 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -156,7 +156,7 @@ u64 GetMurmurHash3(const u8 *src, int len, u32 samples) const u8 * data = (const u8*)src; const int nblocks = len / 16; u32 Step = (len / 8); - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; @@ -234,7 +234,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -266,7 +266,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -309,7 +309,7 @@ u64 GetCRC32(const u8 *src, int len, u32 samples) u32 Step = (len/4); const u32 *data = (const u32 *)src; const u32 *end = data + Step; - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) @@ -381,7 +381,7 @@ u64 GetMurmurHash3(const u8* src, int len, u32 samples) u32 out[2]; const int nblocks = len / 8; u32 Step = (len / 4); - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; @@ -457,7 +457,7 @@ u64 GetHashHiresTexture(const u8 *src, int len, u32 samples) u32 Step = (len / 8); const u64 *data = (const u64 *)src; const u64 *end = data + Step; - if(samples == 0) samples = max(Step, 1u); + if(samples == 0) samples = std::max(Step, 1u); Step = Step / samples; if(Step < 1) Step = 1; while(data < end) |