diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-05-02 22:47:04 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-05-29 21:44:41 -0400 |
| commit | 49b0eef393f4d321928fb0b6093d58a7637cf1da (patch) | |
| tree | 741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/Common/Hash.cpp | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
Remove the min/max functions in CommonFuncs.
The algorithm header has the same functions.
Diffstat (limited to 'Source/Core/Common/Hash.cpp')
| -rw-r--r-- | Source/Core/Common/Hash.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index f7ed8f308f..e346dba796 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - +#include <algorithm> #include "Common/Hash.h" #if _M_SSE >= 0x402 #include "Common/CPUDetect.h" @@ -155,7 +155,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; @@ -233,7 +233,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) @@ -265,7 +265,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) @@ -308,7 +308,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) @@ -380,7 +380,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; @@ -456,7 +456,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) |