11 files changed, 23 insertions, 23 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 92668de675a..4e7620dac05 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -17,7 +17,7 @@ class Test : public vespalib::TestApp {
     DocumentTypeRepo::SP _repo;
 
 public:
-    int Main();
+    int Main() override;
 
 private:
     void testMessage();
diff --git a/documentapi/src/tests/messages/messages50test.h b/documentapi/src/tests/messages/messages50test.h
index 515a61e59fc..ec44ab77a4b 100644
--- a/documentapi/src/tests/messages/messages50test.h
+++ b/documentapi/src/tests/messages/messages50test.h
@@ -5,8 +5,8 @@
 
 class Messages50Test : public TestBase {
 protected:
-    const vespalib::Version getVersion() const { return vespalib::Version(5, 0); }
-    bool shouldTestCoverage() const { return FALSE; }
+    const vespalib::Version getVersion() const override { return vespalib::Version(5, 0); }
+    bool shouldTestCoverage() const override { return FALSE; }
     bool tryDocumentReply(const string &filename, uint32_t type);
     bool tryVisitorReply(const string &filename, uint32_t type);
 
diff --git a/documentapi/src/tests/messages/messages51test.h b/documentapi/src/tests/messages/messages51test.h
index 9cf57a44b29..c7874d26a33 100644
--- a/documentapi/src/tests/messages/messages51test.h
+++ b/documentapi/src/tests/messages/messages51test.h
@@ -5,8 +5,8 @@
 
 class Messages51Test : public Messages50Test {
 protected:
-    const vespalib::Version getVersion() const { return vespalib::Version(5, 1); }
-    bool shouldTestCoverage() const { return TRUE; }
+    const vespalib::Version getVersion() const override { return vespalib::Version(5, 1); }
+    bool shouldTestCoverage() const override { return TRUE; }
 
 public:
     Messages51Test();
diff --git a/documentapi/src/tests/messages/testbase.h b/documentapi/src/tests/messages/testbase.h
index 6b802f30066..6c3675bd5f9 100644
--- a/documentapi/src/tests/messages/testbase.h
+++ b/documentapi/src/tests/messages/testbase.h
@@ -42,7 +42,7 @@ protected:
     virtual const vespalib::Version getVersion() const = 0;
     virtual bool shouldTestCoverage() const = 0;
     TestBase &putTest(uint32_t type, TEST_METHOD_PT test);
-    int Main();
+    int Main() override;
 
 public:
     const document::DocumentTypeRepo &getTypeRepo() { return *_repo; }
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index ba5cc280bce..b1135a30032 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -63,7 +63,7 @@ private:
     mbus::Message::UP newPutDocumentMessage(const string &documentId);
 
 public:
-    int  Main();
+    int  Main() override;
     void testAND();
     void testDocumentRouteSelector();
     void testDocumentRouteSelectorIgnore();
diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp
index 0c4fd90a5c4..8d5b6585529 100644
--- a/documentapi/src/tests/policies/testframe.cpp
+++ b/documentapi/src/tests/policies/testframe.cpp
@@ -40,17 +40,17 @@ public:
         // empty
     }
 
-    bool allocServiceAddress(mbus::RoutingNode &recipient) {
+    bool allocServiceAddress(mbus::RoutingNode &recipient) override {
         string hop = recipient.getRoute().getHop(0).toString();
         recipient.setServiceAddress(mbus::IServiceAddress::UP(new MyServiceAddress(hop)));
         return true;
     }
 
-    void freeServiceAddress(mbus::RoutingNode &recipient) {
+    void freeServiceAddress(mbus::RoutingNode &recipient) override {
         recipient.setServiceAddress(mbus::IServiceAddress::UP());
     }
 
-    void send(const mbus::Message &, const std::vector<mbus::RoutingNode*> &nodes) {
+    void send(const mbus::Message &, const std::vector<mbus::RoutingNode*> &nodes) override {
         _nodes.insert(_nodes.begin(), nodes.begin(), nodes.end());
     }
 
diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h
index 26039cf951e..e0780733331 100644
--- a/documentapi/src/tests/policies/testframe.h
+++ b/documentapi/src/tests/policies/testframe.h
@@ -199,7 +199,7 @@ public:
     documentapi::SystemStateHandle getSystemState();
 
     // Implements IReplyHandler.
-    void handleReply(mbus::Reply::UP reply);
+    void handleReply(mbus::Reply::UP reply) override;
 };
 
 class UIntList : public std::vector<uint32_t> {
diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp
index d8db57c9ecb..cba4e6cf70f 100644
--- a/documentapi/src/tests/policyfactory/policyfactory.cpp
+++ b/documentapi/src/tests/policyfactory/policyfactory.cpp
@@ -23,8 +23,8 @@ private:
     string _param;
 public:
     MyPolicy(const string &param);
-    void select(mbus::RoutingContext &ctx);
-    void merge(mbus::RoutingContext &ctx);
+    void select(mbus::RoutingContext &ctx) override;
+    void merge(mbus::RoutingContext &ctx) override;
 };
 
 MyPolicy::MyPolicy(const string &param) :
@@ -48,7 +48,7 @@ MyPolicy::merge(mbus::RoutingContext &ctx)
 
 class MyFactory : public IRoutingPolicyFactory {
 public:
-    mbus::IRoutingPolicy::UP createPolicy(const string &param) const;
+    mbus::IRoutingPolicy::UP createPolicy(const string &param) const override;
 };
 
 mbus::IRoutingPolicy::UP
diff --git a/documentapi/src/tests/replymerger/replymerger_test.cpp b/documentapi/src/tests/replymerger/replymerger_test.cpp
index 2e1551e8dca..8803994b0cf 100644
--- a/documentapi/src/tests/replymerger/replymerger_test.cpp
+++ b/documentapi/src/tests/replymerger/replymerger_test.cpp
@@ -19,7 +19,7 @@ class Test : public vespalib::TestApp
     static void assertReplyErrorsMatch(const mbus::Reply& r,
                                        const std::vector<mbus::Error>& errors);
 public:
-    int Main();
+    int Main() override;
 
     void mergingGenericRepliesWithNoErrorsPicksFirstReply();
     void mergingSingleReplyWithOneErrorReturnsEmptyReplyWithError();
diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp
index fff7d84a197..620142e803b 100644
--- a/documentapi/src/tests/routablefactory/routablefactory.cpp
+++ b/documentapi/src/tests/routablefactory/routablefactory.cpp
@@ -40,23 +40,23 @@ public:
         getTrace().setLevel(9);
     }
 
-    DocumentReply::UP doCreateReply() const {
+    DocumentReply::UP doCreateReply() const override {
         return DocumentReply::UP(new MyReply());
     }
 
-    uint32_t getType() const {
+    uint32_t getType() const override {
         return TYPE;
     }
 };
 
 class MyMessageFactory : public RoutableFactories51::DocumentMessageFactory {
 protected:
-    DocumentMessage::UP doDecode(document::ByteBuffer &buf) const {
+    DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
         (void)buf;
         return DocumentMessage::UP(new MyMessage());
     }
 
-    bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const {
+    bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override {
         (void)msg;
         (void)buf;
         return true;
@@ -65,12 +65,12 @@ protected:
 
 class MyReplyFactory : public RoutableFactories51::DocumentReplyFactory {
 protected:
-    DocumentReply::UP doDecode(document::ByteBuffer &buf) const {
+    DocumentReply::UP doDecode(document::ByteBuffer &buf) const override {
         (void)buf;
         return DocumentReply::UP(new MyReply());
     }
 
-    bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const {
+    bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override {
         (void)reply;
         (void)buf;
         return true;
@@ -109,7 +109,7 @@ protected:
     void testFactory(TestData &data);
 
 public:
-    int Main();
+    int Main() override;
 };
 
 TEST_APPHOOK(Test);
diff --git a/documentapi/src/tests/systemstate/systemstate.cpp b/documentapi/src/tests/systemstate/systemstate.cpp
index b8f6c04fa2b..a797f55c625 100644
--- a/documentapi/src/tests/systemstate/systemstate.cpp
+++ b/documentapi/src/tests/systemstate/systemstate.cpp
@@ -11,7 +11,7 @@ using namespace documentapi;
 
 class Test : public vespalib::TestApp {
 public:
-    int Main();
+    int Main() override;
     void testParser();
     void testPathing();
     void testState();