Deinline after gcc 7 advise

3 files changed, 11 insertions, 0 deletions

diff --git a/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp b/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp
index a1709749b7d..adaa7cff056 100644
--- a/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp
+++ b/searchlib/src/vespa/searchlib/features/flow_completeness_feature.cpp
@@ -39,6 +39,7 @@ FlowCompletenessExecutor::FlowCompletenessExecutor(const search::fef::IQueryEnvi
     LOG(spam, "added %zu terms", _terms.size());
 }
 
+namespace {
 typedef std::vector<uint32_t> TermIdxList;
 typedef std::vector<uint32_t> PosList;
 
@@ -67,6 +68,7 @@ struct State {
           posLimit(0),
           score(0.0), flow(0.0),
           completeness(0.0), fieldCompleteness(0.0), queryCompleteness(0.0) {}
+    ~State() { }
 
     void addMatch(int termWeight) {
         ++matchedTerms;
@@ -173,6 +175,8 @@ struct State {
     }
 };
 
+}
+
 
 void
 FlowCompletenessExecutor::execute(uint32_t)
diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp b/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp
index 7e149d4b422..696e8a18dfc 100644
--- a/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp
+++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.cpp
@@ -46,6 +46,9 @@ ParameterValidator::Result::Result(size_t tag) :
 {
 }
 
+ParameterValidator::Result::Result(const Result &) = default;
+ParameterValidator::Result & ParameterValidator::Result::operator=(const Result &) = default;
+
 ParameterValidator::Result::~Result() { }
 
 void
diff --git a/searchlib/src/vespa/searchlib/fef/parametervalidator.h b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
index 94ad19ddc17..06475f8f245 100644
--- a/searchlib/src/vespa/searchlib/fef/parametervalidator.h
+++ b/searchlib/src/vespa/searchlib/fef/parametervalidator.h
@@ -37,6 +37,10 @@ public:
          * Creates a result for the parameter description with the given tag.
          */
         Result(size_t tag = 0);
+        Result(const Result &);
+        Result & operator=(const Result &);
+        Result(Result &&) = default;
+        Result & operator=(Result &&) = default;
         ~Result();
         Result & addParameter(const Parameter & param) { _params.push_back(param); return *this; }
         Result & setError(const vespalib::stringref & str) {