- GC unused code.

- vespalib::Lock -> std::mutex

2 files changed, 3 insertions, 3 deletions

diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp
index 8307954faae..db238279fa3 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp
+++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.cpp
@@ -116,7 +116,7 @@ DocsumTools::obtainFieldNames(const FastS_VsmsummaryHandle &cfg)
 void
 VSMAdapter::configure(const VSMConfigSnapshot & snapshot)
 {
-    vespalib::LockGuard guard(_lock);
+    std::lock_guard guard(_lock);
     LOG(debug, "(re-)configure VSM (docsum tools)");
 
     std::shared_ptr<SummaryConfig>      summary(snapshot.getConfig<SummaryConfig>().release());
@@ -141,7 +141,7 @@ VSMAdapter::configure(const VSMConfigSnapshot & snapshot)
     }
 
     // init keyword extractor
-    std::unique_ptr<KeywordExtractor> kwExtractor(new KeywordExtractor(NULL));
+    auto kwExtractor = std::make_unique<KeywordExtractor>(nullptr);
     kwExtractor->AddLegalIndexSpec(_highlightindexes.c_str());
     vespalib::string spec = kwExtractor->GetLegalIndexSpec();
     LOG(debug, "index highlight spec: '%s'", spec.c_str());
diff --git a/vsm/src/vespa/vsm/vsm/vsm-adapter.h b/vsm/src/vespa/vsm/vsm/vsm-adapter.h
index 31e472713de..f6895dd71a6 100644
--- a/vsm/src/vespa/vsm/vsm/vsm-adapter.h
+++ b/vsm/src/vespa/vsm/vsm/vsm-adapter.h
@@ -127,7 +127,7 @@ private:
     vespalib::PtrHolder<DocsumTools>          _docsumTools;
     std::unique_ptr<JuniperProperties>        _juniperProps;
 
-    vespalib::Lock                                  _lock;
+    std::mutex                                _lock;
 
     VSMAdapter(const VSMAdapter &);
     VSMAdapter &operator=(const VSMAdapter &);