2 files changed, 29 insertions, 15 deletions
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 5159f5b6061..f3f495925f0 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -110,21 +110,26 @@ struct FieldBlock {
     search::RawBuf binary;
     vespalib::string json;
 
-    explicit FieldBlock(const vespalib::string &jsonInput)
-        : input(jsonInput), slime(), binary(1024), json()
+    explicit FieldBlock(const vespalib::string &jsonInput);
+    ~FieldBlock();
+};
+
+FieldBlock::FieldBlock(const vespalib::string &jsonInput)
+    : input(jsonInput), slime(), binary(1024), json()
+{
+    size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
+    EXPECT_EQUAL(jsonInput.size(), used);
     {
-        size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-        EXPECT_EQUAL(jsonInput.size(), used);
-        {
-            search::SlimeOutputRawBufAdapter adapter(binary);
-            vespalib::slime::JsonFormat::encode(slime, adapter, true);
-            json.assign(binary.GetDrainPos(), binary.GetUsedLen());
-            binary.reset();
-        }
         search::SlimeOutputRawBufAdapter adapter(binary);
-        vespalib::slime::BinaryFormat::encode(slime, adapter);
+        vespalib::slime::JsonFormat::encode(slime, adapter, true);
+        json.assign(binary.GetDrainPos(), binary.GetUsedLen());
+        binary.reset();
     }
-};
+    search::SlimeOutputRawBufAdapter adapter(binary);
+    vespalib::slime::BinaryFormat::encode(slime, adapter);
+}
+
+FieldBlock::~FieldBlock() {}
 
 class Test : public vespalib::TestApp {
     std::unique_ptr<Schema> _schema;
diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
index 5d56966c920..fcbf4e3c241 100644
--- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
+++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp
@@ -51,9 +51,8 @@ struct Model {
     std::map<std::string,std::string>                         constants;
     std::vector<bool>                                         extra_profiles;
     std::vector<std::string>                                  imported_attributes;
-    Model() : indexes(), attributes(), properties(), extra_profiles(), imported_attributes() {
-        verify_dir();
-    }
+    Model();
+    ~Model();
     void index(const std::string &name, schema::DataType data_type,
                schema::CollectionType collection_type)
     {
@@ -170,6 +169,16 @@ struct Model {
     }
 };
 
+Model::Model()
+    : indexes(),
+      attributes(),
+      properties(),
+      extra_profiles()
+{
+    verify_dir();
+}
+Model::~Model() {}
+
 //-----------------------------------------------------------------------------
 
 struct EmptyModel : Model {};