set nominmax on windows
R=scroggo@google.com
Review URL: https://codereview.chromium.org/20990007
git-svn-id: http://skia.googlecode.com/svn/trunk@10470 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/TimerData.cpp b/bench/TimerData.cpp
index 18d41e4..3b4baac 100644
--- a/bench/TimerData.cpp
+++ b/bench/TimerData.cpp
@@ -20,16 +20,15 @@
, 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)
{}