Deinline destructors/constructors

3 files changed, 23 insertions, 4 deletions

diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp
index db411d309d1..1376624b207 100644
--- a/configutil/src/apps/configstatus/main.cpp
+++ b/configutil/src/apps/configstatus/main.cpp
@@ -20,9 +20,17 @@ public:
     void usage(void);
     int Main(void);
 
-    Application() : _flags(), _cfgId("admin/model"), _specString("") {}
+    Application();
+    ~Application();
 };
 
+Application::Application()
+    : _flags(),
+      _cfgId("admin/model"),
+      _specString("")
+{}
+Application::~Application() { }
+
 int Application::parseOpts() {
     char c = '?';
     const char *optArg = NULL;
diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp
index ca660791223..9b5c2ccdd09 100644
--- a/configutil/src/apps/modelinspect/main.cpp
+++ b/configutil/src/apps/modelinspect/main.cpp
@@ -18,12 +18,16 @@ class Application : public FastOS_Application
     int parseOpts();
     vespalib::string getSources();
 public:
-    void usage(void);
-    int Main(void);
+    void usage();
+    int Main();
 
-    Application() : _flags(), _cfgId("admin/model"), _specString("") {}
+    Application();
+    ~Application();
 };
 
+Application::Application() : _flags(), _cfgId("admin/model"), _specString("") {}
+Application::~Application() { }
+
 int
 Application::parseOpts()
 {
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index bd3b9cb43ea..5f15b469d90 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -29,6 +29,8 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser
         : _configId(configId), _state(ROOT), _generations(generations)
     {}
 
+    ~ComponentTraverser();
+
     void object(const vespalib::slime::Inspector &inspector) {
         inspector.traverse(*this);
     }
@@ -70,6 +72,8 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser
     }
 };
 
+ComponentTraverser::~ComponentTraverser() {}
+
 class MyHttpHandler : public vbench::HttpResultHandler {
 private:
     std::string _json;
@@ -81,6 +85,7 @@ public:
     MyHttpHandler(std::string configId)
         : _json(), _error(), _configId(configId)
     {}
+    ~MyHttpHandler();
 
     virtual void handleHeader(const vbench::string &name, const vbench::string &value) {
         (void) name;
@@ -105,6 +110,8 @@ public:
     }
 };
 
+MyHttpHandler::~MyHttpHandler() {}
+
 ConfigStatus::ConfigStatus(Flags flags, const config::ConfigUri uri)
     : _cfg(), _flags(flags), _generation(0)
 {