Use vespalib::Lock -> std::mutex

2 files changed, 13 insertions, 23 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/tablemanager.cpp b/searchlib/src/vespa/searchlib/fef/tablemanager.cpp
index 9503e34cbaa..1aa7d4a14e9 100644
--- a/searchlib/src/vespa/searchlib/fef/tablemanager.cpp
+++ b/searchlib/src/vespa/searchlib/fef/tablemanager.cpp
@@ -2,36 +2,29 @@
 
 #include "tablemanager.h"
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
-TableManager::TableManager() :
-    _factories(),
-    _cache(),
-    _lock()
-{
-}
+TableManager::TableManager() = default;
 
-TableManager::~TableManager() {}
+TableManager::~TableManager() = default;
 
 const Table *
 TableManager::getTable(const vespalib::string & name) const
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     TableCache::const_iterator itr = _cache.find(name);
     if (itr != _cache.end()) {
         return itr->second.get();
     }
     for (size_t i = 0; i < _factories.size(); ++i) {
         Table::SP table = _factories[i]->createTable(name);
-        if (table.get() != NULL) {
+        if (table) {
             _cache.insert(std::make_pair(name, table));
             return table.get();
         }
     }
-    _cache.insert(std::make_pair(name, Table::SP(NULL)));
-    return NULL;
+    _cache.insert(std::make_pair(name, Table::SP()));
+    return nullptr;
 }
 
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/tablemanager.h b/searchlib/src/vespa/searchlib/fef/tablemanager.h
index 4efd8d4aeff..4b83cb7c7a0 100644
--- a/searchlib/src/vespa/searchlib/fef/tablemanager.h
+++ b/searchlib/src/vespa/searchlib/fef/tablemanager.h
@@ -4,12 +4,11 @@
 
 #include "itablefactory.h"
 #include "itablemanager.h"
-#include <vespa/vespalib/util/sync.h>
 #include <map>
 #include <vector>
+#include <mutex>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * This class manages a set of tables and contains an ordered list of table factories used to create tables,
@@ -24,11 +23,11 @@ private:
     typedef std::map<vespalib::string, Table::SP> TableCache;
     std::vector<ITableFactory::SP> _factories;
     mutable TableCache             _cache;
-    vespalib::Lock                 _lock;
+    mutable std::mutex             _lock;
 
 public:
     TableManager();
-    ~TableManager();
+    ~TableManager() override;
 
     /**
      * Adds a table factory to this manager.
@@ -46,6 +45,4 @@ public:
     const Table * getTable(const vespalib::string & name) const override;
 };
 
-} // namespace fef
-} // namespace search
-
+}