1 files changed, 34 insertions, 24 deletions

diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp
index 1d38fe6806a..0d9b6d66564 100644
--- a/searchcore/src/tests/proton/server/feedstates_test.cpp
+++ b/searchcore/src/tests/proton/server/feedstates_test.cpp
@@ -37,7 +37,8 @@ struct MyFeedView : public test::DummyFeedView {
     DocumentTypeRepo::SP repo_sp;
     int remove_handled;
 
-    MyFeedView() : repo_sp(repo.getTypeRepoSp()), remove_handled(0) {}
+    MyFeedView();
+    ~MyFeedView();
 
     virtual const DocumentTypeRepo::SP &getDocumentTypeRepo() const
     { return repo_sp; }
@@ -45,6 +46,9 @@ struct MyFeedView : public test::DummyFeedView {
     { ++remove_handled; }
 };
 
+MyFeedView::MyFeedView() : repo_sp(repo.getTypeRepoSp()), remove_handled(0) {}
+MyFeedView::~MyFeedView() {}
+
 struct MyReplayConfig : IReplayConfig {
     virtual void replayConfig(SerialNum) {}
     virtual void replayWipeHistory(SerialNum, fastos::TimeStamp) {}
@@ -68,20 +72,24 @@ struct Fixture
     bucketdb::BucketDBHandler _bucketDBHandler;
     ReplayTransactionLogState state;
 
-    Fixture()
-        : feed_view1(),
-          feed_view2(),
-          feed_view_ptr(&feed_view1),
-          replay_config(),
-          config_store(),
-          _bucketDB(),
-          _bucketDBHandler(_bucketDB),
-          state("doctypename", feed_view_ptr, _bucketDBHandler, replay_config,
-                  config_store)
-    {
-    }
+    Fixture();
+    ~Fixture();
 };
 
+Fixture::Fixture()
+    : feed_view1(),
+      feed_view2(),
+      feed_view_ptr(&feed_view1),
+      replay_config(),
+      config_store(),
+      _bucketDB(),
+      _bucketDBHandler(_bucketDB),
+      state("doctypename", feed_view_ptr, _bucketDBHandler, replay_config, config_store)
+{
+}
+Fixture::~Fixture() {}
+
+
 struct RemoveOperationContext
 {
     DocumentId doc_id;
@@ -89,19 +97,21 @@ struct RemoveOperationContext
     nbostream str;
     std::unique_ptr<Packet> packet;
 
-    RemoveOperationContext(search::SerialNum serial)
-        : doc_id("doc:foo:bar"),
-          op(BucketFactory::getBucketId(doc_id), Timestamp(10), doc_id),
-          str(),
-          packet()
-    {
-        op.serialize(str);
-        ConstBufferRef buf(str.c_str(), str.wp());
-        packet.reset(new Packet());
-        packet->add(Packet::Entry(serial, FeedOperation::REMOVE, buf));
-    }
+    RemoveOperationContext(search::SerialNum serial);
+    ~RemoveOperationContext();
 };
 
+RemoveOperationContext::RemoveOperationContext(search::SerialNum serial)
+    : doc_id("doc:foo:bar"),
+      op(BucketFactory::getBucketId(doc_id), Timestamp(10), doc_id),
+      str(), packet()
+{
+    op.serialize(str);
+    ConstBufferRef buf(str.c_str(), str.wp());
+    packet.reset(new Packet());
+    packet->add(Packet::Entry(serial, FeedOperation::REMOVE, buf));
+}
+RemoveOperationContext::~RemoveOperationContext() {}
 TEST_F("require that active FeedView can change during replay", Fixture)
 {
     RemoveOperationContext opCtx(10);