Fix warnings hidden earlier due to including application headers as system includes

4 files changed, 26 insertions, 32 deletions

diff --git a/storageserver/src/tests/dummystoragelink.h b/storageserver/src/tests/dummystoragelink.h
index cb9df8c5642..5934f08695f 100644
--- a/storageserver/src/tests/dummystoragelink.h
+++ b/storageserver/src/tests/dummystoragelink.h
@@ -2,15 +2,14 @@
 
 #pragma once
 
-#include <vespa/vespalib/util/sync.h>
-#include <list>
-#include <sstream>
-#include <vespa/storageapi/messageapi/storagecommand.h>
-#include <string>
-#include <vector>
+
 #include <vespa/storage/common/storagelink.h>
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/storageapi/message/internal.h>
+#include <vespa/storageapi/messageapi/storagecommand.h>
+#include <vespa/vespalib/util/sync.h>
+#include <list>
+#include <sstream>
 
 class FastOS_ThreadPool;
 
@@ -33,15 +32,14 @@ public:
     DummyStorageLink();
     ~DummyStorageLink();
 
-    bool onDown(const api::StorageMessage::SP&);
-    bool onUp(const api::StorageMessage::SP&);
+    bool onDown(const api::StorageMessage::SP&) override;
+    bool onUp(const api::StorageMessage::SP&) override;
 
     void addOnTopOfChain(StorageLink& link) {
         link.addTestLinkOnTop(this);
     }
 
-    void print(std::ostream& ost, bool verbose, const std::string& indent) const
-    {
+    void print(std::ostream& ost, bool verbose, const std::string& indent) const override     {
         (void) verbose;
         ost << indent << "DummyStorageLink("
             << "autoreply = " << (_autoReply ? "on" : "off")
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h
index c2193783e3d..8911372b05e 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.h
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <vespa/storageserver/app/process.h>
+#include "process.h"
 
 namespace storage {
 
@@ -24,19 +24,16 @@ public:
     DistributorProcess(const config::ConfigUri & configUri);
     ~DistributorProcess();
 
-    virtual void shutdown();
+    void shutdown() override;
+    void setupConfig(uint64_t subscribeTimeout) override;
+    void createNode() override;
+    bool configUpdated() override;
+    void updateConfig() override;
+    StorageNode& getNode() override { return *_node; }
+    StorageNodeContext& getContext() override { return _context; }
+    std::string getComponentName() const override { return "distributor"; }
 
-    virtual void setupConfig(uint64_t subscribeTimeout);
-    virtual void createNode();
-    virtual bool configUpdated();
-    virtual void updateConfig();
-
-    virtual StorageNode& getNode() { return *_node; }
-    virtual StorageNodeContext& getContext() { return _context; }
     virtual DistributorNodeContext& getDistributorContext() { return _context; }
-
-    virtual std::string getComponentName() const { return "distributor"; }
 };
 
 } // storage
-
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
index 5fd048d35c2..696e79503d7 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "servicelayerprocess.h"
-
 #include <vespa/searchvisitor/searchvisitor.h>
-#include <vespa/storage/storageutil/utils.h>
 
 namespace storage {
 
@@ -12,6 +10,8 @@ ServiceLayerProcess::ServiceLayerProcess(const config::ConfigUri & configUri)
 {
 }
 
+ServiceLayerProcess::~ServiceLayerProcess() {}
+
 void
 ServiceLayerProcess::shutdown()
 {
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
index dd22be8f7c7..4140e072a50 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
@@ -16,7 +16,7 @@
  */
 #pragma once
 
-#include <vespa/storageserver/app/process.h>
+#include "process.h"
 #include <vespa/config/config.h>
 #include <vespa/config/helper/configfetcher.h>
 #include <vespa/config-persistence.h>
@@ -32,18 +32,17 @@ protected:
 
 public:
     ServiceLayerProcess(const config::ConfigUri & configUri);
+    ~ServiceLayerProcess();
 
-    virtual void shutdown() override;
+    void shutdown() override;
 
     virtual void setupProvider() = 0;
     virtual spi::PersistenceProvider& getProvider() = 0;
 
-    virtual void createNode() override;
-
-    virtual StorageNode& getNode() override { return *_node; }
-    virtual StorageNodeContext& getContext() override { return _context; }
-
-    virtual std::string getComponentName() const override { return "servicelayer"; }
+    void createNode() override;
+    StorageNode& getNode() override { return *_node; }
+    StorageNodeContext& getContext() override { return _context; }
+    std::string getComponentName() const override { return "servicelayer"; }
 };
 
 } // storage