commit 1697302adc6572fa31e0a83ebd64935587696591
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Mar 11 19:22:19 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Mar 11 19:22:19 2010 +0000
tree 4e39a14bcedb4a7e002c00ed9cf30b02925a1468
parent e2b2212912010fafc2675485f8ddd67c6b29130d

Use std::min/max instead of the Windows macros.

TRAC #11024

* Define NOMINMAX so that the Windows headers don't define min or max.
* Use std::min/std::max where we were using the min/max macros.

Signed-off-by: Daniel Koch

Author:    Andrew Lewycky <andrew.lewycky@transgaming.com>

git-svn-id: https://angleproject.googlecode.com/svn/trunk@10 736b8ea6-26fd-11df-bfd4-992fa37f6226

libGLESv2/Texture.cpp

diff --git a/libGLESv2/Texture.cpp b/libGLESv2/Texture.cpp
index 118d5f2..d857967 100644
--- a/libGLESv2/Texture.cpp
+++ b/libGLESv2/Texture.cpp
@@ -10,6 +10,8 @@
 
 #include "Texture.h"
 
+#include <algorithm>
+
 #include "main.h"
 #include "mathutil.h"
 #include "debug.h"
@@ -347,7 +349,7 @@
 
     if (mipmapping)
     {
-        int q = log2(max(mWidth, mHeight));
+        int q = log2(std::max(mWidth, mHeight));
 
         for (int level = 1; level <= q; level++)
         {