From: Paul Tarjan <ptarjan@fb.com>
Date: Fri, 31 May 2013 22:01:14 +0000 (-0700)
Subject: osx on folly take 2
X-Git-Tag: v0.22.0~953
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b68b53f887d73ac6619cd2d64f87039263f96ef;p=folly.git

osx on folly take 2

Summary: using ULL broke everything. Lets try the case @danslo originally suggested.

Test Plan: will check errors for this file

Reviewed By: delong.j@fb.com

FB internal diff: D832165
---

diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
index 6fc44200..2049f0a1 100644
--- a/folly/Benchmark.cpp
+++ b/folly/Benchmark.cpp
@@ -210,7 +210,8 @@ 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, 1000000000UL));
+    max(FLAGS_bm_min_usec * 1000UL,
+        min<uint64_t>(resolutionInNs * 100000, 1000000000ULL));
 
   // We do measurements in several epochs and take the minimum, to
   // account for jitter.