remove most usage of LinkedPtr from vespa

5 files changed, 10 insertions, 10 deletions

diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
index 704066ce964..66b7743c3b3 100644
--- a/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor.cpp
@@ -44,15 +44,15 @@ SearchVisitorTest::SearchVisitorTest() :
     _component.reset(new StorageComponent(_componentRegister, "storage"));
 };
 
-std::vector<spi::DocEntry::LP>
+std::vector<spi::DocEntry::UP>
 createDocuments(const vespalib::string & dir)
 {
     (void) dir;
-    std::vector<spi::DocEntry::LP> documents;
+    std::vector<spi::DocEntry::UP> documents;
     spi::Timestamp ts;
     document::Document::UP doc(new document::Document());
-    spi::DocEntry::LP e(new spi::DocEntry(ts, 0, std::move(doc)));
-    documents.push_back(e);
+    spi::DocEntry::UP e(new spi::DocEntry(ts, 0, std::move(doc)));
+    documents.push_back(std::move(e));
     return documents;
 }
 
@@ -64,7 +64,7 @@ SearchVisitorTest::testCreateSearchVisitor(const vespalib::string & dir, const v
     std::unique_ptr<Visitor> sv(static_cast<SearchVisitor *>(factory.makeVisitor(*_component, _env, params)));
     document::OrderingSpecification orderSpec;
     document::BucketId bucketId;
-    std::vector<spi::DocEntry::LP> documents(createDocuments(dir));
+    std::vector<spi::DocEntry::UP> documents(createDocuments(dir));
     Visitor::HitCounter hitCounter(&orderSpec);
     sv->handleDocuments(bucketId, documents, hitCounter);
 }
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
index 76a1a832ca6..493260814f9 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
@@ -69,7 +69,7 @@ SearchEnvironment::Env & SearchEnvironment::getEnv(const vespalib::string & sear
     if (_localEnvMap == NULL) {
         _localEnvMap = new EnvMap;
         vespalib::LockGuard guard(_lock);
-        _threadLocals.push_back(EnvMapLP(_localEnvMap));
+        _threadLocals.push_back(EnvMapUP(_localEnvMap));
     }
     EnvMap::iterator localFound = _localEnvMap->find(searchCluster);
     if (localFound == _localEnvMap->end()) {
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
index 0d3b9938089..0da6495bb05 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h
@@ -32,8 +32,8 @@ private:
         std::unique_ptr<RankManager>     _rankManager;
     };
     typedef vespalib::hash_map<vespalib::string, Env::SP> EnvMap;
-    typedef vespalib::LinkedPtr<EnvMap> EnvMapLP;
-    typedef std::vector< vespalib::LinkedPtr<EnvMap> > ThreadLocals;
+    typedef std::unique_ptr<EnvMap> EnvMapUP;
+    typedef std::vector<EnvMapUP> ThreadLocals;
 
     static __thread EnvMap * _localEnvMap;
     EnvMap                   _envMap;
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 70adaa682e5..16cf83ea0df 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -866,7 +866,7 @@ SearchVisitor::compatibleDocumentTypes(const document::DocumentType& typeA,
 
 void
 SearchVisitor::handleDocuments(const document::BucketId&,
-                               std::vector<spi::DocEntry::LP>& entries,
+                               std::vector<spi::DocEntry::UP>& entries,
                                HitCounter& hitCounter)
 {
     (void) hitCounter;
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 672a420e55a..ff30bf09c48 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -298,7 +298,7 @@ private:
 
     // Inherit doc from Visitor
     void handleDocuments(const document::BucketId&,
-                         std::vector<spi::DocEntry::LP>& entries,
+                         std::vector<spi::DocEntry::UP>& entries,
                          HitCounter& hitCounter) override;
 
     bool compatibleDocumentTypes(const document::DocumentType& typeA,