From 4fb75d220aeaa66d3e907cc2311acf6c29433800 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Wed, 18 Feb 2015 22:46:21 -0800
Subject: Misc cleanup of common and related functions

---
 src/common/hash.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/common/hash.cpp')

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index 50c7cb5f..0624dab8 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)
-- 
cgit v1.2.3