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 2fb3515269b0d301db8c5a2e9b25b0c321e2e43f..6fc442000cc4707f35ce65889426b7167769d8b7 100644 (file)
--- 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.