diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 11:53:02 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-12 12:35:35 +0200 |
commit | d0bedbb2032bd0ce14067f92deb2ef4cf0f48806 (patch) | |
tree | a3004253b505fa37825664dafc91eab809aef2ce /searchcore/src/tests/proton/matching | |
parent | 5c6fcf8f1fa84dbff2cd202de019b0b60e51909f (diff) |
add override in searchcore module
Diffstat (limited to 'searchcore/src/tests/proton/matching')
4 files changed, 34 insertions, 34 deletions
diff --git a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp index f7bf6b44b00..7ddee5d4490 100644 --- a/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp +++ b/searchcore/src/tests/proton/matching/docid_range_scheduler/docid_range_scheduler_bench.cpp @@ -204,7 +204,7 @@ struct RangeChecker : vespalib::Rendezvous<WorkTracker,bool> { size_t docid_limit; RangeChecker(size_t num_threads, size_t docid_limit_in) : vespalib::Rendezvous<WorkTracker,bool>(num_threads), docid_limit(docid_limit_in) {} - virtual void mingle() { + virtual void mingle() override { std::vector<DocidRange> ranges; for (size_t i = 0; i < size(); ++i) { ranges.insert(ranges.end(), in(i).ranges.begin(), in(i).ranges.end()); diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp index d745f0dd7c9..fc3184623da 100644 --- a/searchcore/src/tests/proton/matching/matching_test.cpp +++ b/searchcore/src/tests/proton/matching/matching_test.cpp @@ -80,15 +80,15 @@ public: return _vectors.find(name)->second; } virtual const IAttributeVector * - getAttribute(const string &name) const { + getAttribute(const string &name) const override { return get(name); } virtual const IAttributeVector * - getAttributeStableEnum(const string &name) const { + getAttributeStableEnum(const string &name) const override { return get(name); } virtual void - getAttributeList(std::vector<const IAttributeVector *> & list) const { + getAttributeList(std::vector<const IAttributeVector *> & list) const override { Map::const_iterator pos = _vectors.begin(); Map::const_iterator end = _vectors.end(); for (; pos != end; ++pos) { @@ -277,11 +277,11 @@ struct MyWorld { MySearchHandler(Matcher::SP matcher) : _matcher(matcher) {} - virtual DocsumReply::UP getDocsums(const DocsumRequest &) + virtual DocsumReply::UP getDocsums(const DocsumRequest &) override { return DocsumReply::UP(); } virtual SearchReply::UP match(const ISearchHandler::SP &, const SearchRequest &, - vespalib::ThreadBundle &) const + vespalib::ThreadBundle &) const override { return SearchReply::UP(); } }; diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp index 1426a2d85af..12e6ceaddab 100644 --- a/searchcore/src/tests/proton/matching/query_test.cpp +++ b/searchcore/src/tests/proton/matching/query_test.cpp @@ -107,7 +107,7 @@ class Test : public vespalib::TestApp { void requireThatBlackListBlueprintCanBeUsed(); public: - int Main(); + int Main() override; }; #define TEST_CALL(func) \ @@ -225,19 +225,19 @@ public: EXPECT_EQUAL((double)estimatedHitCount / doc_count, n.field(0).getDocFreq()); } - virtual void visit(ProtonNumberTerm &n) { checkNode(n, 1, false); } - virtual void visit(ProtonLocationTerm &n) { checkNode(n, 0, true); } - virtual void visit(ProtonPrefixTerm &n) { checkNode(n, 1, false); } - virtual void visit(ProtonRangeTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonStringTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonSubstringTerm &n) { checkNode(n, 0, true); } - virtual void visit(ProtonSuffixTerm &n) { checkNode(n, 2, false); } - virtual void visit(ProtonPhrase &n) { checkNode(n, 0, true); } - virtual void visit(ProtonWeightedSetTerm &) {} - virtual void visit(ProtonDotProduct &) {} - virtual void visit(ProtonWandTerm &) {} - virtual void visit(ProtonPredicateQuery &) {} - virtual void visit(ProtonRegExpTerm &) {} + virtual void visit(ProtonNumberTerm &n) override { checkNode(n, 1, false); } + virtual void visit(ProtonLocationTerm &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonPrefixTerm &n) override { checkNode(n, 1, false); } + virtual void visit(ProtonRangeTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonStringTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonSubstringTerm &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonSuffixTerm &n) override { checkNode(n, 2, false); } + virtual void visit(ProtonPhrase &n) override { checkNode(n, 0, true); } + virtual void visit(ProtonWeightedSetTerm &) override {} + virtual void visit(ProtonDotProduct &) override {} + virtual void visit(ProtonWandTerm &) override {} + virtual void visit(ProtonPredicateQuery &) override {} + virtual void visit(ProtonRegExpTerm &) override {} }; void Test::requireThatTermsAreLookedUp() { @@ -357,12 +357,12 @@ class SetUpTermDataTestCheckerVisitor int Main() { return 0; } public: - virtual void visit(ProtonNumberTerm &) {} - virtual void visit(ProtonLocationTerm &) {} - virtual void visit(ProtonPrefixTerm &) {} - virtual void visit(ProtonRangeTerm &) {} + virtual void visit(ProtonNumberTerm &) override {} + virtual void visit(ProtonLocationTerm &) override {} + virtual void visit(ProtonPrefixTerm &) override {} + virtual void visit(ProtonRangeTerm &) override {} - virtual void visit(ProtonStringTerm &n) { + virtual void visit(ProtonStringTerm &n) override { const ITermData &term_data = n; EXPECT_EQUAL(string_weight.percent(), term_data.getWeight().percent()); @@ -378,17 +378,17 @@ public: } } - virtual void visit(ProtonSubstringTerm &) {} - virtual void visit(ProtonSuffixTerm &) {} - virtual void visit(ProtonPhrase &n) { + virtual void visit(ProtonSubstringTerm &) override {} + virtual void visit(ProtonSuffixTerm &) override {} + virtual void visit(ProtonPhrase &n) override { const ITermData &term_data = n; EXPECT_EQUAL(2u, term_data.getPhraseLength()); } - virtual void visit(ProtonWeightedSetTerm &) {} - virtual void visit(ProtonDotProduct &) {} - virtual void visit(ProtonWandTerm &) {} - virtual void visit(ProtonPredicateQuery &) {} - virtual void visit(ProtonRegExpTerm &) {} + virtual void visit(ProtonWeightedSetTerm &) override {} + virtual void visit(ProtonDotProduct &) override {} + virtual void visit(ProtonWandTerm &) override {} + virtual void visit(ProtonPredicateQuery &) override {} + virtual void visit(ProtonRegExpTerm &) override {} }; void Test::requireThatTermDataIsFilledIn() { diff --git a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp index 502553bfa69..43f0823d89f 100644 --- a/searchcore/src/tests/proton/matching/termdataextractor_test.cpp +++ b/searchcore/src/tests/proton/matching/termdataextractor_test.cpp @@ -47,7 +47,7 @@ class Test : public vespalib::TestApp { void requireThatNegativeTermsAreSkipped(); public: - int Main(); + int Main() override; }; int |