Use std::mutex/std::condition_variable over vespalib::Monitor

2 files changed, 4 insertions, 7 deletions

diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp
index e0f441089ff..ec73150b3f2 100644
--- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp
+++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp
@@ -137,8 +137,7 @@ namespace {
     struct MetricHookWrapper : public metrics::UpdateHook {
         MetricUpdateHook& _hook;
 
-        MetricHookWrapper(vespalib::stringref name,
-                          MetricUpdateHook& hook)
+        MetricHookWrapper(vespalib::stringref name, MetricUpdateHook& hook)
             : metrics::UpdateHook(name.data()), // Expected to point to static name
               _hook(hook)
         {
diff --git a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
index 2fade6f1f56..fb9606f33e0 100644
--- a/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
+++ b/storageframework/src/vespa/storageframework/generic/metric/metricupdatehook.h
@@ -7,15 +7,13 @@
  */
 #pragma once
 
-namespace vespalib {
-    class MonitorGuard;
-}
+#include <mutex>
 
 namespace storage::framework {
 
 struct MetricUpdateHook {
-    using MetricLockGuard = vespalib::MonitorGuard;
-    virtual ~MetricUpdateHook() {}
+    using MetricLockGuard = std::unique_lock<std::mutex>;
+    virtual ~MetricUpdateHook() = default;
 
     virtual void updateMetrics(const MetricLockGuard &) = 0;
 };