Merge pull request #17400 from vespa-engine/balder/minor-cleanup-while-reading-code

Minor c++11 code cleanup.

4 files changed, 11 insertions, 19 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h
index 6402cc4b1ef..99cf27dea41 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/iindexcollection.h
@@ -4,11 +4,7 @@
 
 #include "indexsearchable.h"
 
-namespace search {
-    namespace queryeval {
-        class ISourceSelector;
-    }
-}
+namespace search::queryeval { class ISourceSelector; }
 namespace searchcorespi {
 
 /**
diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp
index f7abcedbf89..168a6680f45 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.cpp
@@ -164,8 +164,8 @@ WarmupIndexCollection::createBlueprint(const IRequestContext & requestContext,
         needWarmUp = needWarmUp || ! handledBefore(fs.getFieldId(), term);
     }
     if (needWarmUp) {
-        Task::UP task(new WarmupTask(mdl.createMatchData(), *this));
-        static_cast<WarmupTask &>(*task).createBlueprint(fsl, term);
+        auto task = std::make_unique<WarmupTask>(mdl.createMatchData(), *this);
+        task->createBlueprint(fsl, term);
         fireWarmup(std::move(task));
     }
     return _prev->createBlueprint(requestContext, fields, term);
diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp
index 9f01ce0cf9f..db3df4648c7 100644
--- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp
@@ -35,7 +35,7 @@ FixedSourceSelector::Iterator::Iterator(const FixedSourceSelector & sourceSelect
 FixedSourceSelector::FixedSourceSelector(queryeval::Source defaultSource,
                                          const vespalib::string & attrBaseFileName,
                                          uint32_t initialNumDocs) :
-    SourceSelector(defaultSource, AttributeVector::SP(new SourceStore(attrBaseFileName, getConfig()))),
+    SourceSelector(defaultSource, std::make_shared<SourceStore>(attrBaseFileName, getConfig())),
     _source(static_cast<SourceStore &>(*_realSource))
 {
     if (initialNumDocs != std::numeric_limits<uint32_t>::max()) {
@@ -44,16 +44,13 @@ FixedSourceSelector::FixedSourceSelector(queryeval::Source defaultSource,
     }
 }
 
-FixedSourceSelector::~FixedSourceSelector()
-{
-}
+FixedSourceSelector::~FixedSourceSelector() = default;
 
 FixedSourceSelector::UP
-FixedSourceSelector::cloneAndSubtract(const vespalib::string & attrBaseFileName,
-                                      uint32_t diff)
+FixedSourceSelector::cloneAndSubtract(const vespalib::string & attrBaseFileName, uint32_t diff)
 {
     queryeval::Source newDefault = getNewSource(getDefaultSource(), diff);
-    FixedSourceSelector::UP selector(new FixedSourceSelector(newDefault, attrBaseFileName, _source.getNumDocs()-1));
+    auto selector = std::make_unique< FixedSourceSelector>(newDefault, attrBaseFileName, _source.getNumDocs()-1);
     for (uint32_t docId = 0; docId < _source.getNumDocs(); ++docId) {
         queryeval::Source src = _source.get(docId);
         src = getNewSource(src, diff);
@@ -78,10 +75,9 @@ FixedSourceSelector::load(const vespalib::string & baseFileName, uint32_t curren
             (uint32_t) info->header()._defaultSource, defaultSource,
             baseFileName.c_str());
     }
-    FixedSourceSelector::UP selector(new FixedSourceSelector(
-                                             defaultSource,
-                                             info->header()._baseFileName,
-                                             std::numeric_limits<uint32_t>::max()));
+    auto selector = std::make_unique<FixedSourceSelector>(defaultSource,
+                                                          info->header()._baseFileName,
+                                                          std::numeric_limits<uint32_t>::max());
     selector->setBaseId(info->header()._baseId);
     selector->_source.load();
     uint32_t cappedSources = capSelector(selector->_source, selector->getDefaultSource());
diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h
index 055d216dda1..9cffe5b001b 100644
--- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h
+++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h
@@ -30,7 +30,7 @@ public:
     FixedSourceSelector(queryeval::Source defaultSource,
                         const vespalib::string & attrBaseFileName,
                         uint32_t initialNumDocs = 0);
-    ~FixedSourceSelector();
+    ~FixedSourceSelector() override;
 
     FixedSourceSelector::UP cloneAndSubtract(const vespalib::string & attrBaseFileName, uint32_t diff);
     static FixedSourceSelector::UP load(const vespalib::string & baseFileName, uint32_t currentId);