Use vespalib::Lock -> std::mutex

4 files changed, 7 insertions, 7 deletions

diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
index 53e194fad2d..4126f34716f 100644
--- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp
+++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
@@ -140,7 +140,7 @@ Test::Main()
     FastOS_ThreadPool threadPool(0x10000);
     FNET_Transport transport;
     FRT_Supervisor supervisor(&transport);
-    MirrorAPI mirror(supervisor, config::ConfigUri::createFromInstance(specBuilder));
+    MirrorAPI mirror(supervisor, slobrok::ConfiguratorFactory(config::ConfigUri::createFromInstance(specBuilder)));
     EXPECT_TRUE(!mirror.ready());
     transport.Start(&threadPool);
     std::this_thread::sleep_for(1s);
diff --git a/slobrok/src/vespa/slobrok/cfg.h b/slobrok/src/vespa/slobrok/cfg.h
index 173f08c3227..db83790677a 100644
--- a/slobrok/src/vespa/slobrok/cfg.h
+++ b/slobrok/src/vespa/slobrok/cfg.h
@@ -31,9 +31,9 @@ class ConfiguratorFactory {
 private:
     config::ConfigUri _uri;
 public:
-    ConfiguratorFactory(const config::ConfigUri & uri);
+    explicit ConfiguratorFactory(const config::ConfigUri & uri);
     // Convenience. Might belong somewhere else
-    ConfiguratorFactory(const std::vector<std::string> & spec);
+    explicit ConfiguratorFactory(const std::vector<std::string> & spec);
 
     Configurator::UP create(Configurable &target) const;
 };
diff --git a/slobrok/src/vespa/slobrok/sbmirror.cpp b/slobrok/src/vespa/slobrok/sbmirror.cpp
index f0a810dad10..855ed4dd82d 100644
--- a/slobrok/src/vespa/slobrok/sbmirror.cpp
+++ b/slobrok/src/vespa/slobrok/sbmirror.cpp
@@ -55,7 +55,7 @@ MirrorAPI::SpecList
 MirrorAPI::lookup(const std::string & pattern) const
 {
     SpecList ret;
-    LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     SpecList::const_iterator end = _specs.end();
     for (SpecList::const_iterator it = _specs.begin(); it != end; ++it) {
         if (match(it->first.c_str(), pattern.c_str())) {
@@ -104,7 +104,7 @@ void
 MirrorAPI::updateTo(SpecList& newSpecs, uint32_t newGen)
 {
     {
-        LockGuard guard(_lock);
+        std::lock_guard guard(_lock);
         std::swap(newSpecs, _specs);
         _updates.add();
     }
@@ -117,7 +117,7 @@ MirrorAPI::updateTo(SpecList& newSpecs, uint32_t newGen)
 bool
 MirrorAPI::ready() const
 {
-    LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     return _updates.getAsInt() != 0;
 }
 
diff --git a/slobrok/src/vespa/slobrok/sbmirror.h b/slobrok/src/vespa/slobrok/sbmirror.h
index 152886fc02e..437ef334af6 100644
--- a/slobrok/src/vespa/slobrok/sbmirror.h
+++ b/slobrok/src/vespa/slobrok/sbmirror.h
@@ -88,7 +88,7 @@ private:
     void reSched(double seconds);
 
     FRT_Supervisor          &_orb;
-    mutable vespalib::Lock   _lock;
+    mutable std::mutex       _lock;
     bool                     _reqPending;
     bool                     _scheduled;
     bool                     _reqDone;