add override in searchcore module

43 files changed, 210 insertions, 211 deletions

diff --git a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
index 234edd7d45a..dd539233489 100644
--- a/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
+++ b/searchcore/src/tests/applyattrupdates/applyattrupdates.cpp
@@ -139,7 +139,7 @@ private:
 
 public:
     Test();
-    int Main();
+    int Main() override;
 };
 
 namespace {
diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index 12abe0eb3b5..638eb40c3dc 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -41,15 +41,15 @@ public:
         return _vectors.find(name)->second;
     }
     virtual const IAttributeVector *
-    getAttribute(const string &name) const {
+    getAttribute(const string &name) const override {
         return get(name);
     }
     virtual const IAttributeVector *
-    getAttributeStableEnum(const string &name) const {
+    getAttributeStableEnum(const string &name) const override {
         return get(name);
     }
     virtual void
-    getAttributeList(std::vector<const IAttributeVector *> & list) const {
+    getAttributeList(std::vector<const IAttributeVector *> & list) const override {
         Map::const_iterator pos = _vectors.begin();
         Map::const_iterator end = _vectors.end();
         for (; pos != end; ++pos) {
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index be8aedb072b..50502767395 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -56,7 +56,7 @@ public:
     }
 
     virtual void
-    run(void)
+    run(void) override
     {
         _task->run();
         _gate->countDown();
@@ -227,7 +227,7 @@ private:
     void requireThatFlushedAttributeCanBeLoaded();
 public:
     int
-    Main(void);
+    Main(void) override;
 };
 
 
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp
index d82eaa747db..6030c9c6fad 100644
--- a/searchcore/src/tests/proton/common/cachedselect_test.cpp
+++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp
@@ -195,7 +195,7 @@ public:
     }
 
     virtual uint32_t
-    get(AttributeVector::DocId doc, largeint_t *v, uint32_t sz) const
+    get(AttributeVector::DocId doc, largeint_t *v, uint32_t sz) const override
     {
         ++_gets;
         return SvIntAttr::get(doc, v, sz);
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index c9eb60973b9..e0e0c477753 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -381,7 +381,7 @@ private:
 
 public:
     Test();
-    int Main();
+    int Main() override;
 };
 
 
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 13f0cd1cd2b..487e84c02d6 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -196,7 +196,7 @@ class Test : public vespalib::TestApp {
     void setSpanTree(StringFieldValue & value, SpanTree::UP tree);
 public:
     Test();
-    int Main();
+    int Main() override;
 };
 
 DocumenttypesConfig getDocumenttypesConfig() {
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
index 71ee6961fff..1910161cd32 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
@@ -65,7 +65,7 @@ struct MyChangedHandler : public IBucketStateChangedHandler
     MyChangedHandler() : _bucket(), _state(BucketInfo::NOT_ACTIVE) {}
 
     virtual void notifyBucketStateChanged(const document::BucketId &bucketId,
-                                          storage::spi::BucketInfo::ActiveState newState) {
+                                          storage::spi::BucketInfo::ActiveState newState) override {
         _bucket = bucketId;
         _state = newState;
     }
@@ -75,7 +75,7 @@ struct MyChangedHandler : public IBucketStateChangedHandler
 struct MyModifiedHandler : public IBucketModifiedHandler
 {
     virtual void
-    notifyBucketModified(const BucketId &bucket)
+    notifyBucketModified(const BucketId &bucket) override
     {
         (void) bucket;
     }
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
index 3c0fe62e228..c66e9f49274 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/clusterstatehandler_test.cpp
@@ -18,7 +18,7 @@ struct MyClusterStateChangedHandler : public IClusterStateChangedHandler
 {
     IBucketStateCalculator::SP _calc;
     virtual void
-    notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) {
+    notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) override {
         _calc = newCalc;
     }
 };
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
index 72276e9dfcb..61796df8468 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
@@ -17,8 +17,8 @@ typedef std::vector<IFeedView::SP> FeedViewVector;
 
 struct MyStreamHandler : public NewConfigOperation::IStreamHandler
 {
-    virtual void serializeConfig(SerialNum, vespalib::nbostream &) {}
-    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {}
+    virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {}
+    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {}
 };
 
 
@@ -69,21 +69,21 @@ struct MyFeedView : public test::DummyFeedView
     }
 
     // Implements IFeedView
-    virtual const DocumentMetaStore *getDocumentMetaStorePtr() const { return &_metaStore; }
-    virtual void preparePut(PutOperation &) { ++_preparePut; }
-    virtual void handlePut(FeedToken *, const PutOperation &) { ++_handlePut; }
-    virtual void prepareUpdate(UpdateOperation &) { ++_prepareUpdate; }
-    virtual void handleUpdate(FeedToken *, const UpdateOperation &) { ++_handleUpdate; }
-    virtual void prepareRemove(RemoveOperation &) { ++_prepareRemove; }
-    virtual void handleRemove(FeedToken *, const RemoveOperation &) { ++_handleRemove; }
-    virtual void prepareDeleteBucket(DeleteBucketOperation &) { ++_prepareDeleteBucket; }
-    virtual void handleDeleteBucket(const DeleteBucketOperation &)
+    virtual const DocumentMetaStore *getDocumentMetaStorePtr() const override { return &_metaStore; }
+    virtual void preparePut(PutOperation &) override { ++_preparePut; }
+    virtual void handlePut(FeedToken *, const PutOperation &) override { ++_handlePut; }
+    virtual void prepareUpdate(UpdateOperation &) override { ++_prepareUpdate; }
+    virtual void handleUpdate(FeedToken *, const UpdateOperation &) override { ++_handleUpdate; }
+    virtual void prepareRemove(RemoveOperation &) override { ++_prepareRemove; }
+    virtual void handleRemove(FeedToken *, const RemoveOperation &) override { ++_handleRemove; }
+    virtual void prepareDeleteBucket(DeleteBucketOperation &) override { ++_prepareDeleteBucket; }
+    virtual void handleDeleteBucket(const DeleteBucketOperation &) override
     { ++_handleDeleteBucket; }
-    virtual void prepareMove(MoveOperation &) { ++_prepareMove; }
-    virtual void handleMove(const MoveOperation &) { ++_handleMove; }
-    virtual void heartBeat(SerialNum) { ++_heartBeat; }
-    virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &) { ++_handlePrune; }
-    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) {
+    virtual void prepareMove(MoveOperation &) override { ++_prepareMove; }
+    virtual void handleMove(const MoveOperation &) override { ++_handleMove; }
+    virtual void heartBeat(SerialNum) override { ++_heartBeat; }
+    virtual void handlePruneRemovedDocuments(const PruneRemovedDocumentsOperation &) override { ++_handlePrune; }
+    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) override {
         _wantedLidLimit = op.getLidLimit();
     }
 };
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
index 60f04bb0fa7..0cd11a9f9c4 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp
@@ -59,7 +59,7 @@ const vespalib::string DOC_TYPE("invalid");
 
 class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer
 {
-    virtual bool reconfigure(vespalib::Closure0<bool>::UP closure) {
+    virtual bool reconfigure(vespalib::Closure0<bool>::UP closure) override {
         bool ret = true;
         if (closure.get() != NULL)
             ret = closure->call(); // Perform index manager reconfiguration now
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
index e6a49455c41..ea201dfd251 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp
@@ -85,18 +85,18 @@ struct MySubDBOwner : public IDocumentSubDBOwner
 
 struct MySyncProxy : public SyncProxy
 {
-	virtual void sync(SerialNum) {}
+	virtual void sync(SerialNum) override {}
 };
 
 
 struct MyGetSerialNum : public IGetSerialNum
 {
-    virtual SerialNum getSerialNum() const { return 0u; }
+    virtual SerialNum getSerialNum() const override { return 0u; }
 };
 
 struct MyFileHeaderContext : public FileHeaderContext
 {
-	virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const {}
+	virtual void addTags(vespalib::GenericHeader &, const vespalib::string &) const override {}
 };
 
 struct MyMetricsWireService : public DummyWireService
diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
index ab0acb1d77c..c70c2c28001 100644
--- a/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/documentbucketmover_test.cpp
@@ -53,7 +53,7 @@ struct MyMoveHandler : public IDocumentMoveHandler
           _moves(),
           _numCachedBuckets()
     {}
-    virtual void handleMove(MoveOperation &op) {
+    virtual void handleMove(MoveOperation &op) override {
         _moves.push_back(op);
         if (_bucketDb.takeGuard()->isCachedBucket(op.getBucketId())) {
             ++_numCachedBuckets;
@@ -73,16 +73,16 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
     MyDocumentRetriever(DocumentTypeRepo::SP repo) : _repo(repo), _docs() {
         _docs.push_back(Document::SP()); // lid 0 invalid
     }
-    virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const { return *_repo; }
+    virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const override { return *_repo; }
     virtual void getBucketMetaData(const storage::spi::Bucket &,
-                                   DocumentMetaData::Vector &) const {}
-    virtual DocumentMetaData getDocumentMetaData(const DocumentId &) const { return DocumentMetaData(); }
-    virtual Document::UP getDocument(DocumentIdT lid) const {
+                                   DocumentMetaData::Vector &) const override {}
+    virtual DocumentMetaData getDocumentMetaData(const DocumentId &) const override { return DocumentMetaData(); }
+    virtual Document::UP getDocument(DocumentIdT lid) const override {
         return Document::UP(_docs[lid]->clone());
     }
 
     virtual CachedSelect::SP
-    parseSelect(const vespalib::string &) const
+    parseSelect(const vespalib::string &) const override
     {
         return CachedSelect::SP();
     }
@@ -92,7 +92,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
 struct MyBucketModifiedHandler : public IBucketModifiedHandler
 {
     BucketIdVector _modified;
-    virtual void notifyBucketModified(const BucketId &bucket) {
+    virtual void notifyBucketModified(const BucketId &bucket) override {
         BucketIdVector::const_iterator itr = std::find(_modified.begin(), _modified.end(), bucket);
         ASSERT_TRUE(itr == _modified.end());
         _modified.push_back(bucket);
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index 6be31b8a5fb..6e2df00b162 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -108,16 +108,16 @@ struct MyOwner : public IFeedHandlerOwner
         wipe_history_count(0)
     {
     }
-    virtual void performWipeHistory() { ++wipe_history_count; }
-    virtual void onTransactionLogReplayDone() {
+    virtual void performWipeHistory() override { ++wipe_history_count; }
+    virtual void onTransactionLogReplayDone() override {
         LOG(info, "MyOwner::onTransactionLogReplayDone()");
     }
-    virtual void enterRedoReprocessState() {}
-    virtual void onPerformPrune(SerialNum) {}
-    virtual bool isFeedBlockedByRejectedConfig() { return rejected_config; }
+    virtual void enterRedoReprocessState() override {}
+    virtual void onPerformPrune(SerialNum) override {}
+    virtual bool isFeedBlockedByRejectedConfig() override { return rejected_config; }
 
     virtual bool
-    getAllowPrune(void) const
+    getAllowPrune(void) const override
     {
         return _allowPrune;
     }
@@ -141,8 +141,8 @@ struct MyResourceWriteFilter : public IResourceWriteFilter
 
 
 struct MyReplayConfig : public IReplayConfig {
-    virtual void replayConfig(SerialNum) {}
-    virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) {}
+    virtual void replayConfig(SerialNum) override {}
+    virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) override {}
 };
 
 void ackToken(FeedToken *token) {
@@ -202,7 +202,7 @@ struct MyFeedView : public test::DummyFeedView {
     MyFeedView(const DocumentTypeRepo::SP &dtr);
     ~MyFeedView();
     void resetPutLatch(uint32_t count) { putLatch.reset(new vespalib::CountDownLatch(count)); }
-    virtual void preparePut(PutOperation &op) {
+    virtual void preparePut(PutOperation &op) override {
         prepareDocumentOperation(op, op.getDocument()->getId().getGlobalId());
     }
     void prepareDocumentOperation(DocumentOperation &op, const GlobalId &gid) {
@@ -213,7 +213,7 @@ struct MyFeedView : public test::DummyFeedView {
             op.setPrevTimestamp(entry->_prevTimestamp);
         }
     }
-    virtual void handlePut(FeedToken *token, const PutOperation &putOp) {
+    virtual void handlePut(FeedToken *token, const PutOperation &putOp) override {
         LOG(info, "MyFeedView::handlePut(): docId(%s), putCount(%u), putLatchCount(%u)",
             putOp.getDocument()->getId().toString().c_str(), put_count,
             (putLatch.get() != NULL ? putLatch->getCount() : 0u));
@@ -228,21 +228,21 @@ struct MyFeedView : public test::DummyFeedView {
         }
         ackToken(token);
     }
-    virtual void prepareUpdate(UpdateOperation &op) {
+    virtual void prepareUpdate(UpdateOperation &op) override {
         prepareDocumentOperation(op, op.getUpdate()->getId().getGlobalId());
     }
-    virtual void handleUpdate(FeedToken *token, const UpdateOperation &op) {
+    virtual void handleUpdate(FeedToken *token, const UpdateOperation &op) override {
         ++update_count;
         update_serial = op.getSerialNum();
         ackToken(token);
     }
-    virtual void handleRemove(FeedToken *token, const RemoveOperation &)
+    virtual void handleRemove(FeedToken *token, const RemoveOperation &) override
     { ++remove_count; ackToken(token); }
-    virtual void handleMove(const MoveOperation &) { ++move_count; }
-    virtual void heartBeat(SerialNum) { ++heartbeat_count; }
+    virtual void handleMove(const MoveOperation &) override { ++move_count; }
+    virtual void heartBeat(SerialNum) override { ++heartbeat_count; }
     virtual void handlePruneRemovedDocuments(
-            const PruneRemovedDocumentsOperation &) { ++prune_removed_count; }
-    virtual const ISimpleDocumentMetaStore *getDocumentMetaStorePtr() const {
+            const PruneRemovedDocumentsOperation &) override { ++prune_removed_count; }
+    virtual const ISimpleDocumentMetaStore *getDocumentMetaStorePtr() const override {
         return NULL;
     }
 };
@@ -310,7 +310,7 @@ struct MyTransport : public FeedToken::ITransport {
     bool documentWasFound;
     MyTransport();
     ~MyTransport();
-    virtual void send(Reply::UP, ResultUP res, bool documentWasFound_, double) {
+    virtual void send(Reply::UP, ResultUP res, bool documentWasFound_, double) override {
         result = std::move(res);
         documentWasFound = documentWasFound_;
         gate.countDown();
@@ -415,11 +415,11 @@ struct MyTlsWriter : TlsWriter {
     bool erase_return;
 
     MyTlsWriter() : store_count(0), erase_count(0), erase_return(true) {}
-    virtual void storeOperation(const FeedOperation &) { ++store_count; }
-    virtual bool erase(SerialNum) { ++erase_count; return erase_return; }
+    virtual void storeOperation(const FeedOperation &) override { ++store_count; }
+    virtual bool erase(SerialNum) override { ++erase_count; return erase_return; }
 
     virtual SerialNum
-    sync(SerialNum syncTo)
+    sync(SerialNum syncTo) override
     {
         return syncTo;
     } 
@@ -481,21 +481,21 @@ struct FeedHandlerFixture
 
 
 struct MyConfigStore : ConfigStore {
-    virtual SerialNum getBestSerialNum() const { return 1; }
-    virtual SerialNum getOldestSerialNum() const { return 1; }
+    virtual SerialNum getBestSerialNum() const override { return 1; }
+    virtual SerialNum getOldestSerialNum() const override { return 1; }
     virtual void saveConfig(const DocumentDBConfig &,
-                            const search::index::Schema &, SerialNum) {}
+                            const search::index::Schema &, SerialNum) override {}
     virtual void loadConfig(const DocumentDBConfig &, SerialNum,
                             DocumentDBConfig::SP &,
-                            search::index::Schema::SP &) {}
-    virtual void removeInvalid() {}
-    void prune(SerialNum) {}
-    virtual bool hasValidSerial(SerialNum) const { return true; }
-    virtual SerialNum getPrevValidSerial(SerialNum) const { return 1; }
+                            search::index::Schema::SP &) override {}
+    virtual void removeInvalid() override {}
+    void prune(SerialNum) override {}
+    virtual bool hasValidSerial(SerialNum) const override { return true; }
+    virtual SerialNum getPrevValidSerial(SerialNum) const override { return 1; }
     virtual void saveWipeHistoryConfig(SerialNum,
-                                       fastos::TimeStamp) {}
-    virtual void serializeConfig(SerialNum, vespalib::nbostream &) {}
-    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {}
+                                       fastos::TimeStamp) override {}
+    virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {}
+    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {}
     virtual void setProtonConfig(const ProtonConfigSP &) override { }
 };
 
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 255dab72d83..bdc0fc5f15c 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -228,7 +228,7 @@ struct MyDocumentStore : public test::DummyDocumentStore
           _lastSyncToken(0),
           _compactLidSpaceLidLimit(0)
     {}
-    virtual Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &) const {
+    virtual Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &) const override {
         DocMap::const_iterator itr = _docs.find(lid);
         if (itr != _docs.end()) {
             Document::UP retval(itr->second->clone());
@@ -236,18 +236,18 @@ struct MyDocumentStore : public test::DummyDocumentStore
         }
         return Document::UP();
     }
-    virtual void write(uint64_t syncToken, const document::Document& doc, DocumentIdT lid) {
+    virtual void write(uint64_t syncToken, const document::Document& doc, DocumentIdT lid) override {
         _lastSyncToken = syncToken;
         _docs[lid] = Document::SP(doc.clone());
     }
-    virtual void remove(uint64_t syncToken, DocumentIdT lid) {
+    virtual void remove(uint64_t syncToken, DocumentIdT lid) override {
         _lastSyncToken = syncToken;
         _docs.erase(lid);
     }
-    virtual uint64_t initFlush(uint64_t syncToken) {
+    virtual uint64_t initFlush(uint64_t syncToken) override {
         return syncToken;
     }
-    virtual uint64_t lastSyncToken() const { return _lastSyncToken; }
+    virtual uint64_t lastSyncToken() const override { return _lastSyncToken; }
     virtual void compactLidSpace(uint32_t wantedDocLidLimit) override {
         _compactLidSpaceLidLimit = wantedDocLidLimit;
     }
@@ -257,7 +257,7 @@ struct MySummaryManager : public test::DummySummaryManager
 {
     MyDocumentStore _store;
     MySummaryManager() : _store() {}
-    virtual search::IDocumentStore &getBackingStore() { return _store; }
+    virtual search::IDocumentStore &getBackingStore() override { return _store; }
 };
 
 struct MySummaryAdapter : public test::MockSummaryAdapter
@@ -405,7 +405,7 @@ struct MyTransport : public FeedToken::ITransport
     virtual void send(mbus::Reply::UP reply,
                       ResultUP result,
                       bool documentWasFound,
-                      double latency_ms) {
+                      double latency_ms) override {
         (void) reply; (void) documentWasFound, (void) latency_ms;
         lastResult = std::move(result);
         _tracer.traceAck(lastResult);
@@ -421,7 +421,7 @@ struct MyResultHandler : public IGenericResultHandler
 {
     vespalib::Gate _gate;
     MyResultHandler() : _gate() {}
-    virtual void handle(const storage::spi::Result &) {
+    virtual void handle(const storage::spi::Result &) override {
         _gate.countDown();
     }
     void await() { _gate.await(); }
@@ -738,7 +738,7 @@ struct SearchableFeedViewFixture : public FixtureBase
     {
         runInMaster([&]() { _lidReuseDelayer.setHasIndexedOrAttributeFields(true); });
     }
-    virtual IFeedView &getFeedView() { return fv; }
+    virtual IFeedView &getFeedView() override { return fv; }
 };
 
 struct FastAccessFeedViewFixture : public FixtureBase
@@ -757,7 +757,7 @@ struct FastAccessFeedViewFixture : public FixtureBase
            FastAccessFeedView::Context(aw, _docIdLimit))
     {
     }
-    virtual IFeedView &getFeedView() { return fv; }
+    virtual IFeedView &getFeedView() override { return fv; }
 };
 
 void
diff --git a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
index e483bc35b96..19f938188d3 100644
--- a/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/job_tracked_maintenance_job/job_tracked_maintenance_job_test.cpp
@@ -38,7 +38,7 @@ struct MyMaintenanceJob : public IMaintenanceJob
     void block() {
         setBlocked(true);
     }
-    virtual bool run() {
+    virtual bool run() override {
         _runGates[_runIdx++]->await(5000);
         return _runIdx == _runGates.size();
     }
diff --git a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
index f056dee6927..542b66b3978 100644
--- a/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/lid_space_compaction/lid_space_compaction_test.cpp
@@ -42,12 +42,12 @@ struct MyScanIterator : public IDocumentScanIterator
     LidVector::const_iterator _itr;
     bool _validItr;
     MyScanIterator(const LidVector &lids) : _lids(lids), _itr(_lids.begin()), _validItr(true) {}
-    virtual bool valid() const {
+    virtual bool valid() const override {
         return _validItr;
     }
     virtual search::DocumentMetaData next(uint32_t compactLidLimit,
                                           uint32_t maxDocsToScan,
-                                          bool retry) {
+                                          bool retry) override {
         if (!retry && _itr != _lids.begin()) {
             ++_itr;
         }
@@ -78,29 +78,29 @@ struct MyHandler : public ILidSpaceCompactionHandler
 
     MyHandler();
     ~MyHandler();
-    virtual vespalib::string getName() const {
+    virtual vespalib::string getName() const override {
         return "myhandler";
     }
-    virtual uint32_t getSubDbId() const { return 2; }
-    virtual LidUsageStats getLidStatus() const {
+    virtual uint32_t getSubDbId() const override { return 2; }
+    virtual LidUsageStats getLidStatus() const override {
         ASSERT_TRUE(_handleMoveCnt < _stats.size());
         return _stats[_handleMoveCnt];
     }
-    virtual IDocumentScanIterator::UP getIterator() const {
+    virtual IDocumentScanIterator::UP getIterator() const override {
         ASSERT_TRUE(_iteratorCnt < _lids.size());
         return IDocumentScanIterator::UP(new MyScanIterator(_lids[_iteratorCnt++]));
     }
     virtual MoveOperation::UP createMoveOperation(const search::DocumentMetaData &document,
-                                                  uint32_t moveToLid) const {
+                                                  uint32_t moveToLid) const override {
         ASSERT_TRUE(document.lid > moveToLid);
         _moveFromLid = document.lid;
         _moveToLid = moveToLid;
         return MoveOperation::UP(new MoveOperation());
     }
-    virtual void handleMove(const MoveOperation &) {
+    virtual void handleMove(const MoveOperation &) override {
         ++_handleMoveCnt;
     }
-    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) {
+    virtual void handleCompactLidSpace(const CompactLidSpaceOperation &op) override {
         _wantedSubDbId = op.getSubDbId();
         _wantedLidLimit = op.getLidLimit();
     }
@@ -125,7 +125,7 @@ struct MyStorer : public IOperationStorer
         : _moveCnt(0),
           _compactCnt(0)
     {}
-    virtual void storeOperation(FeedOperation &op) {
+    virtual void storeOperation(FeedOperation &op) override {
         if (op.getType() == FeedOperation::MOVE) {
             ++ _moveCnt;
         } else if (op.getType() == FeedOperation::COMPACT_LID_SPACE) {
@@ -191,7 +191,7 @@ struct MyDocumentStore : public test::DummyDocumentStore
     mutable uint32_t _readLid;
     MyDocumentStore() : _readDoc(), _readLid(0) {}
     virtual document::Document::UP
-    read(search::DocumentIdT lid, const document::DocumentTypeRepo &) const {
+    read(search::DocumentIdT lid, const document::DocumentTypeRepo &) const override {
         _readLid = lid;
         return Document::UP(_readDoc->clone());
     }
@@ -201,7 +201,7 @@ struct MySummaryManager : public test::DummySummaryManager
 {
     MyDocumentStore _store;
     MySummaryManager() : _store() {}
-    virtual search::IDocumentStore &getBackingStore() { return _store; }
+    virtual search::IDocumentStore &getBackingStore() override { return _store; }
 };
 
 struct MySubDb : public test::DummyDocumentSubDb
@@ -209,7 +209,7 @@ struct MySubDb : public test::DummyDocumentSubDb
     DocumentTypeRepo::SP _repo;
     MySubDb(const DocumentTypeRepo::SP &repo, std::shared_ptr<BucketDBOwner> bucketDB);
     ~MySubDb();
-    virtual IFeedView::SP getFeedView() const {
+    virtual IFeedView::SP getFeedView() const override {
         return IFeedView::SP(new MyFeedView(_repo));
     }
 };
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
index e062c114ebf..63b23cebb6e 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp
@@ -139,31 +139,31 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
     }
 
     virtual const document::DocumentTypeRepo &
-    getDocumentTypeRepo(void) const
+    getDocumentTypeRepo(void) const override
     {
         abort();
     }
 
     virtual void
     getBucketMetaData(const storage::spi::Bucket &,
-                      DocumentMetaData::Vector &) const
+                      DocumentMetaData::Vector &) const override
     {
         abort();
     }
     virtual DocumentMetaData
-    getDocumentMetaData(const DocumentId &) const
+    getDocumentMetaData(const DocumentId &) const override
     {
         return DocumentMetaData();
     }
 
     virtual Document::UP
-    getDocument(DocumentIdT lid) const
+    getDocument(DocumentIdT lid) const override
     {
         return _subDB.getDocument(lid);
     }
 
     virtual CachedSelect::SP
-    parseSelect(const vespalib::string &) const
+    parseSelect(const vespalib::string &) const override
     {
         return CachedSelect::SP();
     }
@@ -173,7 +173,7 @@ struct MyDocumentRetriever : public DocumentRetrieverBaseForTest
 struct MyBucketModifiedHandler : public IBucketModifiedHandler
 {
     BucketIdVector _modified;
-    virtual void notifyBucketModified(const BucketId &bucket) {
+    virtual void notifyBucketModified(const BucketId &bucket) override {
         BucketIdVector::const_iterator itr = std::find(_modified.begin(), _modified.end(), bucket);
         _modified.push_back(bucket);
     }
@@ -185,7 +185,7 @@ struct MySessionCachePruner : public ISessionCachePruner
 {
     bool isInvoked;
     MySessionCachePruner() : isInvoked(false) { }
-    void pruneTimedOutSessions(fastos::TimeStamp current) {
+    void pruneTimedOutSessions(fastos::TimeStamp current) override {
         (void) current;
         isInvoked = true;
     }
@@ -213,16 +213,16 @@ public:
     isExecutorThread(void);
 
     virtual void
-    handleMove(MoveOperation &op);
+    handleMove(MoveOperation &op) override;
 
     virtual void
-    performPruneRemovedDocuments(PruneRemovedDocumentsOperation &op);
+    performPruneRemovedDocuments(PruneRemovedDocumentsOperation &op) override;
 
     virtual void
-    heartBeat(void);
+    heartBeat(void) override;
 
     virtual void
-    wipeOldRemovedFields(TimeStamp wipeTimeLimit);
+    wipeOldRemovedFields(TimeStamp wipeTimeLimit) override;
 
     void
     setSubDBs(const std::vector<MyDocumentSubDB *> &subDBs);
@@ -235,7 +235,7 @@ public:
 
     // Implements IOperationStorer
     virtual void
-    storeOperation(FeedOperation &op);
+    storeOperation(FeedOperation &op) override;
 
     uint32_t
     getHeartBeats(void)
@@ -304,7 +304,7 @@ struct MySimpleJob : public IMaintenanceJob
     {
     }
     void block() { setBlocked(true); }
-    virtual bool run() {
+    virtual bool run() override {
         LOG(info, "MySimpleJob::run()");
         _latch.countDown();
         ++_runCnt;
@@ -320,7 +320,7 @@ struct MySplitJob : public MySimpleJob
         : MySimpleJob(delay, interval, finishCount)
     {
     }
-    virtual bool run() {
+    virtual bool run() override {
         LOG(info, "MySplitJob::run()");
         _latch.countDown();
         ++_runCnt;
@@ -339,7 +339,7 @@ struct MyLongRunningJob : public IMaintenanceJob
     {
     }
     void block() { setBlocked(true); }
-    virtual bool run() {
+    virtual bool run() override {
         _firstRun.countDown();
         usleep(10000);
         return false;
diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
index fc5d28f1b84..d247c313ad4 100644
--- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
@@ -76,7 +76,7 @@ public:
     }
 
     virtual bool
-    operator()(const GlobalId &lhs, const GlobalId &rhs) const
+    operator()(const GlobalId &lhs, const GlobalId &rhs) const override
     {
         return _comp(rhs, lhs);
     }
diff --git a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
index 72098a94ad4..86bbf2ba94a 100644
--- a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
+++ b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
@@ -66,7 +66,7 @@ class Test : public vespalib::TestApp {
                     const string &term, uint32_t doc_id);
 
 public:
-    int Main();
+    int Main() override;
 };
 
 #define TEST_CALL(func) \
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 88cace47390..f7832d7e4dc 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -55,8 +55,8 @@ namespace {
 
 struct MyStreamHandler : NewConfigOperation::IStreamHandler {
     typedef NewConfigOperation::SerialNum SerialNum;
-    virtual void serializeConfig(SerialNum, vespalib::nbostream &) {}
-    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) {}
+    virtual void serializeConfig(SerialNum, vespalib::nbostream &) override {}
+    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override {}
 };
 
 
diff --git a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
index 074c9284c06..07ff79c1c09 100644
--- a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
+++ b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
@@ -21,7 +21,7 @@ public:
         // empty
     }
 
-    void send(mbus::Reply::UP reply, ResultUP, bool, double latency_ms) {
+    void send(mbus::Reply::UP reply, ResultUP, bool, double latency_ms) override {
         _receptor.handleReply(std::move(reply));
         _latency_ms = latency_ms;
     }
@@ -45,7 +45,7 @@ private:
     void testTrace();
 
 public:
-    int Main() {
+    int Main() override {
         TEST_INIT("feedtoken_test");
 
         testAck();       TEST_FLUSH();
diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp
index d7c528a3402..681501c9796 100644
--- a/searchcore/src/tests/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp
@@ -46,7 +46,7 @@ public:
     }
 
     Task::UP
-    execute(Task::UP task)
+    execute(Task::UP task) override
     {
         task->run();
         _done.countDown();
@@ -222,7 +222,7 @@ public:
         // empty
     }
 
-    void run() {
+    void run() override {
         _start.countDown();
         if (_proceed != NULL) {
             _proceed->await();
@@ -232,7 +232,7 @@ public:
     }
 
     virtual search::SerialNum
-    getFlushSerial(void) const
+    getFlushSerial(void) const override
     {
         return 0u;
     }
@@ -318,7 +318,7 @@ public:
     }
 
     virtual MemoryGain
-    getApproxMemoryGain() const
+    getApproxMemoryGain() const override
     {
         LOG_ASSERT(_mgain == false);
         _mgain = true;
@@ -326,7 +326,7 @@ public:
     }
 
     virtual search::SerialNum
-    getFlushedSerialNum() const
+    getFlushedSerialNum() const override
     {
         LOG_ASSERT(_serial == false);
         _serial = true;
@@ -415,12 +415,12 @@ public:
         _done(done),
         _name(name)
     { }
-    void run() {
+    void run() override {
         _list.push_back(_name);
         _done.countDown();
     }
     virtual search::SerialNum
-    getFlushSerial(void) const
+    getFlushSerial(void) const override
     {
         return 0u;
     }
diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
index e462ba17dba..594b718296c 100644
--- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
+++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
@@ -25,7 +25,7 @@ class Test : public vespalib::TestApp {
     void requireThatRemoveDontTouchNewIndexes();
 
 public:
-    int Main();
+    int Main() override;
 };
 
 const string index_dir = "test_data";
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index b29e742371c..53db6f44c91 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -98,7 +98,7 @@ public:
                _threadingService)
     {
     }
-    int Main();
+    int Main() override;
 };
 
 int
diff --git a/searchcore/src/tests/proton/index/indexcollection_test.cpp b/searchcore/src/tests/proton/index/indexcollection_test.cpp
index 1b1bfb72cdb..b6c98e1631e 100644
--- a/searchcore/src/tests/proton/index/indexcollection_test.cpp
+++ b/searchcore/src/tests/proton/index/indexcollection_test.cpp
@@ -34,7 +34,7 @@ class Test : public vespalib::TestApp,
     void requireThatSearchablesCanBeReplaced(IndexCollection::UP fsc);
     void requireThatReplaceAndRenumberUpdatesCollectionAfterFusion();
     IndexCollection::UP createWarmup(const IndexCollection::SP & prev, const IndexCollection::SP & next);
-    virtual void warmupDone(ISearchableIndexCollection::SP current) {
+    virtual void warmupDone(ISearchableIndexCollection::SP current) override {
         (void) current;
     }
 
@@ -47,7 +47,7 @@ public:
              _warmup(new FakeIndexSearchable)
     {}
 
-    int Main();
+    int Main() override;
 };
 
 
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 791e8c2619c..618467fd966 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -64,7 +64,7 @@ namespace {
 class IndexManagerDummyReconfigurer : public searchcorespi::IIndexManager::Reconfigurer
 {
     virtual bool
-    reconfigure(vespalib::Closure0<bool>::UP closure)
+    reconfigure(vespalib::Closure0<bool>::UP closure) override
     {
         bool ret = true;
         if (closure.get() != NULL)
diff --git a/searchcore/src/tests/proton/initializer/task_runner_test.cpp b/searchcore/src/tests/proton/initializer/task_runner_test.cpp
index ef18130c1a8..8167d9f5242 100644
--- a/searchcore/src/tests/proton/initializer/task_runner_test.cpp
+++ b/searchcore/src/tests/proton/initializer/task_runner_test.cpp
@@ -44,7 +44,7 @@ public:
     {
     }
 
-    virtual void run() { _log.append(_name); }
+    virtual void run() override { _log.append(_name); }
 };
 
 
diff --git a/searchcore/src/tests/proton/matchengine/matchengine.cpp b/searchcore/src/tests/proton/matchengine/matchengine.cpp
index b739e9954aa..e03f283d758 100644
--- a/searchcore/src/tests/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/tests/proton/matchengine/matchengine.cpp
@@ -19,14 +19,14 @@ public:
                     const std::string & name = "my",
                     const std::string & reply = "myreply") :
         _numHits(numHits), _name(name), _reply(reply) {}
-    virtual DocsumReply::UP getDocsums(const DocsumRequest &) {
+    virtual DocsumReply::UP getDocsums(const DocsumRequest &) override {
         return DocsumReply::UP(new DocsumReply);
     }
 
     virtual search::engine::SearchReply::UP match(
             const ISearchHandler::SP &,
             const search::engine::SearchRequest &,
-            vespalib::ThreadBundle &) const {
+            vespalib::ThreadBundle &) const override {
         SearchReply::UP retval(new SearchReply);
         for (size_t i = 0; i < _numHits; ++i) {
             retval->hits.push_back(SearchReply::Hit());
@@ -43,7 +43,7 @@ private:
 public:
     LocalSearchClient();
     ~LocalSearchClient();
-    void searchDone(SearchReply::UP reply) {
+    void searchDone(SearchReply::UP reply) override {
         vespalib::MonitorGuard guard(_monitor);
         _reply = std::move(reply);
         guard.broadcast();
@@ -122,7 +122,7 @@ struct ObserveBundleMatchHandler : MySearchHandler {
     virtual search::engine::SearchReply::UP match(
             const ISearchHandler::SP &,
             const search::engine::SearchRequest &,
-            vespalib::ThreadBundle &threadBundle) const
+            vespalib::ThreadBundle &threadBundle) const override
     {
         bundleSize = threadBundle.size();
         return SearchReply::UP(new SearchReply);
diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
index f7bf6b44b00..7ddee5d4490 100644
--- a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
+++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp
@@ -204,7 +204,7 @@ struct RangeChecker : vespalib::Rendezvous<WorkTracker,bool> {
     size_t docid_limit;
     RangeChecker(size_t num_threads, size_t docid_limit_in)
         : vespalib::Rendezvous<WorkTracker,bool>(num_threads), docid_limit(docid_limit_in) {}
-    virtual void mingle() {
+    virtual void mingle() override {
         std::vector<DocidRange> ranges;
         for (size_t i = 0; i < size(); ++i) {
             ranges.insert(ranges.end(), in(i).ranges.begin(), in(i).ranges.end());
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index d745f0dd7c9..fc3184623da 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -80,15 +80,15 @@ public:
         return _vectors.find(name)->second;
     }
     virtual const IAttributeVector *
-    getAttribute(const string &name) const {
+    getAttribute(const string &name) const override {
         return get(name);
     }
     virtual const IAttributeVector *
-    getAttributeStableEnum(const string &name) const {
+    getAttributeStableEnum(const string &name) const override {
         return get(name);
     }
     virtual void
-    getAttributeList(std::vector<const IAttributeVector *> & list) const {
+    getAttributeList(std::vector<const IAttributeVector *> & list) const override {
         Map::const_iterator pos = _vectors.begin();
         Map::const_iterator end = _vectors.end();
         for (; pos != end; ++pos) {
@@ -277,11 +277,11 @@ struct MyWorld {
 
         MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {}
 
-        virtual DocsumReply::UP getDocsums(const DocsumRequest &)
+        virtual DocsumReply::UP getDocsums(const DocsumRequest &) override
         { return DocsumReply::UP(); }
         virtual SearchReply::UP match(const ISearchHandler::SP &,
                                       const SearchRequest &,
-                                      vespalib::ThreadBundle &) const
+                                      vespalib::ThreadBundle &) const override
         { return SearchReply::UP(); }
     };
 
diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index 1426a2d85af..12e6ceaddab 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -107,7 +107,7 @@ class Test : public vespalib::TestApp {
     void requireThatBlackListBlueprintCanBeUsed();
 
 public:
-    int Main();
+    int Main() override;
 };
 
 #define TEST_CALL(func) \
@@ -225,19 +225,19 @@ public:
         EXPECT_EQUAL((double)estimatedHitCount / doc_count, n.field(0).getDocFreq());
     }
 
-    virtual void visit(ProtonNumberTerm &n) { checkNode(n, 1, false); }
-    virtual void visit(ProtonLocationTerm &n) { checkNode(n, 0, true); }
-    virtual void visit(ProtonPrefixTerm &n) { checkNode(n, 1, false); }
-    virtual void visit(ProtonRangeTerm &n) { checkNode(n, 2, false); }
-    virtual void visit(ProtonStringTerm &n) { checkNode(n, 2, false); }
-    virtual void visit(ProtonSubstringTerm &n) { checkNode(n, 0, true); }
-    virtual void visit(ProtonSuffixTerm &n) { checkNode(n, 2, false); }
-    virtual void visit(ProtonPhrase &n) { checkNode(n, 0, true); }
-    virtual void visit(ProtonWeightedSetTerm &) {}
-    virtual void visit(ProtonDotProduct &) {}
-    virtual void visit(ProtonWandTerm &) {}
-    virtual void visit(ProtonPredicateQuery &) {}
-    virtual void visit(ProtonRegExpTerm &) {}
+    virtual void visit(ProtonNumberTerm &n) override { checkNode(n, 1, false); }
+    virtual void visit(ProtonLocationTerm &n) override { checkNode(n, 0, true); }
+    virtual void visit(ProtonPrefixTerm &n) override { checkNode(n, 1, false); }
+    virtual void visit(ProtonRangeTerm &n) override { checkNode(n, 2, false); }
+    virtual void visit(ProtonStringTerm &n) override { checkNode(n, 2, false); }
+    virtual void visit(ProtonSubstringTerm &n) override { checkNode(n, 0, true); }
+    virtual void visit(ProtonSuffixTerm &n) override { checkNode(n, 2, false); }
+    virtual void visit(ProtonPhrase &n) override { checkNode(n, 0, true); }
+    virtual void visit(ProtonWeightedSetTerm &) override {}
+    virtual void visit(ProtonDotProduct &) override {}
+    virtual void visit(ProtonWandTerm &) override {}
+    virtual void visit(ProtonPredicateQuery &) override {}
+    virtual void visit(ProtonRegExpTerm &) override {}
 };
 
 void Test::requireThatTermsAreLookedUp() {
@@ -357,12 +357,12 @@ class SetUpTermDataTestCheckerVisitor
     int Main() { return 0; }
 
 public:
-    virtual void visit(ProtonNumberTerm &) {}
-    virtual void visit(ProtonLocationTerm &) {}
-    virtual void visit(ProtonPrefixTerm &) {}
-    virtual void visit(ProtonRangeTerm &) {}
+    virtual void visit(ProtonNumberTerm &) override {}
+    virtual void visit(ProtonLocationTerm &) override {}
+    virtual void visit(ProtonPrefixTerm &) override {}
+    virtual void visit(ProtonRangeTerm &) override {}
 
-    virtual void visit(ProtonStringTerm &n) {
+    virtual void visit(ProtonStringTerm &n) override {
         const ITermData &term_data = n;
         EXPECT_EQUAL(string_weight.percent(),
                    term_data.getWeight().percent());
@@ -378,17 +378,17 @@ public:
         }
     }
 
-    virtual void visit(ProtonSubstringTerm &) {}
-    virtual void visit(ProtonSuffixTerm &) {}
-    virtual void visit(ProtonPhrase &n) {
+    virtual void visit(ProtonSubstringTerm &) override {}
+    virtual void visit(ProtonSuffixTerm &) override {}
+    virtual void visit(ProtonPhrase &n) override {
         const ITermData &term_data = n;
         EXPECT_EQUAL(2u, term_data.getPhraseLength());
     }
-    virtual void visit(ProtonWeightedSetTerm &) {}
-    virtual void visit(ProtonDotProduct &) {}
-    virtual void visit(ProtonWandTerm &) {}
-    virtual void visit(ProtonPredicateQuery &) {}
-    virtual void visit(ProtonRegExpTerm &) {}
+    virtual void visit(ProtonWeightedSetTerm &) override {}
+    virtual void visit(ProtonDotProduct &) override {}
+    virtual void visit(ProtonWandTerm &) override {}
+    virtual void visit(ProtonPredicateQuery &) override {}
+    virtual void visit(ProtonRegExpTerm &) override {}
 };
 
 void Test::requireThatTermDataIsFilledIn() {
diff --git a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
index 502553bfa69..43f0823d89f 100644
--- a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
+++ b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp
@@ -47,7 +47,7 @@ class Test : public vespalib::TestApp {
     void requireThatNegativeTermsAreSkipped();
 
 public:
-    int Main();
+    int Main() override;
 };
 
 int
diff --git a/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp b/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp
index cf35ba0b505..edff0c4e2e4 100644
--- a/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp
+++ b/searchcore/src/tests/proton/metrics/job_tracked_flush/job_tracked_flush_test.cpp
@@ -28,10 +28,10 @@ struct MyFlushTask : public searchcorespi::FlushTask
     MyFlushTask(Gate &execGate) : _execGate(execGate) {}
 
     // Implements searchcorespi::FlushTask
-    virtual void run() {
+    virtual void run() override {
         _execGate.await(5000);
     }
-    virtual search::SerialNum getFlushSerial() const { return 5; }
+    virtual search::SerialNum getFlushSerial() const override { return 5; }
 };
 
 struct MyFlushTarget : public test::DummyFlushTarget
@@ -48,7 +48,7 @@ struct MyFlushTarget : public test::DummyFlushTarget
     {}
 
     // Implements searchcorespi::IFlushTarget
-    virtual FlushTask::UP initFlush(SerialNum currentSerial) {
+    virtual FlushTask::UP initFlush(SerialNum currentSerial) override {
         if (currentSerial > 0) {
             _initFlushSerial = currentSerial;
             _initGate.await(5000);
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 115394f61c8..07a86c0ccd2 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -119,16 +119,16 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest {
 
     MyDocumentRetriever(const Document *d, Timestamp ts, DocumentId &last_id)
         : repo(), document(d), timestamp(ts), last_doc_id(last_id) {}
-    virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const {
+    virtual const document::DocumentTypeRepo &getDocumentTypeRepo() const override {
         return repo;
     }
     virtual void getBucketMetaData(const storage::spi::Bucket &,
-                                   search::DocumentMetaData::Vector &v) const {
+                                   search::DocumentMetaData::Vector &v) const override {
         if (document != 0) {
             v.push_back(getDocumentMetaData(document->getId()));
         }
     }
-    virtual DocumentMetaData getDocumentMetaData(const DocumentId &id) const {
+    virtual DocumentMetaData getDocumentMetaData(const DocumentId &id) const override {
         last_doc_id = id;
         if (document != 0) {
             return DocumentMetaData(1, timestamp, document::BucketId(1),
@@ -136,7 +136,7 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest {
         }
         return DocumentMetaData();
     }
-    virtual document::Document::UP getDocument(search::DocumentIdT) const {
+    virtual document::Document::UP getDocument(search::DocumentIdT) const override {
         if (document != 0) {
             return Document::UP(document->clone());
         }
@@ -144,7 +144,7 @@ struct MyDocumentRetriever : DocumentRetrieverBaseForTest {
     }
 
     virtual CachedSelect::SP
-    parseSelect(const vespalib::string &) const
+    parseSelect(const vespalib::string &) const override
     {
         return CachedSelect::SP();
     }
@@ -206,66 +206,66 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer {
         token.ack();
     }
 
-    virtual void initialize() { initialized = true; }
+    virtual void initialize() override { initialized = true; }
 
     virtual void handlePut(FeedToken token, const Bucket& bucket,
-                           Timestamp timestamp, const document::Document::SP& doc) {
+                           Timestamp timestamp, const document::Document::SP& doc) override {
         token.setResult(ResultUP(new storage::spi::Result()), false);
         handle(token, bucket, timestamp, doc->getId());
     }
 
     virtual void handleUpdate(FeedToken token, const Bucket& bucket,
-                              Timestamp timestamp, const document::DocumentUpdate::SP& upd) {
+                              Timestamp timestamp, const document::DocumentUpdate::SP& upd) override {
         token.setResult(ResultUP(new storage::spi::UpdateResult(existingTimestamp)),
                         existingTimestamp > 0);
         handle(token, bucket, timestamp, upd->getId());
     }
 
     virtual void handleRemove(FeedToken token, const Bucket& bucket,
-                              Timestamp timestamp, const DocumentId& id) {
+                              Timestamp timestamp, const DocumentId& id) override {
         bool wasFound = existingTimestamp > 0;
         token.setResult(ResultUP(new storage::spi::RemoveResult(wasFound)), wasFound);
         handle(token, bucket, timestamp, id);
     }
 
-    virtual void handleListBuckets(IBucketIdListResultHandler &resultHandler) {
+    virtual void handleListBuckets(IBucketIdListResultHandler &resultHandler) override {
         resultHandler.handle(BucketIdListResult(bucketList));
     }
 
     virtual void handleSetClusterState(const ClusterState &calc,
-                                       IGenericResultHandler &resultHandler) {
+                                       IGenericResultHandler &resultHandler) override {
         lastCalc = &calc;
         resultHandler.handle(Result());
     }
 
     virtual void handleSetActiveState(const Bucket &bucket,
                                        storage::spi::BucketInfo::ActiveState newState,
-                                       IGenericResultHandler &resultHandler) {
+                                       IGenericResultHandler &resultHandler) override {
         lastBucket = bucket;
         lastBucketState = newState;
         resultHandler.handle(bucketStateResult);
     }
 
     virtual void handleGetBucketInfo(const Bucket &,
-                                     IBucketInfoResultHandler &resultHandler) {
+                                     IBucketInfoResultHandler &resultHandler) override {
         resultHandler.handle(BucketInfoResult(bucketInfo));
     }
 
     virtual void
     handleCreateBucket(FeedToken token,
-                       const storage::spi::Bucket &)
+                       const storage::spi::Bucket &) override
     {
         token.setResult(ResultUP(new Result(_createBucketResult)), true);
         token.ack();
     }
 
     virtual void handleDeleteBucket(FeedToken token,
-                                    const storage::spi::Bucket &) {
+                                    const storage::spi::Bucket &) override {
         token.setResult(ResultUP(new Result(deleteBucketResult)), true);
         token.ack();
     }
 
-    virtual void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler) {
+    virtual void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler) override {
         resultHandler.handle(BucketIdListResult(modBucketList));
     }
 
@@ -273,7 +273,7 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer {
     handleSplit(FeedToken token,
                 const storage::spi::Bucket &source,
                 const storage::spi::Bucket &target1,
-                const storage::spi::Bucket &target2)
+                const storage::spi::Bucket &target2) override
     {
         (void) source;
         (void) target1;
@@ -397,7 +397,7 @@ Selection selection(doc_sel);
 class SimplePersistenceEngineOwner : public IPersistenceEngineOwner
 {
     virtual void
-    setClusterState(const storage::spi::ClusterState &calc)
+    setClusterState(const storage::spi::ClusterState &calc) override
     {
         (void) calc;
     }
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
index 651cd30ce68..7cae854674d 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
@@ -61,7 +61,7 @@ struct MyGidToLidMapperFactory : public search::IGidToLidMapperFactory
         _map.insert({toGid(doc2), 17});
     }
 
-    virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const {
+    virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const override {
         return std::make_unique<MyGidToLidMapper>(_map);
     }
 };
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
index 2604c20cf68..aeb6d9a3587 100644
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
@@ -37,10 +37,10 @@ struct MyReprocessingHandler : public IReprocessingHandler
     IReprocessingReader::SP _reader;
     std::vector<IReprocessingRewriter::SP> _rewriters;
     MyReprocessingHandler() : _reader(), _rewriters() {}
-    virtual void addReader(const IReprocessingReader::SP &reader) {
+    virtual void addReader(const IReprocessingReader::SP &reader) override {
         _reader = reader;
     }
-    virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) {
+    virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) override {
         _rewriters.push_back(rewriter);
     }
 };
@@ -99,7 +99,7 @@ struct MyDocTypeInspector : public IDocumentTypeInspector
           _newCfg(newCfg)
     {
     }
-    virtual bool hasUnchangedField(const vespalib::string &name) const {
+    virtual bool hasUnchangedField(const vespalib::string &name) const override {
         return _oldCfg._fields.count(name) > 0 &&
             _newCfg._fields.count(name) > 0;
     }
diff --git a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp
index 1848ad8fc74..fb1434d4a0c 100644
--- a/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/document_reprocessing_handler/document_reprocessing_handler_test.cpp
@@ -19,11 +19,10 @@ struct MyProcessor : public ReprocessingType
     DocumentId _docId;
 
     MyProcessor() : _lid(0), _docId() {}
-    virtual void handleExisting(uint32_t lid, DocumentType doc) {
+    virtual void handleExisting(uint32_t lid, DocumentType doc) override {
         _lid = lid;
         _docId = doc.getId();
     }
-    virtual void done() { }
 };
 
 typedef MyProcessor<IReprocessingReader, const Document &> MyReader;
diff --git a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
index c4c462ecfa1..4d9cbd307ba 100644
--- a/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/reprocessing_runner/reprocessing_runner_test.cpp
@@ -44,7 +44,7 @@ struct MyTask : public IReprocessingTask
     }
 
     virtual void
-    run()
+    run() override
     {
         ASSERT_EQUAL(_initProgress, _runner.getProgress());
         _myProgress = 0.5;
@@ -54,7 +54,7 @@ struct MyTask : public IReprocessingTask
     }
 
     virtual Progress
-    getProgress(void) const
+    getProgress(void) const override
     {
         return Progress(_myProgress, _weight);
     }
diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp
index 527e5eedbc4..9f8f7fd9e4a 100644
--- a/searchcore/src/tests/proton/server/feedstates_test.cpp
+++ b/searchcore/src/tests/proton/server/feedstates_test.cpp
@@ -41,9 +41,9 @@ struct MyFeedView : public test::DummyFeedView {
     MyFeedView();
     ~MyFeedView();
 
-    virtual const DocumentTypeRepo::SP &getDocumentTypeRepo() const
+    virtual const DocumentTypeRepo::SP &getDocumentTypeRepo() const override
     { return repo_sp; }
-    virtual void handleRemove(FeedToken *, const RemoveOperation &)
+    virtual void handleRemove(FeedToken *, const RemoveOperation &) override
     { ++remove_handled; }
 };
 
@@ -51,12 +51,12 @@ MyFeedView::MyFeedView() : repo_sp(repo.getTypeRepoSp()), remove_handled(0) {}
 MyFeedView::~MyFeedView() {}
 
 struct MyReplayConfig : IReplayConfig {
-    virtual void replayConfig(SerialNum) {}
-    virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) {}
+    virtual void replayConfig(SerialNum) override {}
+    virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) override {}
 };
 
 struct InstantExecutor : vespalib::Executor {
-    virtual Task::UP execute(Task::UP task) {
+    virtual Task::UP execute(Task::UP task) override {
         task->run();
         return Task::UP();
     }
diff --git a/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp b/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp
index 1957d8fbf33..866ba2c77c0 100644
--- a/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp
+++ b/searchcore/src/tests/proton/server/health_adapter/health_adapter_test.cpp
@@ -14,7 +14,7 @@ struct MyStatusProducer : public StatusProducer {
         list.push_back(StatusReport::SP(new StatusReport(StatusReport::Params(comp).
                 state(state).message(msg))));
     }
-    virtual StatusReport::List getStatusReports() const {
+    virtual StatusReport::List getStatusReports() const override {
         return list;
     }
 };
diff --git a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp
index 513ad5a03dd..a696855dd72 100644
--- a/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp
+++ b/searchcore/src/tests/proton/server/legacy_attribute_metrics_test.cpp
@@ -11,7 +11,7 @@ using namespace proton;
 class Test : public vespalib::TestApp
 {
 public:
-    int Main();
+    int Main() override;
 };
 
 int
diff --git a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
index a3e5e478c4c..74e43fd4c9c 100644
--- a/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
+++ b/searchcore/src/tests/proton/server/memoryflush/memoryflush_test.cpp
@@ -25,14 +25,14 @@ class MyFlushHandler : public IFlushHandler {
 public:
     MyFlushHandler(const vespalib::string &name) : IFlushHandler(name) {}
     // Implements IFlushHandler
-    virtual std::vector<IFlushTarget::SP> getFlushTargets() {
+    virtual std::vector<IFlushTarget::SP> getFlushTargets() override {
         return std::vector<IFlushTarget::SP>();
     }
-    virtual SerialNum getCurrentSerialNumber() const { return 0; }
-    virtual void flushDone(SerialNum oldestSerial) { (void) oldestSerial; }
+    virtual SerialNum getCurrentSerialNumber() const override { return 0; }
+    virtual void flushDone(SerialNum oldestSerial) override { (void) oldestSerial; }
 
     virtual void
-    syncTls(search::SerialNum syncTo)
+    syncTls(search::SerialNum syncTo) override
     {
         (void) syncTo;
     }
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index d618bb65f84..dae8cce36e4 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -38,7 +38,7 @@ public:
     MySearchHandler(const std::string & name = "my",
                     const stringref & reply = MYREPLY) :
         _name(name), _reply(reply) {}
-    virtual DocsumReply::UP getDocsums(const DocsumRequest & request) {
+    virtual DocsumReply::UP getDocsums(const DocsumRequest & request) override {
         return (request.useRootSlime())
             ? std::make_unique<DocsumReply>(createSlimeReply(request.hits.size()))
             : createOldDocSum(request);
@@ -71,7 +71,7 @@ public:
     virtual search::engine::SearchReply::UP match(
             const ISearchHandler::SP &,
             const search::engine::SearchRequest &,
-            vespalib::ThreadBundle &) const {
+            vespalib::ThreadBundle &) const override {
         return SearchReply::UP(new SearchReply);
     }
 };
@@ -84,7 +84,7 @@ private:
 public:
     MyDocsumClient();
     ~MyDocsumClient();
-    void getDocsumsDone(DocsumReply::UP reply) {
+    void getDocsumsDone(DocsumReply::UP reply) override {
         vespalib::MonitorGuard guard(_monitor);
         _reply = std::move(reply);
         guard.broadcast();
@@ -116,7 +116,7 @@ private:
     void requireThatSlimeInterfaceWorksFine();
     void requireThatRPCInterfaceWorks();
 public:
-    int Main();
+    int Main() override;
 };
 
 DocsumRequest::UP