diff options
Diffstat (limited to 'searchlib')
5 files changed, 28 insertions, 18 deletions
diff --git a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp index ad20684bd04..7caed5c2b56 100644 --- a/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp +++ b/searchlib/src/tests/engine/proto_converter/proto_converter_test.cpp @@ -5,9 +5,6 @@ #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/slime/binary_format.h> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Winline" - using ::search::UniqueIssues; using Converter = ::search::engine::ProtoConverter; @@ -640,5 +637,3 @@ TEST_F(MonitorReplyTest, require_that_is_blocking_writes_is_converted) { //----------------------------------------------------------------------------- GTEST_MAIN_RUN_ALL_TESTS() - -#pragma GCC diagnostic pop diff --git a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp index 92caf1ad2dc..9c5e000c314 100644 --- a/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp +++ b/searchlib/src/tests/engine/proto_rpc_adapter/proto_rpc_adapter_test.cpp @@ -14,9 +14,6 @@ #include <thread> #include <chrono> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Winline" - using namespace search::engine; using vespalib::Slime; @@ -222,5 +219,3 @@ TEST_F(ProtoRpcAdapterTest, require_that_proto_rpc_ping_works) { //----------------------------------------------------------------------------- GTEST_MAIN_RUN_ALL_TESTS() - -#pragma GCC diagnostic pop diff --git a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp index 6c344d787ab..fdac3c582b1 100644 --- a/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp +++ b/searchlib/src/tests/queryeval/filter_search/filter_search_test.cpp @@ -1,7 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#pragma GCC diagnostic ignored "-Winline" - #include <vespa/searchlib/queryeval/simpleresult.h> #include <vespa/searchlib/queryeval/emptysearch.h> #include <vespa/searchlib/queryeval/full_search.h> @@ -209,9 +207,8 @@ struct Combine { using factory_fun = std::function<std::unique_ptr<SearchIterator>(const Blueprint::Children &, bool, Constraint)>; factory_fun fun; Blueprint::Children list; - Combine(factory_fun fun_in, const Children &child_list) : fun(fun_in), list() { - child_list.apply(*this); - } + Combine(factory_fun fun_in, const Children &child_list); + ~Combine(); void addChild(std::unique_ptr<Blueprint> child) { list.push_back(std::move(child)); } @@ -220,6 +217,14 @@ struct Combine { } }; +Combine::Combine(factory_fun fun_in, const Children &child_list) + : fun(fun_in), list() +{ + child_list.apply(*this); +} + +Combine::~Combine() = default; + // enable Make-ing source blender struct SourceBlenderAdapter { NullSelector selector; @@ -265,7 +270,8 @@ struct EquivAdapter { struct WeightedSetTermAdapter { FieldSpec field; WeightedSetTermBlueprint blueprint; - WeightedSetTermAdapter() : field("foo", 3, 7), blueprint(field) {} + WeightedSetTermAdapter(); + ~WeightedSetTermAdapter(); void addChild(std::unique_ptr<Blueprint> child) { blueprint.addTerm(std::move(child), 100); } @@ -274,11 +280,15 @@ struct WeightedSetTermAdapter { } }; +WeightedSetTermAdapter::WeightedSetTermAdapter() : field("foo", 3, 7), blueprint(field) {} +WeightedSetTermAdapter::~WeightedSetTermAdapter() = default; + // enable Make-ing dot product struct DotProductAdapter { FieldSpec field; DotProductBlueprint blueprint; - DotProductAdapter() : field("foo", 3, 7), blueprint(field) {} + DotProductAdapter(); + ~DotProductAdapter(); void addChild(std::unique_ptr<Blueprint> child) { auto child_field = blueprint.getNextChildField(field); auto term = std::make_unique<LeafProxy>(child_field, std::move(child)); @@ -289,6 +299,9 @@ struct DotProductAdapter { } }; +DotProductAdapter::DotProductAdapter() : field("foo", 3, 7), blueprint(field) {} +DotProductAdapter::~DotProductAdapter() = default; + // enable Make-ing parallel weak and struct ParallelWeakAndAdapter { FieldSpec field; @@ -308,7 +321,8 @@ struct ParallelWeakAndAdapter { struct SameElementAdapter { FieldSpec field; SameElementBlueprint blueprint; - SameElementAdapter() : field("foo", 5, 11), blueprint(field, false) {} + SameElementAdapter(); + ~SameElementAdapter(); void addChild(std::unique_ptr<Blueprint> child) { auto child_field = blueprint.getNextChildField("foo", 3); auto term = std::make_unique<LeafProxy>(child_field, std::move(child)); @@ -319,6 +333,9 @@ struct SameElementAdapter { } }; +SameElementAdapter::SameElementAdapter() : field("foo", 5, 11), blueprint(field, false) {} +SameElementAdapter::~SameElementAdapter() = default; + // Make a specific intermediate-ish blueprint that you can add // children to. Satisfies the FilterFactory concept. template <FilterFactory T> diff --git a/searchlib/src/vespa/searchlib/queryeval/field_spec.cpp b/searchlib/src/vespa/searchlib/queryeval/field_spec.cpp index ebda61dd820..121591723e2 100644 --- a/searchlib/src/vespa/searchlib/queryeval/field_spec.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/field_spec.cpp @@ -16,4 +16,6 @@ FieldSpecBaseList::~FieldSpecBaseList() = default; FieldSpecList::~FieldSpecList() = default; +FieldSpec::~FieldSpec() = default; + } diff --git a/searchlib/src/vespa/searchlib/queryeval/field_spec.h b/searchlib/src/vespa/searchlib/queryeval/field_spec.h index 0d66de954ad..f37403471ac 100644 --- a/searchlib/src/vespa/searchlib/queryeval/field_spec.h +++ b/searchlib/src/vespa/searchlib/queryeval/field_spec.h @@ -43,6 +43,7 @@ public: : FieldSpecBase(fieldId, handle, isFilter_), _name(name) {} + ~FieldSpec(); const vespalib::string & getName() const { return _name; } private: |