diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-07 23:51:26 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-08 00:15:52 +0100 |
commit | 03b1d8abecbf7db72845f883bf20c3c9bdf820a4 (patch) | |
tree | 5ea961ee6d85053a1af0cba81ea4baec0a0b5fba /vespalib | |
parent | ac86bb091d01e6299d6f3e88c531d1cd6903474d (diff) |
system_time and steady_time might have different duration types.
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/tests/trace/trace.cpp | 2 | ||||
-rw-r--r-- | vespalib/src/tests/trace/trace_serialization.cpp | 2 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/time.cpp | 2 |
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..1572f846e81 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(system_time::duration::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..ec9759f3504 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(system_time::duration::zero()); 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 { |