add override in storage/common module

6 files changed, 31 insertions, 29 deletions

diff --git a/storage/src/vespa/storage/common/bucketmessages.h b/storage/src/vespa/storage/common/bucketmessages.h
index a690b42804f..6c0fbbf4ea2 100644
--- a/storage/src/vespa/storage/common/bucketmessages.h
+++ b/storage/src/vespa/storage/common/bucketmessages.h
@@ -27,7 +27,7 @@ public:
     ~ReadBucketList();
     spi::PartitionId getPartition() const { return _partition; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 };
@@ -78,10 +78,10 @@ public:
     ReadBucketInfo(const document::BucketId& bucketId);
     ~ReadBucketInfo();
 
-    document::BucketId getBucketId() const { return _bucketId; }
+    document::BucketId getBucketId() const override { return _bucketId; }
     bool hasSingleBucketId() const override { return true; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 private:
@@ -102,7 +102,7 @@ public:
     ReadBucketInfoReply(const ReadBucketInfo& cmd);
     ~ReadBucketInfoReply();
 
-    document::BucketId getBucketId() const { return _bucketId; }
+    document::BucketId getBucketId() const override { return _bucketId; }
     bool hasSingleBucketId() const override { return true; }
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
@@ -133,7 +133,7 @@ public:
     ~RepairBucketCommand();
 
     bool hasSingleBucketId() const override { return true; }
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
 
     uint16_t getDisk() const { return _disk; }
     bool verifyBody() const { return _verifyBody; }
@@ -143,7 +143,7 @@ public:
     void verifyBody(bool doIt) { _verifyBody = doIt; }
     void moveToIdealDisk(bool doIt) { _moveToIdealDisk = doIt; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 private:
@@ -166,7 +166,7 @@ public:
 
     RepairBucketReply(const RepairBucketCommand& cmd, const api::BucketInfo& bucketInfo = api::BucketInfo());
     ~RepairBucketReply();
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
     bool hasSingleBucketId() const override { return true; }
 
     const api::BucketInfo& getBucketInfo() const { return _bucketInfo; }
@@ -199,7 +199,7 @@ public:
     BucketDiskMoveCommand(const document::BucketId& bucket, uint16_t srcDisk, uint16_t dstDisk);
     ~BucketDiskMoveCommand();
 
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
     bool hasSingleBucketId() const override { return true; }
 
     uint16_t getSrcDisk() const { return _srcDisk; }
@@ -207,7 +207,7 @@ public:
 
     void setBucketId(const document::BucketId& id) { _bucket = id; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     void print(std::ostream& out, bool, const std::string&) const override;
 };
@@ -234,7 +234,7 @@ public:
                         uint32_t destinationFileSize = 0);
     ~BucketDiskMoveReply();
 
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
     bool hasSingleBucketId() const override { return true; }
 
     const api::BucketInfo& getBucketInfo() const { return _bucketInfo; }
@@ -270,13 +270,13 @@ public:
     InternalBucketJoinCommand(const document::BucketId& bucket, uint16_t keepOnDisk, uint16_t joinFromDisk);
     ~InternalBucketJoinCommand();
 
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
     bool hasSingleBucketId() const override { return true; }
 
     uint16_t getDiskOfInstanceToKeep() const { return _keepOnDisk; }
     uint16_t getDiskOfInstanceToJoin() const { return _joinFromDisk; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 };
@@ -296,7 +296,7 @@ public:
                             const api::BucketInfo& info = api::BucketInfo());
     ~InternalBucketJoinReply();
 
-    document::BucketId getBucketId() const { return _bucket; }
+    document::BucketId getBucketId() const override { return _bucket; }
     bool hasSingleBucketId() const override { return true; }
 
     const api::BucketInfo& getBucketInfo() const { return _bucketInfo; }
diff --git a/storage/src/vespa/storage/common/servicelayercomponent.h b/storage/src/vespa/storage/common/servicelayercomponent.h
index 8feccdbf954..e54421b1ce3 100644
--- a/storage/src/vespa/storage/common/servicelayercomponent.h
+++ b/storage/src/vespa/storage/common/servicelayercomponent.h
@@ -55,10 +55,11 @@ class ServiceLayerComponent : public StorageComponent,
     MinimumUsedBitsTracker* _minUsedBitsTracker;
 
         // ServiceLayerManagedComponent implementation
-    virtual void setDiskCount(uint16_t count) { _diskCount = count; }
-    virtual void setBucketDatabase(StorBucketDatabase& db)
-        { _bucketDatabase = &db; }
-    virtual void setMinUsedBitsTracker(MinimumUsedBitsTracker& tracker) {
+    virtual void setDiskCount(uint16_t count) override { _diskCount = count; }
+    virtual void setBucketDatabase(StorBucketDatabase& db) override {
+        _bucketDatabase = &db;
+    }
+    virtual void setMinUsedBitsTracker(MinimumUsedBitsTracker& tracker) override {
         _minUsedBitsTracker = &tracker;
     }
 public:
diff --git a/storage/src/vespa/storage/common/statusmessages.h b/storage/src/vespa/storage/common/statusmessages.h
index da1ac173997..4299fefe773 100644
--- a/storage/src/vespa/storage/common/statusmessages.h
+++ b/storage/src/vespa/storage/common/statusmessages.h
@@ -31,7 +31,7 @@ public:
     const std::string& getSortToken() const { return _sortToken; }
     void setSortToken(const std::string& token) { _sortToken = token; }
 
-    std::unique_ptr<api::StorageReply> makeReply();
+    std::unique_ptr<api::StorageReply> makeReply() override;
 
     const framework::HttpUrlPath& getPath() const { return _path; }
 
diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.cpp b/storage/src/vespa/storage/common/statusmetricconsumer.cpp
index 85dc82b62af..638ff54cbc7 100644
--- a/storage/src/vespa/storage/common/statusmetricconsumer.cpp
+++ b/storage/src/vespa/storage/common/statusmetricconsumer.cpp
@@ -415,7 +415,7 @@ namespace {
                             std::ostream& out)
             : _usedMetrics(used), _out(out) {}
 
-        bool visitMetric(const metrics::Metric& metric, bool) {
+        bool visitMetric(const metrics::Metric& metric, bool) override {
             std::map<metrics::Metric::String,
                      metrics::Metric::SP>::const_iterator it(
                         _usedMetrics.find(metric.getPath()));
diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.h b/storage/src/vespa/storage/common/statusmetricconsumer.h
index fac9296032e..0027cef9cd0 100644
--- a/storage/src/vespa/storage/common/statusmetricconsumer.h
+++ b/storage/src/vespa/storage/common/statusmetricconsumer.h
@@ -33,9 +33,8 @@ public:
             const std::string& name = "status");
     ~StatusMetricConsumer();
 
-    vespalib::string getReportContentType(
-                            const framework::HttpUrlPath&) const;
-    bool reportStatus(std::ostream& out, const framework::HttpUrlPath&) const;
+    vespalib::string getReportContentType(const framework::HttpUrlPath&) const override;
+    bool reportStatus(std::ostream& out, const framework::HttpUrlPath&) const override;
 
     void waitUntilTimeProcessed(framework::SecondTime t) const;
 
diff --git a/storage/src/vespa/storage/common/storagelinkqueued.h b/storage/src/vespa/storage/common/storagelinkqueued.h
index 2d3d8abd925..cd7b91a7a68 100644
--- a/storage/src/vespa/storage/common/storagelinkqueued.h
+++ b/storage/src/vespa/storage/common/storagelinkqueued.h
@@ -40,13 +40,13 @@ public:
     void dispatchUp(const std::shared_ptr<api::StorageMessage>&);
 
     /** Remember to call this method if you override it. */
-    virtual void onClose() {
+    virtual void onClose() override {
         _commandDispatcher.flush();
         _closeState |= 1;
     }
 
     /** Remember to call this method if you override it. */
-    virtual void onFlush(bool downwards) {
+    virtual void onFlush(bool downwards) override {
         if (downwards) {
             _commandDispatcher.flush();
             _closeState |= 2;
@@ -82,7 +82,7 @@ private:
         virtual ~Dispatcher();
 
         void start();
-        void run(framework::ThreadHandle&);
+        void run(framework::ThreadHandle&) override;
 
         void add(const std::shared_ptr<Message>&);
         void flush();
@@ -103,8 +103,9 @@ private:
                     parent, std::numeric_limits<unsigned int>::max(), true)
         {
         }
-        void send(const std::shared_ptr<api::StorageMessage> & reply)
-            { _parent.sendUp(reply); }
+        void send(const std::shared_ptr<api::StorageMessage> & reply) override {
+            _parent.sendUp(reply);
+        }
         virtual ~ReplyDispatcher() { terminate(); }
     };
 
@@ -117,8 +118,9 @@ private:
         {
         }
         virtual ~CommandDispatcher() { terminate(); }
-        void send(const std::shared_ptr<api::StorageMessage> & command)
-            { _parent.sendDown(command); }
+        void send(const std::shared_ptr<api::StorageMessage> & command) override {
+            _parent.sendDown(command);
+        }
     };
 
     framework::ComponentRegister& _compReg;