Use nanoseconds instead of duration<double, milli>

MSVC++ before 2015 Update 2 has a bug in sleep_for where it tries to implicitly += the input with a nanoseconds variable. Work around this by using nanoseconds directly (which can be implicitly +='d with chrono::nanoseconds).

Use nanoseconds instead of duration<double, milli>
df9ab801 · Billy Robert O'Neal III · 354b14d1 · df9ab801 · df9ab801
Commit df9ab801 authored May 10, 2016 by Billy Robert O'Neal III
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

benchmark_test.cc test/benchmark_test.cc +2 -1

options_test.cc test/options_test.cc +4 -7

No files found.
--- a/test/benchmark_test.cc
+++ b/test/benchmark_test.cc
@@ -186,7 +186,8 @@ static void BM_ManualTiming(benchmark::State& state) {
  while (state.KeepRunning()) {
    auto start   = std::chrono::high_resolution_clock::now();
    // Simulate some useful workload with a sleep
-    std::this_thread::sleep_for(sleep_duration);
+    std::this_thread::sleep_for(std::chrono::duration_cast<
+      std::chrono::nanoseconds>(sleep_duration));
    auto end     = std::chrono::high_resolution_clock::now();
    auto elapsed =

--- a/test/options_test.cc
+++ b/test/options_test.cc
@@ -9,14 +9,11 @@ void BM_basic(benchmark::State& state) {
 }
 void BM_basic_slow(benchmark::State& state) {
+  std::chrono::milliseconds sleep_duration(state.range_x());
-  int milliseconds = state.range_x();
-  std::chrono::duration<double, std::milli> sleep_duration {
-    static_cast<double>(milliseconds)
-  };
  while (state.KeepRunning()) {
-    std::this_thread::sleep_for(sleep_duration);
+    std::this_thread::sleep_for(
+      std::chrono::duration_cast<std::chrono::nanoseconds>(sleep_duration)
+      );
  }
 }