commit 47c058c32e2ec923b88ca32d9d6a1f196b3d27dd
author alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 15:30:05 2010 +0000
committer alokp@chromium.org <alokp@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Apr 13 15:30:05 2010 +0000
tree 72067ba967efd846a7bfb6dfdcd02f256fe03c9b
parent 277b7142ed6a45f1067f36a472df3c28231bf5ef

Fixing compile error. GYP projects use NOMINMAX to suppress non-standard VC++ min/max.
Review URL: http://codereview.appspot.com/892046

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

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 27a1db6..0d3af2c 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -1624,7 +1624,7 @@
             while (iterations > 0)
             {
                 int remainder = (limit - initial + 1) % increment;
-                int clampedLimit = initial + increment * min(255, iterations) - 1 - remainder;
+                int clampedLimit = initial + increment * std::min(255, iterations) - 1 - remainder;
 
                 // for(int index = initial; index < clampedLimit; index += increment)