Deinline destructorsi and use -Winline gcc option.

2 files changed, 40 insertions, 34 deletions

diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
index 3f1b088bd12..bb01027d116 100644
--- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp
+++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp
@@ -1,15 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Copyright (C) 2001-2003 Fast Search & Transfer ASA
-// Copyright (C) 2003 Overture Services Norway AS
 
-
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("docsum-pack");
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchsummary/docsummary/urlresult.h>
 #include <vespa/searchsummary/docsummary/resultconfig.h>
 #include <vespa/searchsummary/docsummary/resultpacker.h>
+#include <vespa/fastos/app.h>
+#include <vespa/log/log.h>
+LOG_SETUP("docsum-pack");
 
 using namespace search::docsummary;
 
@@ -27,13 +24,8 @@ private:
     search::docsummary::ResultPacker _packer;
 
 public:
-    MyApp()
-        : _rc(false),
-          _cnt(0u),
-          _config(),
-          _packer(&_config)
-    {
-    }
+    MyApp();
+    ~MyApp();
 
     // log test results
     void ReportTestResult(uint32_t line, bool rc);
@@ -74,6 +66,13 @@ public:
     int Main();
 };
 
+MyApp::MyApp()
+    : _rc(false),
+      _cnt(0u),
+      _config(),
+      _packer(&_config)
+{}
+MyApp::~MyApp() {}
 
 void
 MyApp::ReportTestResult(uint32_t line, bool rc)
diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index 7a17e803ea8..806eb15b622 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -36,27 +36,8 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback {
     std::unique_ptr<DynamicDocsumWriter> writer;
     std::unique_ptr<ResultPacker> packer;
     GetDocsumsState state;
-    DocsumFixture() : writer(), packer(), state(*this) {
-        ResultConfig *config = new ResultConfig();
-        ResultClass *cfg = config->AddResultClass("default", 0);
-        EXPECT_TRUE(cfg != 0);
-        EXPECT_TRUE(cfg->AddConfigEntry("int_field", RES_INT));
-        EXPECT_TRUE(cfg->AddConfigEntry("short_field", RES_SHORT));
-        EXPECT_TRUE(cfg->AddConfigEntry("byte_field", RES_BYTE));
-        EXPECT_TRUE(cfg->AddConfigEntry("float_field", RES_FLOAT));
-        EXPECT_TRUE(cfg->AddConfigEntry("double_field", RES_DOUBLE));
-        EXPECT_TRUE(cfg->AddConfigEntry("int64_field", RES_INT64));
-        EXPECT_TRUE(cfg->AddConfigEntry("string_field", RES_STRING));
-        EXPECT_TRUE(cfg->AddConfigEntry("data_field", RES_DATA));
-        EXPECT_TRUE(cfg->AddConfigEntry("longstring_field", RES_LONG_STRING));
-        EXPECT_TRUE(cfg->AddConfigEntry("longdata_field", RES_LONG_DATA));
-        EXPECT_TRUE(cfg->AddConfigEntry("xmlstring_field", RES_XMLSTRING));
-        EXPECT_TRUE(cfg->AddConfigEntry("jsonstring_field", RES_JSONSTRING));
-        EXPECT_TRUE(cfg->AddConfigEntry("bad_jsonstring_field", RES_JSONSTRING));
-        config->CreateEnumMaps();
-        writer.reset(new DynamicDocsumWriter(config, 0));
-        packer.reset(new ResultPacker(writer->GetResultConfig()));
-    }
+    DocsumFixture();
+    ~DocsumFixture();
     void getDocsum(Slime &slime) {
         uint32_t classId;
         search::RawBuf buf(4096);
@@ -102,6 +83,32 @@ struct DocsumFixture : IDocsumStore, GetDocsumsStateCallback {
     void ParseLocation(GetDocsumsState *) override { }
 };
 
+
+DocsumFixture::DocsumFixture()
+    : writer(), packer(), state(*this)
+{
+    ResultConfig *config = new ResultConfig();
+    ResultClass *cfg = config->AddResultClass("default", 0);
+    EXPECT_TRUE(cfg != 0);
+    EXPECT_TRUE(cfg->AddConfigEntry("int_field", RES_INT));
+    EXPECT_TRUE(cfg->AddConfigEntry("short_field", RES_SHORT));
+    EXPECT_TRUE(cfg->AddConfigEntry("byte_field", RES_BYTE));
+    EXPECT_TRUE(cfg->AddConfigEntry("float_field", RES_FLOAT));
+    EXPECT_TRUE(cfg->AddConfigEntry("double_field", RES_DOUBLE));
+    EXPECT_TRUE(cfg->AddConfigEntry("int64_field", RES_INT64));
+    EXPECT_TRUE(cfg->AddConfigEntry("string_field", RES_STRING));
+    EXPECT_TRUE(cfg->AddConfigEntry("data_field", RES_DATA));
+    EXPECT_TRUE(cfg->AddConfigEntry("longstring_field", RES_LONG_STRING));
+    EXPECT_TRUE(cfg->AddConfigEntry("longdata_field", RES_LONG_DATA));
+    EXPECT_TRUE(cfg->AddConfigEntry("xmlstring_field", RES_XMLSTRING));
+    EXPECT_TRUE(cfg->AddConfigEntry("jsonstring_field", RES_JSONSTRING));
+    EXPECT_TRUE(cfg->AddConfigEntry("bad_jsonstring_field", RES_JSONSTRING));
+    config->CreateEnumMaps();
+    writer.reset(new DynamicDocsumWriter(config, 0));
+    packer.reset(new ResultPacker(writer->GetResultConfig()));
+}
+DocsumFixture::~DocsumFixture() {}
+
 } // namespace <unnamed>
 
 TEST_FF("require that docsum can be written as slime", DocsumFixture(), Slime()) {