Merge pull request #24485 from vespa-engine/toregge/deinline-destructors-in-messagebus

Deinline destructors in messagebus.

11 files changed, 19 insertions, 0 deletions

diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp
index aefbd8816c6..acdcf55fe52 100644
--- a/messagebus/src/tests/routing/routing.cpp
+++ b/messagebus/src/tests/routing/routing.cpp
@@ -164,6 +164,7 @@ private:
 public:
     ReuseReplyPolicyFactory(bool selectOnRetry,
                             const std::vector<uint32_t> &errorMask);
+    ~ReuseReplyPolicyFactory() override;
     IRoutingPolicy::UP create(const string &param) override;
 };
 
@@ -175,6 +176,8 @@ ReuseReplyPolicyFactory::ReuseReplyPolicyFactory(bool selectOnRetry,
     // empty
 }
 
+ReuseReplyPolicyFactory::~ReuseReplyPolicyFactory() = default;
+
 IRoutingPolicy::UP
 ReuseReplyPolicyFactory::create(const string &param)
 {
diff --git a/messagebus/src/vespa/messagebus/routing/errordirective.cpp b/messagebus/src/vespa/messagebus/routing/errordirective.cpp
index efbe91a12c9..216fa448be1 100644
--- a/messagebus/src/vespa/messagebus/routing/errordirective.cpp
+++ b/messagebus/src/vespa/messagebus/routing/errordirective.cpp
@@ -10,6 +10,8 @@ ErrorDirective::ErrorDirective(vespalib::stringref msg) :
     _msg(msg)
 { }
 
+ErrorDirective::~ErrorDirective() = default;
+
 string
 ErrorDirective::toString() const
 {
diff --git a/messagebus/src/vespa/messagebus/routing/errordirective.h b/messagebus/src/vespa/messagebus/routing/errordirective.h
index f44c21711c5..ab27fde0039 100644
--- a/messagebus/src/vespa/messagebus/routing/errordirective.h
+++ b/messagebus/src/vespa/messagebus/routing/errordirective.h
@@ -23,6 +23,7 @@ public:
      * @param msg The error message.
      */
     ErrorDirective(vespalib::stringref msg);
+    ~ErrorDirective() override;
 
     /**
      * Returns the error string that is to be assigned to the reply.
diff --git a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp
index 61c57979730..755220194ec 100644
--- a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp
+++ b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.cpp
@@ -10,6 +10,8 @@ RetryTransientErrorsPolicy::RetryTransientErrorsPolicy() :
     _baseDelay(0.001)
 {}
 
+RetryTransientErrorsPolicy::~RetryTransientErrorsPolicy() = default;
+
 RetryTransientErrorsPolicy &
 RetryTransientErrorsPolicy::setEnabled(bool enabled) {
     _enabled = enabled;
diff --git a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.h b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.h
index 485dd08ec37..f73c519e465 100644
--- a/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.h
+++ b/messagebus/src/vespa/messagebus/routing/retrytransienterrorspolicy.h
@@ -22,6 +22,7 @@ public:
      * Constructs a new instance of this policy. By default retries are enabled with a 1.0 second base delay.
      */
     RetryTransientErrorsPolicy();
+    ~RetryTransientErrorsPolicy() override;
 
     /**
      * Sets whether or not this policy should allow retries or not.
diff --git a/messagebus/src/vespa/messagebus/routing/routedirective.cpp b/messagebus/src/vespa/messagebus/routing/routedirective.cpp
index 1c5d2932759..20945fa2fe7 100644
--- a/messagebus/src/vespa/messagebus/routing/routedirective.cpp
+++ b/messagebus/src/vespa/messagebus/routing/routedirective.cpp
@@ -12,6 +12,8 @@ RouteDirective::RouteDirective(vespalib::stringref name) :
     // empty
 }
 
+RouteDirective::~RouteDirective() = default;
+
 bool
 RouteDirective::matches(const IHopDirective &dir) const
 {
diff --git a/messagebus/src/vespa/messagebus/routing/routedirective.h b/messagebus/src/vespa/messagebus/routing/routedirective.h
index e943599e614..26cbebb6d6f 100644
--- a/messagebus/src/vespa/messagebus/routing/routedirective.h
+++ b/messagebus/src/vespa/messagebus/routing/routedirective.h
@@ -24,6 +24,7 @@ public:
      * @param name The name of the route to insert.
      */
     RouteDirective(vespalib::stringref name);
+    ~RouteDirective() override;
 
     /**
      * Returns the name of the route to insert.
diff --git a/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp b/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp
index 8530a28e754..a9396116cd6 100644
--- a/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp
+++ b/messagebus/src/vespa/messagebus/routing/tcpdirective.cpp
@@ -13,6 +13,8 @@ TcpDirective::TcpDirective(vespalib::stringref host, uint32_t port, vespalib::st
     // empty
 }
 
+TcpDirective::~TcpDirective() = default;
+
 bool
 TcpDirective::matches(const IHopDirective &dir) const
 {
diff --git a/messagebus/src/vespa/messagebus/routing/tcpdirective.h b/messagebus/src/vespa/messagebus/routing/tcpdirective.h
index b18401c8647..d2f621abdc5 100644
--- a/messagebus/src/vespa/messagebus/routing/tcpdirective.h
+++ b/messagebus/src/vespa/messagebus/routing/tcpdirective.h
@@ -28,6 +28,8 @@ public:
      */
     TcpDirective(vespalib::stringref host, uint32_t port, vespalib::stringref session);
 
+    ~TcpDirective() override;
+
     /**
      * Returns the host to connect to. This may be an ip address or a name.
      *
diff --git a/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp b/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp
index 963884f6a40..85dce96ebb2 100644
--- a/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp
+++ b/messagebus/src/vespa/messagebus/routing/verbatimdirective.cpp
@@ -10,6 +10,8 @@ VerbatimDirective::VerbatimDirective(vespalib::stringref image) :
     // empty
 }
 
+VerbatimDirective::~VerbatimDirective() = default;
+
 bool
 VerbatimDirective::matches(const IHopDirective &dir) const
 {
diff --git a/messagebus/src/vespa/messagebus/routing/verbatimdirective.h b/messagebus/src/vespa/messagebus/routing/verbatimdirective.h
index 50f4be08184..4401fe1c911 100644
--- a/messagebus/src/vespa/messagebus/routing/verbatimdirective.h
+++ b/messagebus/src/vespa/messagebus/routing/verbatimdirective.h
@@ -23,6 +23,7 @@ public:
      * @param image The image to assign to this.
      */
     VerbatimDirective(vespalib::stringref image);
+    ~VerbatimDirective() override;
 
     /**
      * Returns the image to which this is a verbatim match.