diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-12-04 10:34:23 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-12-04 10:34:23 +0100 |
commit | 5c66bb9199a0c8e02282f5d3a38a08e3741918cf (patch) | |
tree | 860ceffda85d63299559b9d07ddee0a1b62a3311 | |
parent | 555200c6f53a4ddb579181cac50a950c5647d854 (diff) |
Eliminate inlining warnings.
15 files changed, 45 insertions, 0 deletions
diff --git a/document/src/vespa/document/bucket/bucketselector.cpp b/document/src/vespa/document/bucket/bucketselector.cpp index 26afc1f2e66..7e7f93b9ef4 100644 --- a/document/src/vespa/document/bucket/bucketselector.cpp +++ b/document/src/vespa/document/bucket/bucketselector.cpp @@ -31,6 +31,8 @@ using namespace document::select; BucketVisitor(const BucketIdFactory& factory) : _factory(factory), _buckets(), _unknown(true) {} + ~BucketVisitor() override; + void visitAndBranch(const document::select::And& node) override { BucketVisitor left(_factory); node.getLeft().visit(left); @@ -155,6 +157,9 @@ using namespace document::select; void visitNullValueNode(const NullValueNode &) override {} void visitInvalidValueNode(const InvalidValueNode &) override {} }; + +BucketVisitor::~BucketVisitor() = default; + //} BucketSelector::BucketSelector(const document::BucketIdFactory& factory) diff --git a/eval/src/tests/eval/function/function_test.cpp b/eval/src/tests/eval/function/function_test.cpp index 598d9c251a6..3dbc2e1aed2 100644 --- a/eval/src/tests/eval/function/function_test.cpp +++ b/eval/src/tests/eval/function/function_test.cpp @@ -418,6 +418,7 @@ struct MyTraverser : public NodeTraverser { std::vector<std::pair<bool, const nodes::Node &> > history; explicit MyTraverser(size_t open_true_cnt_in) : open_true_cnt(open_true_cnt_in), history() {} + ~MyTraverser() override; virtual bool open(const nodes::Node &node) override { history.emplace_back(true, node); if (open_true_cnt == 0) { @@ -448,6 +449,8 @@ struct MyTraverser : public NodeTraverser { } }; +MyTraverser::~MyTraverser() = default; + size_t verify_traversal(size_t open_true_cnt, const vespalib::string &expression) { auto function = Function::parse(expression); if (!EXPECT_TRUE(!function->has_error())) { diff --git a/eval/src/vespa/eval/eval/make_tensor_function.cpp b/eval/src/vespa/eval/eval/make_tensor_function.cpp index 3f8c8b8861b..9ee42f164de 100644 --- a/eval/src/vespa/eval/eval/make_tensor_function.cpp +++ b/eval/src/vespa/eval/eval/make_tensor_function.cpp @@ -26,6 +26,7 @@ struct TensorFunctionBuilder : public NodeVisitor, public NodeTraverser { TensorFunctionBuilder(Stash &stash_in, const ValueBuilderFactory &factory_in, const NodeTypes &types_in) : stash(stash_in), factory(factory_in), types(types_in), stack() {} + ~TensorFunctionBuilder() override; //------------------------------------------------------------------------- @@ -354,6 +355,8 @@ struct TensorFunctionBuilder : public NodeVisitor, public NodeTraverser { void close(const Node &node) override { node.accept(*this); } }; +TensorFunctionBuilder::~TensorFunctionBuilder() = default; + } // namespace vespalib::eval::<unnamed> const TensorFunction &make_tensor_function(const ValueBuilderFactory &factory, const nodes::Node &root, const NodeTypes &types, Stash &stash) { diff --git a/eval/src/vespa/eval/eval/param_usage.cpp b/eval/src/vespa/eval/eval/param_usage.cpp index b43c0c01833..1f28c6eaa51 100644 --- a/eval/src/vespa/eval/eval/param_usage.cpp +++ b/eval/src/vespa/eval/eval/param_usage.cpp @@ -18,6 +18,7 @@ struct CountUsage : NodeTraverser { double p; std::vector<double> result; CountUsage(size_t num_params) : p(1.0), result(num_params, 0.0) {} + ~CountUsage() override; bool open(const Node &node) override { if (auto if_node = as<If>(node)) { double my_p = p; @@ -38,11 +39,14 @@ struct CountUsage : NodeTraverser { } }; +CountUsage::~CountUsage() = default; + //----------------------------------------------------------------------------- struct CheckUsage : NodeTraverser { std::vector<double> result; CheckUsage(size_t num_params) : result(num_params, 0.0) {} + ~CheckUsage() override; void merge(const std::vector<double> &true_result, const std::vector<double> &false_result, double p_true) @@ -72,6 +76,8 @@ struct CheckUsage : NodeTraverser { } }; +CheckUsage::~CheckUsage() = default; + //----------------------------------------------------------------------------- } // namespace vespalib::eval::<unnamed> diff --git a/eval/src/vespa/eval/eval/test/tensor_model.hpp b/eval/src/vespa/eval/eval/test/tensor_model.hpp index 2f8c0d68946..02e0b51742d 100644 --- a/eval/src/vespa/eval/eval/test/tensor_model.hpp +++ b/eval/src/vespa/eval/eval/test/tensor_model.hpp @@ -77,12 +77,15 @@ struct Seq : Sequence { std::vector<double> seq; Seq() : seq() {} Seq(const std::vector<double> &seq_in) : seq(seq_in) {} + ~Seq() override; double operator[](size_t i) const override { ASSERT_LESS(i, seq.size()); return seq[i]; } }; +Seq::~Seq() = default; + // Random access bit mask struct Mask { virtual bool operator[](size_t i) const = 0; diff --git a/juniper/src/test/mcandTest.cpp b/juniper/src/test/mcandTest.cpp index 549397c90f4..085c98b63e8 100644 --- a/juniper/src/test/mcandTest.cpp +++ b/juniper/src/test/mcandTest.cpp @@ -391,6 +391,7 @@ struct MyTokenProcessor : public ITokenProcessor Matcher &_m; std::vector<size_t> _cands; MyTokenProcessor(Matcher &m) : _m(m), _cands() {} + ~MyTokenProcessor() override; void handle_token(Token &token) override { _m.handle_token(token); const match_sequence *ms = _m.GetWorkSet(); @@ -402,6 +403,7 @@ struct MyTokenProcessor : public ITokenProcessor } }; +MyTokenProcessor::~MyTokenProcessor() = default; /** * Test that max number of match candidates can be controlled. diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp index 4b284595e99..81557f28100 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp +++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.cpp @@ -24,6 +24,8 @@ PartitionDocidRangeScheduler::PartitionDocidRangeScheduler(size_t num_threads, u } } +PartitionDocidRangeScheduler::~PartitionDocidRangeScheduler() = default; + //----------------------------------------------------------------------------- DocidRange @@ -50,6 +52,8 @@ TaskDocidRangeScheduler::TaskDocidRangeScheduler(size_t num_threads, size_t num_ { } +TaskDocidRangeScheduler::~TaskDocidRangeScheduler() = default; + //----------------------------------------------------------------------------- size_t diff --git a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h index 7597476ec67..8cbcdd7ba6f 100644 --- a/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h +++ b/searchcore/src/vespa/searchcore/proton/matching/docid_range_scheduler.h @@ -125,6 +125,7 @@ private: std::vector<DocidRange> _ranges; public: PartitionDocidRangeScheduler(size_t num_threads, uint32_t docid_limit); + ~PartitionDocidRangeScheduler() override; DocidRange first_range(size_t thread_id) override { return _ranges[thread_id]; } DocidRange next_range(size_t) override { return DocidRange(); } size_t total_size(size_t thread_id) const override { return _ranges[thread_id].size(); } @@ -151,6 +152,7 @@ private: DocidRange next_task(size_t thread_id); public: TaskDocidRangeScheduler(size_t num_threads, size_t num_tasks, uint32_t docid_limit); + ~TaskDocidRangeScheduler() override; DocidRange first_range(size_t thread_id) override { return next_task(thread_id); } DocidRange next_range(size_t thread_id) override { return next_task(thread_id); } size_t total_size(size_t thread_id) const override { return _assigned[thread_id]; } diff --git a/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp b/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp index efa01b79580..382e2bdb8ff 100644 --- a/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp +++ b/searchlib/src/tests/queryeval/predicate/predicate_search_test.cpp @@ -41,6 +41,8 @@ public: { } + ~MyPostingList() override; + bool next(uint32_t doc_id) override { if (_index < _entries.size()) { while (_entries[_index].first <= doc_id) { @@ -70,6 +72,8 @@ public: uint32_t getInterval() const override { return _interval; } }; +MyPostingList::~MyPostingList() = default; + template <int N> vector<PredicatePostingList::UP> make_posting_lists_vector(MyPostingList (&plists)[N]) { diff --git a/searchlib/src/vespa/searchlib/queryeval/iterators.cpp b/searchlib/src/vespa/searchlib/queryeval/iterators.cpp index 32f6122558e..f9db8aea4f4 100644 --- a/searchlib/src/vespa/searchlib/queryeval/iterators.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/iterators.cpp @@ -11,4 +11,6 @@ RankedSearchIteratorBase(const fef::TermFieldMatchDataArray &matchData) _needUnpack(1) { } +RankedSearchIteratorBase::~RankedSearchIteratorBase() = default; + } diff --git a/searchlib/src/vespa/searchlib/queryeval/iterators.h b/searchlib/src/vespa/searchlib/queryeval/iterators.h index 0e44a6f6ff6..7adfe4aeba6 100644 --- a/searchlib/src/vespa/searchlib/queryeval/iterators.h +++ b/searchlib/src/vespa/searchlib/queryeval/iterators.h @@ -22,6 +22,7 @@ protected: void incNeedUnpack() { ++_needUnpack; } public: RankedSearchIteratorBase(const fef::TermFieldMatchDataArray &matchData); + ~RankedSearchIteratorBase() override; bool getUnpacked() const { return _needUnpack == 0; } }; diff --git a/staging_vespalib/src/tests/objectselection/objectselection.cpp b/staging_vespalib/src/tests/objectselection/objectselection.cpp index 0b670dd56f9..edf0a6b6a9f 100644 --- a/staging_vespalib/src/tests/objectselection/objectselection.cpp +++ b/staging_vespalib/src/tests/objectselection/objectselection.cpp @@ -48,11 +48,14 @@ struct ObjectType : public ObjectPredicate struct ObjectCollect : public ObjectOperation { std::vector<Identifiable*> nodes; + ~ObjectCollect() override; void execute(Identifiable &obj) override { nodes.push_back(&obj); } }; +ObjectCollect::~ObjectCollect() = default; + TEST_SETUP(Test); int diff --git a/vbench/src/tests/handler_thread/handler_thread_test.cpp b/vbench/src/tests/handler_thread/handler_thread_test.cpp index 37c3b8ed796..9420fc7feba 100644 --- a/vbench/src/tests/handler_thread/handler_thread_test.cpp +++ b/vbench/src/tests/handler_thread/handler_thread_test.cpp @@ -6,12 +6,15 @@ using namespace vbench; struct MyHandler : Handler<int> { std::vector<int> values; + ~MyHandler() override; void handle(std::unique_ptr<int> value) override { values.push_back(*value); vespalib::Thread::sleep(10); // for improved coverage } }; +MyHandler::~MyHandler() = default; + TEST("handler thread") { MyHandler handler; HandlerThread<int> th(handler); diff --git a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp index e52ad78c2ba..6ac521a0f01 100644 --- a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp +++ b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp @@ -94,6 +94,8 @@ RedundancyGroupDistribution::RedundancyGroupDistribution( assert(_values.front() >= _values.back()); } +RedundancyGroupDistribution::~RedundancyGroupDistribution() = default; + void RedundancyGroupDistribution::print(std::ostream& out, bool, const std::string&) const diff --git a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h index 73013b6ce81..ab0efcc8a2c 100644 --- a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h +++ b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h @@ -31,6 +31,8 @@ public: RedundancyGroupDistribution(const RedundancyGroupDistribution& spec, uint16_t redundancy); + ~RedundancyGroupDistribution() override; + uint16_t size() const { return _values.size(); } uint16_t operator[](uint16_t i) const { return _values[i]; } |