Reduce inlining of large destructors.

4 files changed, 11 insertions, 18 deletions

diff --git a/messagebus/src/vespa/messagebus/routing/hop.cpp b/messagebus/src/vespa/messagebus/routing/hop.cpp
index 5a38eba907c..08d6e949b3d 100644
--- a/messagebus/src/vespa/messagebus/routing/hop.cpp
+++ b/messagebus/src/vespa/messagebus/routing/hop.cpp
@@ -1,8 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".hop");
-
 #include "hop.h"
 #include "routeparser.h"
 
@@ -11,9 +8,7 @@ namespace mbus {
 Hop::Hop() :
     _selector(),
     _ignoreResult(false)
-{
-    // empty
-}
+{ }
 
 Hop::Hop(const string &selector) :
     _selector(),
@@ -28,9 +23,9 @@ Hop::Hop(const std::vector<IHopDirective::SP> &selector,
          bool ignoreResult) :
     _selector(selector),
     _ignoreResult(ignoreResult)
-{
-    // empty
-}
+{ }
+
+Hop::~Hop() { }
 
 Hop &
 Hop::addDirective(IHopDirective::SP dir)
diff --git a/messagebus/src/vespa/messagebus/routing/hop.h b/messagebus/src/vespa/messagebus/routing/hop.h
index 6d23cda729c..9860696235b 100644
--- a/messagebus/src/vespa/messagebus/routing/hop.h
+++ b/messagebus/src/vespa/messagebus/routing/hop.h
@@ -43,6 +43,8 @@ public:
      */
     Hop(const std::vector<IHopDirective::SP> &selector, bool ignoreResult);
 
+    ~Hop();
+
     /**
      * Adds a new directive to this hop.
      *
diff --git a/messagebus/src/vespa/messagebus/routing/route.cpp b/messagebus/src/vespa/messagebus/routing/route.cpp
index 593a2a3f0ef..ad9c2ca13d0 100644
--- a/messagebus/src/vespa/messagebus/routing/route.cpp
+++ b/messagebus/src/vespa/messagebus/routing/route.cpp
@@ -1,8 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".route");
-
 #include "route.h"
 #include "routeparser.h"
 
@@ -10,15 +7,13 @@ namespace mbus {
 
 Route::Route() :
     _hops()
-{
-    // empty
-}
+{ }
 
 Route::Route(const std::vector<Hop> &lst) :
     _hops(lst)
-{
-    // empty
-}
+{ }
+
+Route::~Route() { }
 
 Route &
 Route::addHop(const Hop &hop)
diff --git a/messagebus/src/vespa/messagebus/routing/route.h b/messagebus/src/vespa/messagebus/routing/route.h
index d027f28302c..f420d297fe5 100644
--- a/messagebus/src/vespa/messagebus/routing/route.h
+++ b/messagebus/src/vespa/messagebus/routing/route.h
@@ -39,6 +39,7 @@ public:
      * Create a Route that contains no hops
      */
     Route();
+    ~Route();
 
     /**
      * Constructs a route that contains the given hops.