Reduce amount of inlining for large methods

2 files changed, 17 insertions, 9 deletions

diff --git a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
index c856c5c805e..16e6d402764 100644
--- a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
+++ b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp
@@ -54,19 +54,24 @@ struct FieldBlock {
     search::RawBuf binary;
     vespalib::string json;
 
-    explicit FieldBlock(const vespalib::string &jsonInput)
-        : input(jsonInput), slime(), binary(1024), json()
-    {
-        size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-        EXPECT_TRUE(used > 0);
-        json = toCompactJsonString(slime);
-        search::SlimeOutputRawBufAdapter adapter(binary);
-        vespalib::slime::BinaryFormat::encode(slime, adapter);
-    }
+    explicit FieldBlock(const vespalib::string &jsonInput);
+    ~FieldBlock();
     const char *data() const { return binary.GetDrainPos(); }
     size_t dataLen() const { return binary.GetUsedLen(); }
 };
 
+FieldBlock::FieldBlock(const vespalib::string &jsonInput)
+    : input(jsonInput), slime(), binary(1024), json()
+{
+    size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
+    EXPECT_TRUE(used > 0);
+    json = toCompactJsonString(slime);
+    search::SlimeOutputRawBufAdapter adapter(binary);
+    vespalib::slime::BinaryFormat::encode(slime, adapter);
+}
+
+FieldBlock::~FieldBlock() = default;
+
 struct AttributeManagerFixture
 {
     AttributeManager mgr;
diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index 8409bd60986..495b6fb570e 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -61,6 +61,7 @@ class BucketDBUpdaterTest : public Test,
 {
 public:
     BucketDBUpdaterTest();
+    ~BucketDBUpdaterTest() override;
 
     auto &defaultDistributorBucketSpace() { return getBucketSpaceRepo().get(makeBucketSpace()); }
 
@@ -555,6 +556,8 @@ BucketDBUpdaterTest::BucketDBUpdaterTest()
 {
 }
 
+BucketDBUpdaterTest::~BucketDBUpdaterTest() = default;
+
 TEST_F(BucketDBUpdaterTest, normal_usage) {
     setSystemState(lib::ClusterState("distributor:2 .0.s:i .1.s:i storage:3"));