Use matching duration for time_point.

2 files changed, 6 insertions, 6 deletions

diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 52b17576c5c..9e6b0f40be3 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -29,7 +29,7 @@ struct MetricManagerTest : public ::testing::Test {
     // MetricManager that aren't accessible to "freestanding" fixtures. So we
     // get the test to do the necessary poking and prodding for us instead.
     void takeSnapshots(MetricManager& mm, time_t timeToProcess) {
-        mm.takeSnapshots(mm.getMetricLock(), system_time(vespalib::from_s(timeToProcess)));
+        mm.takeSnapshots(mm.getMetricLock(), system_time(vespalib::from_s<system_time::duration>(timeToProcess)));
     }
 };
 
@@ -364,7 +364,7 @@ class FakeTimer : public MetricManager::Timer {
     std::atomic<time_t> _time;
 public:
     FakeTimer(time_t startTime = 0) : _time(startTime) {}
-    time_point getTime() const override { return time_point(vespalib::from_s(load_relaxed(_time))); }
+    time_point getTime() const override { return time_point(vespalib::from_s<time_point::duration>(load_relaxed(_time))); }
     void set_time(time_t t) noexcept { store_relaxed(_time, t); }
     // Not safe for multiple writers, only expected to be called by test.
     void add_time(time_t t) noexcept { set_time(load_relaxed(_time) + t); }
@@ -384,7 +384,7 @@ struct BriefValuePrinter : public MetricVisitor {
     }
 };
 
-bool waitForTimeProcessed(const MetricManager& mm, vespalib::duration processtime, uint32_t timeout = 120)
+bool waitForTimeProcessed(const MetricManager& mm, time_point::duration processtime, uint32_t timeout = 120)
 {
     uint32_t lastchance = time(0) + timeout;
     while (time(0) < lastchance) {
@@ -945,7 +945,7 @@ namespace {
         std::mutex&         _output_mutex;
         FakeTimer&          _timer;
 
-        MyUpdateHook(std::ostringstream& output, std::mutex& output_mutex, const char* name, vespalib::duration period, FakeTimer& timer)
+        MyUpdateHook(std::ostringstream& output, std::mutex& output_mutex, const char* name, vespalib::system_clock::duration period, FakeTimer& timer)
             : UpdateHook(name, period),
               _output(output),
               _output_mutex(output_mutex),
diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp
index 5561825e2ba..580769bbadb 100644
--- a/metrics/src/tests/snapshottest.cpp
+++ b/metrics/src/tests/snapshottest.cpp
@@ -148,7 +148,7 @@ TestMetricSet::incValues() {
 struct FakeTimer : public MetricManager::Timer {
     uint32_t _timeInSecs;
     FakeTimer() : _timeInSecs(1) {}
-    time_point getTime() const override { return time_point(vespalib::from_s(_timeInSecs)); }
+    time_point getTime() const override { return time_point(vespalib::from_s<time_point::duration>(_timeInSecs)); }
 };
 
 void ASSERT_VALUE(int32_t value, const MetricSnapshot & snapshot, const char *name) __attribute__((noinline));
@@ -166,7 +166,7 @@ void ASSERT_VALUE(int32_t value, const MetricSnapshot & snapshot, const char *na
 
 struct SnapshotTest : public ::testing::Test {
     void tick(MetricManager& mgr, time_t currentTime) {
-        mgr.tick(mgr.getMetricLock(), time_point(vespalib::from_s(currentTime)));
+        mgr.tick(mgr.getMetricLock(), time_point(vespalib::from_s<time_point::duration>(currentTime)));
     }
 };