Deinline destructorsi and use -Winline gcc option.

4 files changed, 37 insertions, 14 deletions

diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp
index fca37df0123..255895c8c72 100644
--- a/storageserver/src/apps/storaged/storage.cpp
+++ b/storageserver/src/apps/storaged/storage.cpp
@@ -65,6 +65,7 @@ class StorageApp : public FastOS_Application,
 
 public:
     StorageApp();
+    ~StorageApp();
 
     void handleSignal(int signal) {
         LOG(info, "Got signal %d, waiting for lock", signal);
@@ -101,6 +102,8 @@ StorageApp::StorageApp()
         "abruptly killing the process.");
 }
 
+StorageApp::~StorageApp() {}
+
 bool StorageApp::Init()
 {
     FastOS_Application::Init();
diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index 62a96ea8111..feff39fb8d4 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -85,6 +85,9 @@ struct StorageServerTest : public CppUnit::TestFixture {
     std::unique_ptr<vdstestlib::DirConfig> storConfig;
     std::unique_ptr<SlobrokMirror> slobrokMirror;
 
+    StorageServerTest();
+    ~StorageServerTest();
+
     void setUp();
     void tearDown();
 
@@ -118,6 +121,9 @@ struct StorageServerTest : public CppUnit::TestFixture {
     CPPUNIT_TEST_SUITE_END();
 };
 
+StorageServerTest::StorageServerTest() {}
+StorageServerTest::~StorageServerTest() {}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(StorageServerTest);
 
 namespace {
@@ -157,12 +163,8 @@ namespace {
     struct Distributor : public Node {
         DistributorProcess _process;
 
-        Distributor(vdstestlib::DirConfig& config)
-            : _process(config.getConfigId())
-        {
-            _process.setupConfig(60000);
-            _process.createNode();
-        }
+        Distributor(vdstestlib::DirConfig& config);
+        ~Distributor();
 
         virtual StorageNode& getNode() { return _process.getNode(); }
         virtual StorageNodeContext& getContext()
@@ -173,13 +175,8 @@ namespace {
         MemFileServiceLayerProcess _process;
         StorageComponent::UP _component;
 
-        Storage(vdstestlib::DirConfig& config) : _process(config.getConfigId())
-        {
-            _process.setupConfig(60000);
-            _process.createNode();
-            _component.reset(new StorageComponent(
-                    getContext().getComponentRegister(), "test"));
-        }
+        Storage(vdstestlib::DirConfig& config);
+        ~Storage();
 
         virtual StorageNode& getNode() { return _process.getNode(); }
         virtual StorageNodeContext& getContext()
@@ -189,6 +186,25 @@ namespace {
         uint16_t getDiskCount() { return getPartitions().size(); }
         StorageComponent& getComponent() { return *_component; }
     };
+
+Distributor::Distributor(vdstestlib::DirConfig& config)
+    : _process(config.getConfigId())
+{
+    _process.setupConfig(60000);
+    _process.createNode();
+}
+Distributor::~Distributor() {}
+
+Storage::Storage(vdstestlib::DirConfig& config)
+    : _process(config.getConfigId())
+{
+    _process.setupConfig(60000);
+    _process.createNode();
+    _component.reset(new StorageComponent(
+    getContext().getComponentRegister(), "test"));
+}
+Storage::~Storage() {}
+
 }
 
 void
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
index f1d58259879..fe6f2ff396c 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
@@ -14,6 +14,10 @@ DistributorProcess::DistributorProcess(const config::ConfigUri & configUri)
 {
 }
 
+DistributorProcess::~DistributorProcess() {
+    shutdown();
+}
+
 void
 DistributorProcess::shutdown()
 {
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.h b/storageserver/src/vespa/storageserver/app/distributorprocess.h
index 32472a68793..c2193783e3d 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.h
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.h
@@ -22,7 +22,7 @@ class DistributorProcess : public Process {
 
 public:
     DistributorProcess(const config::ConfigUri & configUri);
-    ~DistributorProcess() { shutdown(); }
+    ~DistributorProcess();
 
     virtual void shutdown();