Use std::make_unique/make_shared.

2 files changed, 10 insertions, 10 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
index 614d11aabfa..623de8d85d1 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp
@@ -16,8 +16,8 @@ __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap=0;
 SearchEnvironment::Env::Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf) :
     _configId(configUri.getConfigId()),
     _configurer(std::make_unique<config::SimpleConfigRetriever>(createKeySet(configUri.getConfigId()), configUri.getContext()), this),
-    _vsmAdapter(new VSMAdapter(muffens, _configId, wf)),
-    _rankManager(new RankManager(_vsmAdapter.get()))
+    _vsmAdapter(std::make_unique<VSMAdapter>(muffens, _configId, wf)),
+    _rankManager(std::make_unique<RankManager>(_vsmAdapter.get()))
 {
     
     _configurer.start();
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 5e1e95b4681..a1ec153d7da 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -180,7 +180,7 @@ SearchVisitor::SearchVisitor(StorageComponent& component,
     _hitCount(0),
     _hitsRejectedCount(0),
     _query(),
-    _queryResult(new documentapi::QueryResultMessage()),
+    _queryResult(std::make_unique<documentapi::QueryResultMessage>()),
     _fieldSearcherMap(),
     _docTypeMapping(),
     _fieldSearchSpecMap(),
@@ -192,10 +192,10 @@ SearchVisitor::SearchVisitor(StorageComponent& component,
     _groupingList(),
     _attributeFields(),
     _sortList(),
-    _searchBuffer(new vsm::SearcherBuf()),
+    _searchBuffer(std::make_shared<vsm::SearcherBuf>()),
     _tmpSortBuffer(256),
-    _documentIdAttributeBacking(new search::SingleStringExtAttribute("[docid]") ),
-    _rankAttributeBacking(new search::SingleFloatExtAttribute("[rank]") ),
+    _documentIdAttributeBacking(std::make_shared<search::SingleStringExtAttribute>("[docid]") ),
+    _rankAttributeBacking(std::make_shared<search::SingleFloatExtAttribute>("[rank]") ),
     _documentIdAttribute(dynamic_cast<search::SingleStringExtAttribute &>(*_documentIdAttributeBacking)),
     _rankAttribute(dynamic_cast<search::SingleFloatExtAttribute &>(*_rankAttributeBacking)),
     _shouldFillRankAttribute(false),
@@ -680,8 +680,8 @@ SearchVisitor::setupScratchDocument(const StringFieldIdTMap & fieldsInQuery)
 void
 SearchVisitor::setupDocsumObjects()
 {
-    std::unique_ptr<DocsumFilter> docsumFilter(new DocsumFilter(_vsmAdapter->getDocsumTools(),
-                                                                _rankController.getRankProcessor()->getHitCollector()));
+    auto docsumFilter = std::make_unique<DocsumFilter>(_vsmAdapter->getDocsumTools(),
+                                                       _rankController.getRankProcessor()->getHitCollector());
     docsumFilter->init(_fieldSearchSpecMap.nameIdMap(), *_fieldPathMap);
     docsumFilter->setSnippetModifiers(_snippetModifierManager.getModifiers());
     _summaryGenerator.setFilter(std::move(docsumFilter));
@@ -815,7 +815,7 @@ SearchVisitor::setupGrouping(const std::vector<char> & groupingBlob)
     uint32_t numGroupings(0);
     is >> numGroupings;
     for(size_t i(0); i < numGroupings; i++) {
-        std::unique_ptr<Grouping> ag(new Grouping());
+        auto ag = std::make_unique<Grouping>();
         ag->deserialize(is);
         GroupingList::value_type groupingPtr(ag.release());
         Grouping & grouping = *groupingPtr;
@@ -882,7 +882,7 @@ SearchVisitor::handleDocuments(const document::BucketId&,
     const document::DocumentType* defaultDocType = _docTypeMapping.getDefaultDocumentType();
     assert(defaultDocType);
     for (const auto & entry : entries) {
-        StorageDocument::UP document(new StorageDocument(entry->releaseDocument(), _fieldPathMap, highestFieldNo));
+        auto document = std::make_unique<StorageDocument>(entry->releaseDocument(), _fieldPathMap, highestFieldNo);
 
         try {
             if (defaultDocType != nullptr