diff options
9 files changed, 10 insertions, 10 deletions
diff --git a/config/src/tests/trace/trace.cpp b/config/src/tests/trace/trace.cpp index fdb40d40893..89e1cb3cbaf 100644 --- a/config/src/tests/trace/trace.cpp +++ b/config/src/tests/trace/trace.cpp @@ -10,7 +10,7 @@ using namespace vespalib::slime; struct FixedClock : public Clock { - FixedClock() : _currentTime(duration::zero()) { } + FixedClock() : _currentTime(vespalib::system_time::duration::zero()) { } vespalib::system_time _currentTime; vespalib::system_time currentTime() const override { return _currentTime; } }; @@ -57,7 +57,7 @@ TEST("that trace can be copied") { EXPECT_EQUAL(trace.toString(), trace2.toString()); } -constexpr vespalib::system_time epoch(duration::zero()); +constexpr vespalib::system_time epoch(vespalib::system_time::duration::zero()); TEST("ensure that system clock is used by default") { Trace trace(2); diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h index 36822a6da65..2a7115f4d33 100644 --- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h +++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h @@ -24,7 +24,7 @@ public: FlushMeta(const vespalib::string & name, uint32_t id); ~FlushMeta(); const vespalib::string & getName() const { return _name; } - vespalib::system_time getStart() const { return vespalib::system_clock::now() - elapsed(); } + vespalib::system_time getStart() const { return vespalib::system_clock::now() - std::chrono::duration_cast<vespalib::system_time::duration>(elapsed()); } vespalib::duration elapsed() const { return _timer.elapsed(); } uint32_t getId() const { return _id; } bool operator < (const FlushMeta & rhs) const { return _id < rhs._id; } diff --git a/searchlib/src/vespa/searchlib/engine/trace.cpp b/searchlib/src/vespa/searchlib/engine/trace.cpp index 2264685ca13..68c614df707 100644 --- a/searchlib/src/vespa/searchlib/engine/trace.cpp +++ b/searchlib/src/vespa/searchlib/engine/trace.cpp @@ -41,7 +41,7 @@ Trace::start(int level, bool useUTC) { if (useUTC) { root().setString("start_time", vespalib::to_string(vespalib::to_utc(_relativeTime.timeOfDawn()))); } else { - root().setString("start_time", vespalib::to_string(vespalib::system_time(_relativeTime.timeOfDawn().time_since_epoch()))); + root().setString("start_time", vespalib::to_string(vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(_relativeTime.timeOfDawn().time_since_epoch())))); } } } diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp index e6133496398..1d1edbed658 100644 --- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp +++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp @@ -35,7 +35,7 @@ struct DomainExplorer : vespalib::StateExplorer { { FastOS_StatInfo stat_info; FastOS_File::Stat(part_in.file.c_str(), &stat_info); - part.setString("lastModified", vespalib::to_string(vespalib::system_time(std::chrono::nanoseconds(stat_info._modifiedTimeNS)))); + part.setString("lastModified", vespalib::to_string(vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(std::chrono::nanoseconds(stat_info._modifiedTimeNS))))); } } } diff --git a/searchlib/src/vespa/searchlib/util/filekit.cpp b/searchlib/src/vespa/searchlib/util/filekit.cpp index 5cdab1f69e4..6fc0e27d9e3 100644 --- a/searchlib/src/vespa/searchlib/util/filekit.cpp +++ b/searchlib/src/vespa/searchlib/util/filekit.cpp @@ -95,7 +95,7 @@ FileKit::getModificationTime(const vespalib::string &name) { FastOS_StatInfo statInfo; if (FastOS_File::Stat(name.c_str(), &statInfo)) { - return vespalib::system_time(std::chrono::nanoseconds(statInfo._modifiedTimeNS)); + return vespalib::system_time(std::chrono::duration_cast<vespalib::system_time::duration>(std::chrono::nanoseconds(statInfo._modifiedTimeNS))); } return vespalib::system_time(); } diff --git a/storage/src/tests/visiting/memory_bounded_trace_test.cpp b/storage/src/tests/visiting/memory_bounded_trace_test.cpp index 124730cf093..e30961e20e4 100644 --- a/storage/src/tests/visiting/memory_bounded_trace_test.cpp +++ b/storage/src/tests/visiting/memory_bounded_trace_test.cpp @@ -7,7 +7,7 @@ using namespace ::testing; namespace storage { -constexpr vespalib::system_time epoch(vespalib::duration::zero()); +constexpr vespalib::system_time epoch(vespalib::system_time::duration::zero()); TEST(MemoryBoundedTraceTest, no_memory_reported_used_when_empty) { MemoryBoundedTrace trace(100); 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 { |