Deinline destructors/constructors

3 files changed, 23 insertions, 11 deletions

diff --git a/eval/src/tests/eval/function/function_test.cpp b/eval/src/tests/eval/function/function_test.cpp
index 306fdb95386..e90525ce2fa 100644
--- a/eval/src/tests/eval/function/function_test.cpp
+++ b/eval/src/tests/eval/function/function_test.cpp
@@ -608,8 +608,12 @@ struct UnWrapped {
     vespalib::string wrapper;
     vespalib::string body;
     vespalib::string error;
+    ~UnWrapped();
 };
 
+
+UnWrapped::~UnWrapped() {}
+
 UnWrapped unwrap(const vespalib::string &str) {
     UnWrapped result;
     bool ok = Function::unwrap(str, result.wrapper, result.body, result.error);
diff --git a/eval/src/tests/eval/value_type/value_type_test.cpp b/eval/src/tests/eval/value_type/value_type_test.cpp
index 529d45e616d..b72b5a3a972 100644
--- a/eval/src/tests/eval/value_type/value_type_test.cpp
+++ b/eval/src/tests/eval/value_type/value_type_test.cpp
@@ -308,14 +308,18 @@ struct ParseResult {
     const char *end;
     const char *after;
     ValueType type;
-    ParseResult(const vespalib::string &spec_in)
-        : spec(spec_in),
-          pos(spec.data()),
-          end(pos + spec.size()),
-          after(nullptr),
-          type(value_type::parse_spec(pos, end, after)) {}
+    ParseResult(const vespalib::string &spec_in);
+    ~ParseResult();
     bool after_inside() const { return ((after > pos) && (after < end)); }
 };
+ParseResult::ParseResult(const vespalib::string &spec_in)
+    : spec(spec_in),
+      pos(spec.data()),
+      end(pos + spec.size()),
+      after(nullptr),
+      type(value_type::parse_spec(pos, end, after))
+{ }
+ParseResult::~ParseResult() { }
 
 TEST("require that we can parse a partial string into a type with the low-level API") {
     ParseResult result("tensor(a[]) , ");
diff --git a/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp b/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp
index 8b7ea1d03a9..3b16c9e3026 100644
--- a/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp
+++ b/eval/src/tests/tensor/dense_dot_product_function/dense_dot_product_function_test.cpp
@@ -90,11 +90,8 @@ struct Fixture
 {
     DenseDotProductFunction function;
     FunctionInput input;
-    Fixture(size_t lhsNumCells, size_t rhsNumCells)
-        : function(0, 1),
-          input(lhsNumCells, rhsNumCells)
-    {
-    }
+    Fixture(size_t lhsNumCells, size_t rhsNumCells);
+    ~Fixture();
     double eval() const {
         Stash stash;
         const Value &result = function.eval(input, stash);
@@ -107,6 +104,13 @@ struct Fixture
     }
 };
 
+Fixture::Fixture(size_t lhsNumCells, size_t rhsNumCells)
+    : function(0, 1),
+      input(lhsNumCells, rhsNumCells)
+{ }
+
+Fixture::~Fixture() { }
+
 void
 assertDotProduct(size_t numCells)
 {