Deinline destructors/constructors

2 files changed, 59 insertions, 46 deletions

diff --git a/staging_vespalib/src/tests/objectdump/objectdump.cpp b/staging_vespalib/src/tests/objectdump/objectdump.cpp
index 421e9a4daf6..1488397911e 100644
--- a/staging_vespalib/src/tests/objectdump/objectdump.cpp
+++ b/staging_vespalib/src/tests/objectdump/objectdump.cpp
@@ -75,23 +75,32 @@ struct Foo : public Base
     std::vector<Bar> _list;
     std::vector<IdentifiablePtr<Base> > _list2;
 
-    Foo() : _objMember(), _objMember2(), _objPtr(0), _list(), _list2() {
-        _list.push_back(Bar());
-        _list.push_back(Bar());
-        _list.push_back(Bar());
-        _list2.push_back(Bar());
-        _list2.push_back(Baz());
-    }
-    virtual Foo *clone() const { return new Foo(*this); }
-
-    virtual void visitMembers(ObjectVisitor &v) const {
-        visit(v, "_objMember", _objMember);
-        visit(v, "_objMember2", _objMember2);
-        visit(v, "_objPtr", _objPtr);
-        visit(v, "_list", _list);
-        visit(v, "_list2", _list2);
-    }
+    Foo();
+    ~Foo();
+    Foo *clone() const override { return new Foo(*this); }
+    void visitMembers(ObjectVisitor &v) const override;
 };
+
+Foo::~Foo() { }
+Foo::Foo()
+        : _objMember(), _objMember2(), _objPtr(0), _list(), _list2()
+{
+    _list.push_back(Bar());
+    _list.push_back(Bar());
+    _list.push_back(Bar());
+    _list2.push_back(Bar());
+    _list2.push_back(Baz());
+}
+
+void
+Foo::visitMembers(ObjectVisitor &v) const {
+    visit(v, "_objMember", _objMember);
+    visit(v, "_objMember2", _objMember2);
+    visit(v, "_objPtr", _objPtr);
+    visit(v, "_list", _list);
+    visit(v, "_list2", _list2);
+}
+
 IMPLEMENT_IDENTIFIABLE(Foo, Base);
 
 TEST_SETUP(Test);
diff --git a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp b/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
index 5dd27c1ce38..cabff89f9bb 100644
--- a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
+++ b/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
@@ -52,40 +52,44 @@ struct MyOptions : public ProgramOptions {
     std::map<std::string, std::string> properties;
     int anotherOptionalArg;
 
-    MyOptions(int argc, const char* const* argv)
-        : ProgramOptions(argc, argv)
-    {
-            // Required options
-        addOption("uintopt u", uintOpt, "Sets an unsigned int");
-            // Optional options
-        addOption("b bool", boolOpt, "Enables a flag");
-        addOption("boolwithdef", boolWithDefOpt, true, "If set turns to false");
+    MyOptions(int argc, const char *const *argv);
+    ~MyOptions();
+};
 
-        addOption("intopt i", intOpt, 5, "Sets a signed int");
-        addOption("floatopt", floatOpt, 4.0f, "Sets a float\nMultiline baby");
-        addOption("string s", stringOpt, std::string("ballalaika"),
-                  "Sets a string value. This is a very long description that "
-                  "should be broken down into multiple lines in some sensible "
-                  "way.");
-        addOptionHeader("Advanced options");
-        addOption("p properties", properties, "Property map");
-        addHiddenIdentifiers("prop");
-        setArgumentTypeName("key");
-        setArgumentTypeName("value", 1);
+MyOptions::MyOptions(int argc, const char* const* argv)
+    : ProgramOptions(argc, argv)
+{
+        // Required options
+    addOption("uintopt u", uintOpt, "Sets an unsigned int");
+        // Optional options
+    addOption("b bool", boolOpt, "Enables a flag");
+    addOption("boolwithdef", boolWithDefOpt, true, "If set turns to false");
 
-        addArgument("argString", argString, "Required string argument.");
-        addArgument("argInt", argInt, "Required int argument.");
-        addArgument("argOptionalString", argOptionalString, std::string("foo"),
-                    "Optional string argument with a long description so we "
-                    "can see that it will be broken correctly.");
-        addArgument("argSecondOptional", anotherOptionalArg, 3,
-                    "Yet another optional argument");
+    addOption("intopt i", intOpt, 5, "Sets a signed int");
+    addOption("floatopt", floatOpt, 4.0f, "Sets a float\nMultiline baby");
+    addOption("string s", stringOpt, std::string("ballalaika"),
+              "Sets a string value. This is a very long description that "
+              "should be broken down into multiple lines in some sensible "
+              "way.");
+    addOptionHeader("Advanced options");
+    addOption("p properties", properties, "Property map");
+    addHiddenIdentifiers("prop");
+    setArgumentTypeName("key");
+    setArgumentTypeName("value", 1);
 
-        setSyntaxMessage("A test program to see if this utility works.");
-        setSyntaxPageMaxLeftColumnSize(25);
-    }
+    addArgument("argString", argString, "Required string argument.");
+    addArgument("argInt", argInt, "Required int argument.");
+    addArgument("argOptionalString", argOptionalString, std::string("foo"),
+                "Optional string argument with a long description so we "
+                "can see that it will be broken correctly.");
+    addArgument("argSecondOptional", anotherOptionalArg, 3,
+                "Yet another optional argument");
 
-};
+    setSyntaxMessage("A test program to see if this utility works.");
+    setSyntaxPageMaxLeftColumnSize(25);
+}
+
+MyOptions::~MyOptions() { }
 
 void Test::testSyntaxPage() {
     AppOptions opts("myapp");