Use standard locking in StorageComponent.

2 files changed, 10 insertions, 10 deletions

diff --git a/storage/src/vespa/storage/common/storagecomponent.cpp b/storage/src/vespa/storage/common/storagecomponent.cpp
index a519e39e2ed..bf387240dc5 100644
--- a/storage/src/vespa/storage/common/storagecomponent.cpp
+++ b/storage/src/vespa/storage/common/storagecomponent.cpp
@@ -28,14 +28,14 @@ StorageComponent::setNodeInfo(vespalib::stringref clusterName,
 void
 StorageComponent::setDocumentTypeRepo(DocumentTypeRepoSP repo)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     _docTypeRepo = repo;
 }
 
 void
 StorageComponent::setLoadTypes(LoadTypeSetSP loadTypes)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     _loadTypes = loadTypes;
 }
 
@@ -57,14 +57,14 @@ StorageComponent::setBucketIdFactory(const document::BucketIdFactory& factory)
 void
 StorageComponent::setDistribution(DistributionSP distribution)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     _distribution = distribution;
 }
 
 void
 StorageComponent::setNodeStateUpdater(NodeStateUpdater& updater)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     if (_nodeStateUpdater != 0) {
         throw vespalib::IllegalStateException(
                 "Node state updater is already set", VESPA_STRLOC);
@@ -87,7 +87,7 @@ StorageComponent::StorageComponent(StorageComponentRegister& compReg,
 NodeStateUpdater&
 StorageComponent::getStateUpdater() const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     if (_nodeStateUpdater == 0) {
         throw vespalib::IllegalStateException(
                 "Component need node state updater at this time, but it has "
@@ -114,21 +114,21 @@ StorageComponent::getPriority(const documentapi::LoadType& lt) const
 StorageComponent::DocumentTypeRepoSP
 StorageComponent::getTypeRepo() const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     return _docTypeRepo;
 }
 
 StorageComponent::LoadTypeSetSP
 StorageComponent::getLoadTypes() const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     return _loadTypes;
 }
 
 StorageComponent::DistributionSP
 StorageComponent::getDistribution() const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard<std::mutex> guard(_lock);
     return _distribution;
 }
 
diff --git a/storage/src/vespa/storage/common/storagecomponent.h b/storage/src/vespa/storage/common/storagecomponent.h
index f34b6ace745..d469540b55f 100644
--- a/storage/src/vespa/storage/common/storagecomponent.h
+++ b/storage/src/vespa/storage/common/storagecomponent.h
@@ -35,7 +35,7 @@
 #include <vespa/storageframework/generic/component/componentregister.h>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/vdslib/state/node.h>
-#include <vespa/vespalib/util/sync.h>
+#include <mutex>
 
 namespace vespa { namespace config { namespace content { namespace core {
 namespace internal {
@@ -113,7 +113,7 @@ private:
     document::BucketIdFactory _bucketIdFactory;
     DistributionSP _distribution;
     NodeStateUpdater* _nodeStateUpdater;
-    vespalib::Lock _lock;
+    mutable std::mutex _lock;
 };
 
 struct StorageComponentRegister : public virtual framework::ComponentRegister