set nominmax on windows

bench/TimerData.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "TimerData.h"
 
 #include "BenchTimer.h"
 #include <limits>
 
 using namespace std;
 
 TimerData::TimerData(const SkString& perIterTimeFormat, const SkString& normalTimeFormat)
 : fWallStr(" msecs = ")
 , fTruncatedWallStr(" Wmsecs = ")
 , fCpuStr(" cmsecs = ")
 , fTruncatedCpuStr(" Cmsecs = ")
 , fGpuStr(" gmsecs = ")
 , fWallSum(0.0)
-, fWallMin((numeric_limits<double>::max)()) // Extra parens to make the windows build work, due to
-                                            // 'max' macro
+, fWallMin(numeric_limits<double>::max())
 , fTruncatedWallSum(0.0)
-, fTruncatedWallMin((numeric_limits<double>::max)())
+, fTruncatedWallMin(numeric_limits<double>::max())
 , fCpuSum(0.0)
-, fCpuMin((numeric_limits<double>::max)())
+, fCpuMin(numeric_limits<double>::max())
 , fTruncatedCpuSum(0.0)
-, fTruncatedCpuMin((numeric_limits<double>::max)())
+, fTruncatedCpuMin(numeric_limits<double>::max())
 , fGpuSum(0.0)
-, fGpuMin((numeric_limits<double>::max)())
+, fGpuMin(numeric_limits<double>::max())
 , fPerIterTimeFormat(perIterTimeFormat)
 , fNormalTimeFormat(normalTimeFormat)
 {}
 
 static double Min(double a, double b) {
     return (a < b) ? a : b;
 }
 
 void TimerData::appendTimes(BenchTimer* timer, bool last) {
     SkASSERT(timer != NULL);
@@ skipping 57 matching lines @@
         str += fCpuStr;
     }
     if (showTruncatedCpuTime) {
         str += fTruncatedCpuStr;
     }
     if (showGpuTime && fGpuSum > 0) {
         str += fGpuStr;
     }
     return str;
 }