Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1131)

Unified Diff: bench/TimerData.cpp

Issue 20990007: set nominmax on windows (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | include/core/SkPostConfig.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bench/TimerData.cpp
diff --git a/bench/TimerData.cpp b/bench/TimerData.cpp
index 18d41e4de115dc8cdc521d824de659d08e1177a2..3b4baacfcde4aac38fa842c770c892214b8451b5 100644
--- a/bench/TimerData.cpp
+++ b/bench/TimerData.cpp
@@ -20,16 +20,15 @@ TimerData::TimerData(const SkString& perIterTimeFormat, const SkString& normalTi
, 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)
{}
« no previous file with comments | « no previous file | include/core/SkPostConfig.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698