deiniline destructors

8 files changed, 74 insertions, 27 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index 99bc398ec84..9277429eedd 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -976,6 +976,9 @@ BucketManagerTest::testQueuedRepliesOnlyDispatchedWhenAllProcessingDone()
     const type & name() const { return _ ## name; }
 
 struct TestParams {
+    TestParams();
+    TestParams(const TestParams &);
+    ~TestParams();
     BUILDER_PARAM(document::BucketId, bucket);
     BUILDER_PARAM(document::BucketId, remappedTo);
     BUILDER_PARAM(api::StorageCommand::SP, documentMutation);
@@ -983,6 +986,10 @@ struct TestParams {
     BUILDER_PARAM(std::vector<const api::MessageType*>, expectedOrdering);
 };
 
+TestParams::TestParams() { }
+TestParams::TestParams(const TestParams &) = default;
+TestParams::~TestParams() {}
+
 void
 BucketManagerTest::doTestMutationOrdering(
         ConcurrentOperationFixture& fixture,
diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp
index 6194b23c9ce..f18e0edc02a 100644
--- a/storage/src/tests/bucketdb/lockablemaptest.cpp
+++ b/storage/src/tests/bucketdb/lockablemaptest.cpp
@@ -204,9 +204,9 @@ namespace {
         mutable std::vector<std::string> log;
         mutable std::vector<Map::Decision> behaviour;
 
-        EntryProcessor() : count(0), log(), behaviour() {}
-        EntryProcessor(const std::vector<Map::Decision>& decisions)
-            : count(0), log(), behaviour(decisions) {}
+        EntryProcessor();
+        EntryProcessor(const std::vector<Map::Decision>& decisions);
+        ~EntryProcessor();
 
         Map::Decision operator()(uint64_t key, A& a) const {
             std::ostringstream ost;
@@ -230,6 +230,11 @@ namespace {
     };
 }
 
+EntryProcessor::EntryProcessor() : count(0), log(), behaviour() {}
+EntryProcessor::EntryProcessor(const std::vector<Map::Decision>& decisions)
+        : count(0), log(), behaviour(decisions) {}
+EntryProcessor::~EntryProcessor() {}
+
 void
 LockableMapTest::testIterating() {
     Map map;
diff --git a/storage/src/tests/distributor/pendingmessagetrackertest.cpp b/storage/src/tests/distributor/pendingmessagetrackertest.cpp
index f69525836be..c83fbbe143b 100644
--- a/storage/src/tests/distributor/pendingmessagetrackertest.cpp
+++ b/storage/src/tests/distributor/pendingmessagetrackertest.cpp
@@ -119,19 +119,8 @@ class Fixture
     document::TestDocMan _testDocMan;
 public:
 
-    Fixture()
-        : _compReg(),
-          _clock(),
-          _tracker(),
-          _testDocMan()
-    {
-        _compReg.setClock(_clock);
-        _clock.setAbsoluteTimeInSeconds(1);
-        // Have to set clock in compReg before constructing tracker, or it'll
-        // flip out and die on an explicit nullptr check.
-        _tracker = std::unique_ptr<PendingMessageTracker>(
-                new PendingMessageTracker(_compReg));
-    }
+    Fixture();
+    ~Fixture();
 
     std::shared_ptr<api::PutCommand> sendPut(const RequestBuilder& builder) {
         assignMockedTime(builder.atTime());
@@ -224,6 +213,20 @@ private:
     }
 };
 
+Fixture::Fixture()
+    : _compReg(),
+      _clock(),
+      _tracker(),
+      _testDocMan()
+{
+    _compReg.setClock(_clock);
+    _clock.setAbsoluteTimeInSeconds(1);
+    // Have to set clock in compReg before constructing tracker, or it'll
+    // flip out and die on an explicit nullptr check.
+    _tracker = std::unique_ptr<PendingMessageTracker>(
+            new PendingMessageTracker(_compReg));
+}
+Fixture::~Fixture() {}
 
 }
 
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index ef04453b27f..f09c93622de 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -217,6 +217,8 @@ struct StateCheckersTest : public CppUnit::TestFixture,
         uint32_t _minSplitBits {0};
         bool _includeMessagePriority {false};
         bool _includeSchedulingPriority {false};
+        CheckerParams();
+        ~CheckerParams();
 
         CheckerParams& expect(const std::string& e) {
             _expect = e;
@@ -335,6 +337,11 @@ struct StateCheckersTest : public CppUnit::TestFixture,
 
 CPPUNIT_TEST_SUITE_REGISTRATION(StateCheckersTest);
 
+
+StateCheckersTest::CheckerParams::CheckerParams() {}
+StateCheckersTest::CheckerParams::~CheckerParams() {}
+
+
 const StateCheckersTest::PendingMessage
 StateCheckersTest::CheckerParams::NO_OP_BLOCKER;
 
@@ -1729,10 +1736,9 @@ class StateCheckerRunner
     NodeMaintenanceStatsTracker _statsTracker;
     std::string _result;
 public:
-    StateCheckerRunner(StateCheckersTest& fixture)
-        : _fixture(fixture)
-    {
-    }
+    StateCheckerRunner(StateCheckersTest& fixture);
+    ~StateCheckerRunner();
+
 
     StateCheckerRunner& addToDb(const document::BucketId& bid,
                                 const std::string& bucketInfo)
@@ -1767,6 +1773,13 @@ public:
     }
 };
 
+template <typename Checker>
+StateCheckerRunner<Checker>::StateCheckerRunner(StateCheckersTest& fixture)
+    : _fixture(fixture)
+{}
+template <typename Checker>
+StateCheckerRunner<Checker>::~StateCheckerRunner() {}
+
 } // anon ns
 
 void
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 6d52dd455b9..bf7528c2242 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -683,8 +683,8 @@ public:
     bool _done;
     bool _threadDone;
 
-    MessagePusherThread(FileStorHandler& handler, Document::SP doc)
-        : _handler(handler), _doc(doc), _done(false), _threadDone(false) {}
+    MessagePusherThread(FileStorHandler& handler, Document::SP doc);
+    ~MessagePusherThread();
 
     void run() {
         while (!_done) {
@@ -702,6 +702,11 @@ public:
     }
 };
 
+MessagePusherThread::MessagePusherThread(FileStorHandler& handler, Document::SP doc)
+    : _handler(handler), _doc(doc), _done(false), _threadDone(false)
+{}
+MessagePusherThread::~MessagePusherThread() {}
+
 class MessageFetchingThread : public document::Runnable {
 public:
     FileStorHandler& _handler;
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index 19fee57ad7e..87db1f09bd3 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -174,6 +174,8 @@ private:
         : public HandlerInvoker
     {
     public:
+        HandleGetBucketDiffReplyInvoker();
+        ~HandleGetBucketDiffReplyInvoker();
         void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
         void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
         std::string afterInvoke(MergeHandlerTest&, MergeHandler&);
@@ -196,11 +198,8 @@ private:
         : public MultiPositionHandlerInvoker
     {
     public:
-        HandleApplyBucketDiffReplyInvoker()
-            : _counter(0),
-              _stub(),
-              _applyCmd()
-        {}
+        HandleApplyBucketDiffReplyInvoker();
+        ~HandleApplyBucketDiffReplyInvoker();
         void beforeInvoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
         void invoke(MergeHandlerTest&, MergeHandler&, spi::Context&);
         std::string afterInvoke(MergeHandlerTest&, MergeHandler&);
@@ -219,6 +218,16 @@ private:
 
 CPPUNIT_TEST_SUITE_REGISTRATION(MergeHandlerTest);
 
+
+MergeHandlerTest::HandleGetBucketDiffReplyInvoker::HandleGetBucketDiffReplyInvoker() {}
+MergeHandlerTest::HandleGetBucketDiffReplyInvoker::~HandleGetBucketDiffReplyInvoker() {}
+MergeHandlerTest::HandleApplyBucketDiffReplyInvoker::HandleApplyBucketDiffReplyInvoker()
+    : _counter(0),
+      _stub(),
+      _applyCmd()
+{}
+MergeHandlerTest::HandleApplyBucketDiffReplyInvoker::~HandleApplyBucketDiffReplyInvoker() {}
+
 void
 MergeHandlerTest::setUp() {
     _context.reset(new spi::Context(documentapi::LoadType::DEFAULT, 0, 0));
diff --git a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
index e10151b9ba5..f107efc8d93 100644
--- a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
+++ b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
@@ -20,6 +20,9 @@ operator<<(std::ostream& os, const NodeMaintenanceStats& stats)
     return os;
 }
 
+NodeMaintenanceStatsTracker::NodeMaintenanceStatsTracker() {}
+NodeMaintenanceStatsTracker::~NodeMaintenanceStatsTracker() {}
+
 } // distributor
 } // storage
 
diff --git a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
index 477118ae821..ce807d08418 100644
--- a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
+++ b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
@@ -30,6 +30,8 @@ class NodeMaintenanceStatsTracker
     std::unordered_map<uint16_t, NodeMaintenanceStats> _stats;
     static const NodeMaintenanceStats _emptyStats;
 public:
+    NodeMaintenanceStatsTracker();
+    ~NodeMaintenanceStatsTracker();
     void incMovingOut(uint16_t node) {
         ++_stats[node].movingOut;
     }