summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-01-08 13:39:45 +0100
committerGitHub <noreply@github.com>2020-01-08 13:39:45 +0100
commit81e96f8b51dd1034f5ba1a72165202d4e15db2d5 (patch)
tree03a9acca4bb084344afe4b6985f0df5f3a518888 /config
parent679e69fe5c115f78644dcf816f69088cec2278a9 (diff)
parent8774a881126704a9c68a4ab4e748fec7572b795d (diff)
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.
Diffstat (limited to 'config')
-rw-r--r--config/src/tests/trace/trace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/src/tests/trace/trace.cpp b/config/src/tests/trace/trace.cpp
index fdb40d40893..41c874eb1d4 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 _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;
TEST("ensure that system clock is used by default") {
Trace trace(2);