Add missing override.

5 files changed, 46 insertions, 60 deletions

diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
index da5bde76748..e4ddc3cb5a7 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
@@ -1,13 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <iomanip>
-#include <vespa/storage/bucketmover/bucketmover.h>
-#include <vespa/storage/bucketmover/htmltable.h>
+#include "bucketmover.h"
+#include "htmltable.h"
 #include <vespa/storage/config/config-stor-server.h>
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/storage/storageutil/log.h>
-#include <vespa/vdslib/distribution/distribution.h>
 
 LOG_SETUP(".bucketmover");
 
diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.h b/storage/src/vespa/storage/bucketmover/bucketmover.h
index f2281b68848..a3473f778c4 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.h
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.h
@@ -16,14 +16,14 @@
 
 #pragma once
 
+#include "run.h"
 #include <vespa/storage/common/storagelink.h>
 #include <vespa/storage/config/config-stor-bucketmover.h>
+#include <vespa/storage/common/servicelayercomponent.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <vespa/storage/bucketmover/run.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vdslib/distribution/distribution.h>
-#include <vespa/storage/common/servicelayercomponent.h>
 #include <vespa/config/helper/ifetchercallback.h>
 #include <vespa/config/subscription/configuri.h>
 #include <vespa/config/config.h>
@@ -58,11 +58,10 @@ public:
     BucketMover(const config::ConfigUri & configUri, ServiceLayerComponentRegister&);
     ~BucketMover();
 
-    virtual void onDoneInit();
-    virtual void onClose();
+    void onDoneInit() override;
+    void onClose() override;
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     bool isWorkingOnCycle() const;
     uint32_t getCycleCount() const;
@@ -82,21 +81,18 @@ private:
     void finishCurrentRun();
     bool tick();
 
-    virtual void configure(std::unique_ptr<vespa::config::content::core::StorBucketmoverConfig>);
-    virtual void run(framework::ThreadHandle&);
-    bool onInternalReply(const std::shared_ptr<api::InternalReply>&);
-    virtual void storageDistributionChanged();
+    void configure(std::unique_ptr<vespa::config::content::core::StorBucketmoverConfig>) override;
+    void run(framework::ThreadHandle&) override;
+    bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override;
+    void storageDistributionChanged() override;
 
     framework::SecondTime calculateWaitTimeOfNextRun() const;
 
-    virtual void reportHtmlStatus(std::ostream&,
-                                  const framework::HttpUrlPath&) const;
+    void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override;
     void printCurrentStatus(std::ostream&, const RunStatistics&) const;
     void printRunHtml(std::ostream&, const bucketmover::Run&) const;
     void printRunStatisticsHtml(std::ostream&, const RunStatistics&) const;
-
 };
 
 } // bucketmover
 } // storage
-
diff --git a/storage/src/vespa/storage/bucketmover/runstatistics.h b/storage/src/vespa/storage/bucketmover/runstatistics.h
index 8a12d286d16..2494c45241f 100644
--- a/storage/src/vespa/storage/bucketmover/runstatistics.h
+++ b/storage/src/vespa/storage/bucketmover/runstatistics.h
@@ -36,12 +36,12 @@
     } \
 }
 
-#include <vespa/document/bucket/bucketid.h>
-#include <vespa/vespalib/util/printable.h>
 #include <vespa/storageframework/storageframework.h>
-#include <vector>
 #include <vespa/vdslib/state/nodestate.h>
 #include <vespa/vdslib/distribution/distribution.h>
+#include <vespa/document/bucket/bucketid.h>
+#include <vespa/vespalib/util/printable.h>
+#include <vector>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.cpp b/storage/src/vespa/storage/storageserver/servicelayernode.cpp
index 457001698ba..5c74f520cde 100644
--- a/storage/src/vespa/storage/storageserver/servicelayernode.cpp
+++ b/storage/src/vespa/storage/storageserver/servicelayernode.cpp
@@ -1,27 +1,23 @@
 // 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/storage/storageserver/servicelayernode.h>
-
-#include <vespa/log/log.h>
-#include <vespa/persistence/spi/exceptions.h>
-#include <vespa/storage/common/nodestateupdater.h>
+#include "servicelayernode.h"
+#include "bouncer.h"
+#include "bucketintegritychecker.h"
+#include <vespa/storage/bucketmover/bucketmover.h>
+#include "communicationmanager.h"
+#include "changedbucketownershiphandler.h"
+#include "mergethrottler.h"
+#include "opslogger.h"
+#include "statemanager.h"
+#include <vespa/storage/visiting/messagebusvisitormessagesession.h>
+#include <vespa/storage/visiting/visitormanager.h>
 #include <vespa/storage/bucketdb/bucketmanager.h>
 #include <vespa/storage/bucketdb/storagebucketdbinitializer.h>
 #include <vespa/storage/persistence/filestorage/filestormanager.h>
 #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h>
-#include <vespa/storage/storageserver/bouncer.h>
-#include <vespa/storage/storageserver/bucketintegritychecker.h>
-#include <vespa/storage/bucketmover/bucketmover.h>
-#include <vespa/storage/storageserver/communicationmanager.h>
-#include <vespa/storage/storageserver/changedbucketownershiphandler.h>
-#include <vespa/storage/storageserver/mergethrottler.h>
-#include <vespa/storage/storageserver/opslogger.h>
-#include <vespa/storage/storageserver/statemanager.h>
-#include <vespa/storage/visiting/messagebusvisitormessagesession.h>
-#include <vespa/storage/visiting/visitormanager.h>
-#include <vespa/storage/common/hostreporter/hostinfo.h>
+#include <vespa/persistence/spi/exceptions.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".node.servicelayer");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.h b/storage/src/vespa/storage/storageserver/servicelayernode.h
index 9c634e22c23..0dc189924cb 100644
--- a/storage/src/vespa/storage/storageserver/servicelayernode.h
+++ b/storage/src/vespa/storage/storageserver/servicelayernode.h
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include <vespa/persistence/spi/persistenceprovider.h>
+#include "applicationgenerationfetcher.h"
+#include "servicelayernodecontext.h"
+#include "storagenode.h"
 #include <vespa/storage/bucketdb/minimumusedbitstracker.h>
-#include <vespa/storage/storageserver/applicationgenerationfetcher.h>
-#include <vespa/storage/storageserver/servicelayernodecontext.h>
-#include <vespa/storage/storageserver/storagenode.h>
+#include <vespa/persistence/spi/persistenceprovider.h>
 #include <vespa/config-stor-devices.h>
 #include <vespa/config/config.h>
 
@@ -44,33 +44,29 @@ public:
     typedef std::unique_ptr<ServiceLayerNode> UP;
 
     ServiceLayerNode(const config::ConfigUri & configUri,
-                            ServiceLayerNodeContext& context,
-                            ApplicationGenerationFetcher& generationFetcher,
-                            spi::PersistenceProvider& persistenceProvider,
-                            const VisitorFactory::Map& externalVisitors);
+                     ServiceLayerNodeContext& context,
+                     ApplicationGenerationFetcher& generationFetcher,
+                     spi::PersistenceProvider& persistenceProvider,
+                     const VisitorFactory::Map& externalVisitors);
     ~ServiceLayerNode();
     /**
      * Init must be called exactly once after construction and before destruction.
      */
     void init();
 
-    virtual const lib::NodeType& getNodeType() const
-        { return lib::NodeType::STORAGE; }
+    const lib::NodeType& getNodeType() const override { return lib::NodeType::STORAGE; }
 
-    virtual ResumeGuard pause();
+    ResumeGuard pause() override;
 
 private:
-    virtual void subscribeToConfigs();
-    virtual void initializeNodeSpecific();
-    virtual void handleLiveConfigUpdate();
-    virtual void configure(std::unique_ptr<vespa::config::storage::StorDevicesConfig> config);
-    virtual VisitorMessageSession::UP createSession(Visitor&, VisitorThread&);
-    virtual documentapi::Priority::Value toDocumentPriority(
-            uint8_t storagePriority) const;
-
-    virtual StorageLink::UP createChain();
-    virtual void removeConfigSubscriptions();
+    void subscribeToConfigs() override;
+    void initializeNodeSpecific() override;
+    void handleLiveConfigUpdate() override;
+    void configure(std::unique_ptr<vespa::config::storage::StorDevicesConfig> config) override;
+    VisitorMessageSession::UP createSession(Visitor&, VisitorThread&) override;
+    documentapi::Priority::Value toDocumentPriority(uint8_t storagePriority) const override;
+    StorageLink::UP createChain() override;
+    void removeConfigSubscriptions() override;
 };
 
 } // storage
-