Minor c++11 code cleanup.

2 files changed, 3 insertions, 7 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);