Merge pull request #11692 from vespa-engine/toregge/system-time-and-steady-time-might-have-different-duration-types

std::chrono::system_clock and std::chrono::steady_clock might have different duration types.

3 files changed, 3 insertions, 3 deletions

diff --git a/vespalib/src/tests/trace/trace.cpp b/vespalib/src/tests/trace/trace.cpp
index f2141fbf995..92bee3231b0 100644
--- a/vespalib/src/tests/trace/trace.cpp
+++ b/vespalib/src/tests/trace/trace.cpp
@@ -334,7 +334,7 @@ TEST("testVisiting")
     EXPECT_EQUAL(encoder.str, b1.encode());
 }
 
-constexpr system_time zero(duration::zero());
+constexpr system_time zero;
 constexpr system_time as_ms(long ms) { return system_time(std::chrono::milliseconds(ms)); }
 
 TEST("testTimestamp")
diff --git a/vespalib/src/tests/trace/trace_serialization.cpp b/vespalib/src/tests/trace/trace_serialization.cpp
index 9ba6cdb512b..7658fe7f163 100644
--- a/vespalib/src/tests/trace/trace_serialization.cpp
+++ b/vespalib/src/tests/trace/trace_serialization.cpp
@@ -21,7 +21,7 @@ TEST("that a single trace node is serialized") {
     EXPECT_FALSE(i["payload"].valid());
 }
 
-constexpr system_time zero_system_time(duration::zero());
+constexpr system_time zero_system_time;
 constexpr system_time as_ms(long ms) { return system_time(std::chrono::milliseconds(ms)); }
 
 
diff --git a/vespalib/src/vespa/vespalib/util/time.cpp b/vespalib/src/vespa/vespalib/util/time.cpp
index 15dc8b4c781..46cf4806dfc 100644
--- a/vespalib/src/vespa/vespalib/util/time.cpp
+++ b/vespalib/src/vespa/vespalib/util/time.cpp
@@ -10,7 +10,7 @@ system_time
 to_utc(steady_time ts) {
     system_clock::time_point nowUtc = system_clock::now();
     steady_time nowSteady = steady_clock::now();
-    return system_time(nowUtc.time_since_epoch() - nowSteady.time_since_epoch() + ts.time_since_epoch());
+    return system_time(std::chrono::duration_cast<system_time::duration>(nowUtc.time_since_epoch() - nowSteady.time_since_epoch() + ts.time_since_epoch()));
 }
 
 namespace {