From: Paul Tarjan <ptarjan@fb.com>
Date: Fri, 31 May 2013 21:55:52 +0000 (-0700)
Subject: revert folly/Benchmark.cpp
X-Git-Tag: v0.22.0~954
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4591d3cd0aaa707c8a6a280d8d7969ae8a78ca97;p=folly.git

revert folly/Benchmark.cpp

Summary: revert the breaking change

Test Plan: none

Reviewed By: delong.j@fb.com

FB internal diff: D832143

Blame Revision: D830883
---

diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
index 2fb35152..6fc44200 100644
--- a/folly/Benchmark.cpp
+++ b/folly/Benchmark.cpp
@@ -210,8 +210,7 @@ static double runBenchmarkGetNSPerIteration(const BenchmarkFun& fun,
   // the clock resolution is worse than that, it will be larger. In
   // essence we're aiming at making the quantization noise 0.01%.
   static const auto minNanoseconds =
-    max(FLAGS_bm_min_usec * 1000UL,
-        min(resolutionInNs * 100000, 1000000000ULL));
+    max(FLAGS_bm_min_usec * 1000UL, min(resolutionInNs * 100000, 1000000000UL));
 
   // We do measurements in several epochs and take the minimum, to
   // account for jitter.