From 1b68b53f887d73ac6619cd2d64f87039263f96ef Mon Sep 17 00:00:00 2001 From: Paul Tarjan Date: Fri, 31 May 2013 15:01:14 -0700 Subject: [PATCH] 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 --- folly/Benchmark.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(resolutionInNs * 100000, 1000000000ULL)); // We do measurements in several epochs and take the minimum, to // account for jitter. -- 2.34.1