Add override.

4 files changed, 21 insertions, 27 deletions

diff --git a/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h b/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h
index 00ede178339..9802e1aa0b4 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/fakeindexsearchable.h
@@ -15,26 +15,23 @@ private:
     search::queryeval::FakeSearchable _fake;
 
 public:
-    FakeIndexSearchable()
-        : _fake()
-    {
-    }
+    FakeIndexSearchable() : _fake() { }
 
     search::queryeval::FakeSearchable &getFake() { return _fake; }
     
     /**
      * Implements IndexSearchable
      */
-    virtual Blueprint::UP
+    Blueprint::UP
     createBlueprint(const IRequestContext & requestContext,
                     const FieldSpec &field,
                     const Node &term,
-                    const IAttributeContext &)
+                    const IAttributeContext &) override
     {
         return _fake.createBlueprint(requestContext, field, term);
     }
 
-    virtual search::SearchableStats getSearchableStats() const {
+    search::SearchableStats getSearchableStats() const override {
         return search::SearchableStats();
     }
 
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h
index 1f5e17d7099..df7375b8580 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexcollection.h
@@ -37,32 +37,32 @@ public:
     IndexCollection(const ISourceSelectorSP & selector,
                     const ISearchableIndexCollection &sources);
 
-    virtual void append(uint32_t id, const IndexSearchable::SP &source);
-    virtual void replace(uint32_t id, const IndexSearchable::SP &source);
-    virtual IndexSearchable::SP getSearchableSP(uint32_t i) const;
-    virtual void setSource(uint32_t docId);
+    void append(uint32_t id, const IndexSearchable::SP &source) override;
+    void replace(uint32_t id, const IndexSearchable::SP &source) override;
+    IndexSearchable::SP getSearchableSP(uint32_t i) const override;
+    void setSource(uint32_t docId)  override;
 
 
     // Implements IIndexCollection
-    virtual const ISourceSelector &getSourceSelector() const;
-    virtual size_t getSourceCount() const;
-    virtual IndexSearchable &getSearchable(uint32_t i) const;
-    virtual uint32_t getSourceId(uint32_t i) const;
+    const ISourceSelector &getSourceSelector() const override;
+    size_t getSourceCount() const override;
+    IndexSearchable &getSearchable(uint32_t i) const override;
+    uint32_t getSourceId(uint32_t i) const override;
 
     // Implements IndexSearchable
-    virtual Blueprint::UP
+    Blueprint::UP
     createBlueprint(const IRequestContext & requestContext,
                     const FieldSpec &field,
                     const Node &term,
-                    const IAttributeContext &attrCtx);
-    virtual Blueprint::UP
+                    const IAttributeContext &attrCtx) override;
+    Blueprint::UP
     createBlueprint(const IRequestContext & requestContext,
                     const FieldSpecList &fields,
                     const Node &term,
-                    const IAttributeContext &attrCtx);
-    virtual search::SearchableStats getSearchableStats() const;
-    virtual search::SerialNum getSerialNum() const override;
-    virtual void accept(IndexSearchableVisitor &visitor) const override;
+                    const IAttributeContext &attrCtx) override;
+    search::SearchableStats getSearchableStats() const  override;
+    search::SerialNum getSerialNum() const override;
+    void accept(IndexSearchableVisitor &visitor) const override;
 
     static ISearchableIndexCollection::UP replaceAndRenumber(
             const ISourceSelectorSP & selector,
diff --git a/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.cpp b/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.cpp
index 0f670d31855..d7f3c4ef44f 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.cpp
+++ b/searchcorespi/src/vespa/searchcorespi/index/indexsearchable.cpp
@@ -1,8 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".searchcorespi.index.indexsearchable");
 #include "indexsearchable.h"
 #include <vespa/searchlib/queryeval/intermediate_blueprints.h>
 #include <vespa/searchlib/queryeval/leaf_blueprints.h>
diff --git a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
index 21a96e2bcff..210a64a6037 100644
--- a/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
+++ b/searchcorespi/src/vespa/searchcorespi/index/warmupindexcollection.h
@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <vespa/searchcorespi/index/isearchableindexcollection.h>
+#include "isearchableindexcollection.h"
+#include "warmupconfig.h"
 #include <vespa/vespalib/util/threadexecutor.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
-#include "warmupconfig.h"
 
 namespace searchcorespi {