Deinline destructorsi and use -Winline gcc option.

5 files changed, 54 insertions, 28 deletions

diff --git a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp
index e11bec31868..bd92acaa799 100644
--- a/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp
+++ b/searchlib/src/tests/queryeval/booleanmatchiteratorwrapper/booleanmatchiteratorwrapper_test.cpp
@@ -121,6 +121,7 @@ TEST("mostly everything") {
 
 class Verifier : public search::test::SearchIteratorVerifier {
 public:
+    ~Verifier();
     SearchIterator::UP create(bool strict) const override {
         return std::make_unique<BooleanMatchIteratorWrapper>(createIterator(getExpectedDocIds(), strict), _tfmda);;
     }
@@ -128,6 +129,8 @@ private:
     mutable TermFieldMatchDataArray _tfmda;
 };
 
+Verifier::~Verifier() {}
+
 TEST("Test that boolean wrapper iterators adheres to SearchIterator requirements") {
     Verifier searchIteratorVerifier;
     searchIteratorVerifier.verify();
diff --git a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
index 2339a88be5a..d82565a9ec7 100644
--- a/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
+++ b/searchlib/src/tests/queryeval/parallel_weak_and/parallel_weak_and_test.cpp
@@ -87,12 +87,8 @@ struct WandTestSpec : public WandSpec
     MatchParams matchParams;
 
     WandTestSpec(uint32_t scoresToTrack, uint32_t scoresAdjustFrequency = 1,
-                 score_t scoreThreshold = 0, double thresholdBoostFactor = 1)
-        : WandSpec(),
-          heap(scoresToTrack),
-          rootMatchData(),
-          matchParams(heap, scoreThreshold, thresholdBoostFactor, scoresAdjustFrequency)
-    {}
+                 score_t scoreThreshold = 0, double thresholdBoostFactor = 1);
+    ~WandTestSpec();
     SearchIterator *create() {
         MatchData::UP childrenMatchData = createMatchData();
         MatchData *tmp = childrenMatchData.get();
@@ -104,6 +100,18 @@ struct WandTestSpec : public WandSpec
     }
 };
 
+template <typename HeapType>
+WandTestSpec<HeapType>::WandTestSpec(uint32_t scoresToTrack, uint32_t scoresAdjustFrequency,
+                                     score_t scoreThreshold, double thresholdBoostFactor)
+    : WandSpec(),
+      heap(scoresToTrack),
+      rootMatchData(),
+      matchParams(heap, scoreThreshold, thresholdBoostFactor, scoresAdjustFrequency)
+{}
+
+template <typename HeapType>
+WandTestSpec<HeapType>::~WandTestSpec() {}
+
 typedef WandTestSpec<TestHeap> WandSpecWithTestHeap;
 typedef WandTestSpec<SharedWeakAndPriorityQueue> WandSpecWithRealHeap;
 
@@ -403,7 +411,8 @@ struct BlueprintFixtureBase
 {
     WandBlueprintSpec spec;
     FakeSearchable    searchable;
-    BlueprintFixtureBase() : spec(), searchable() {}
+    BlueprintFixtureBase();
+    ~BlueprintFixtureBase();
     Blueprint::UP blueprint(const search::query::Node &term) {
         return spec.blueprint(searchable, "field", term);
     }
@@ -418,6 +427,9 @@ struct BlueprintFixtureBase
     }
 };
 
+BlueprintFixtureBase::BlueprintFixtureBase() : spec(), searchable() {}
+BlueprintFixtureBase::~BlueprintFixtureBase() {}
+
 struct BlueprintHitsFixture : public BlueprintFixtureBase
 {
     FakeResult createResult(size_t hits) {
diff --git a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
index 85fce4a8215..6f87f6befb0 100644
--- a/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
+++ b/searchlib/src/tests/queryeval/simple_phrase/simple_phrase_test.cpp
@@ -105,17 +105,8 @@ private:
     bool                    _strict;
 
 public:
-    PhraseSearchTest(bool expiredDoom=false) :
-        _requestContext(nullptr, expiredDoom ? 0 : std::numeric_limits<int64_t>::max()),
-        _index(),
-        _phrase_fs(field, fieldId, phrase_handle),
-        _phrase(_phrase_fs, _requestContext),
-        _children(),
-        _md(MatchData::makeTestInstance(100, 10)),
-        _order(),
-        _pos(1),
-        _strict(false)
-    {}
+    PhraseSearchTest(bool expiredDoom=false);
+    ~PhraseSearchTest();
 
     TermFieldHandle childHandle(uint32_t idx) const { return (10 * idx + 11); }
 
@@ -186,6 +177,19 @@ public:
     }
 };
 
+PhraseSearchTest::PhraseSearchTest(bool expiredDoom)
+    : _requestContext(nullptr, expiredDoom ? 0 : std::numeric_limits<int64_t>::max()),
+      _index(),
+      _phrase_fs(field, fieldId, phrase_handle),
+      _phrase(_phrase_fs, _requestContext),
+      _children(),
+      _md(MatchData::makeTestInstance(100, 10)),
+      _order(),
+      _pos(1),
+      _strict(false)
+{}
+PhraseSearchTest::~PhraseSearchTest() {}
+
 void Test::requireThatIteratorFindsSimplePhrase(bool useBlueprint) {
     PhraseSearchTest test;
     test.addTerm("foo", 0).addTerm("bar", 1);
diff --git a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
index 9f5faca2668..f6446c4b5cb 100644
--- a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
+++ b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
@@ -143,16 +143,8 @@ using search::test::SearchIteratorVerifier;
 
 class Verifier : public SearchIteratorVerifier {
 public:
-    Verifier() :
-        _indexes(3),
-        _selector(getDocIdLimit())
-    {
-        for (uint32_t docId : getExpectedDocIds()) {
-            const size_t indexId = docId % _indexes.size();
-            _selector.set(docId, indexId);
-            _indexes[indexId].push_back(docId);
-        }
-    }
+    Verifier();
+    ~Verifier();
     SearchIterator::UP create(bool strict) const override {
         return SearchIterator::UP(SourceBlenderSearch::create(_selector.createIterator(),
                                                               createChildren(strict),
@@ -171,6 +163,18 @@ private:
     MySelector _selector;
 };
 
+Verifier::Verifier() :
+    _indexes(3),
+    _selector(getDocIdLimit())
+{
+    for (uint32_t docId : getExpectedDocIds()) {
+        const size_t indexId = docId % _indexes.size();
+        _selector.set(docId, indexId);
+        _indexes[indexId].push_back(docId);
+    }
+}
+Verifier::~Verifier() {}
+
 TEST("Test that source blender iterator adheres to SearchIterator requirements") {
     Verifier searchIteratorVerifier;
     searchIteratorVerifier.verify();
diff --git a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
index 70e087f7c49..5a3ddc04295 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
+++ b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
@@ -81,6 +81,7 @@ struct MyBlueprint : SimpleLeafBlueprint {
         setEstimate(HitEstimate(hits.size(), hits.empty()));
         set_allow_termwise_eval(allow_termwise_eval);
     }
+    ~MyBlueprint();
     SearchIterator::UP createLeafSearch(const fef::TermFieldMatchDataArray &,
                                         bool strict) const override
     {
@@ -88,6 +89,8 @@ struct MyBlueprint : SimpleLeafBlueprint {
     }
 };
 
+MyBlueprint::~MyBlueprint() {}
+
 struct MyOr : OrBlueprint {
     bool use_my_value;
     bool my_value;