Deinline destructorsi and use -Winline gcc option.

1 files changed, 6 insertions, 4 deletions

diff --git a/searchlib/src/tests/fef/termfieldmodel/termfieldmodel_test.cpp b/searchlib/src/tests/fef/termfieldmodel/termfieldmodel_test.cpp
index be55d64c182..86b5304e28c 100644
--- a/searchlib/src/tests/fef/termfieldmodel/termfieldmodel_test.cpp
+++ b/searchlib/src/tests/fef/termfieldmodel/termfieldmodel_test.cpp
@@ -1,7 +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("termfieldmodel_test");
+
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/queryeval/searchiterator.h>
@@ -18,13 +16,17 @@ struct State {
     TermFieldMatchData     *f7;
     TermFieldMatchDataArray array;
 
-    State() : term(), md(), f3(0), f5(0), f7(0), array() {}
+    State();
+    ~State();
 
     void setArray(TermFieldMatchDataArray value) {
         array = value;
     }
 };
 
+State::State() : term(), md(), f3(0), f5(0), f7(0), array() {}
+State::~State() {}
+
 void testInvalidId() {
     const TermFieldMatchData empty;
     using search::queryeval::SearchIterator;