diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-08 21:12:35 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-09 07:16:21 +0000 |
| commit | 35185162ec0d55a9cc438c1ddd405989684b4a01 (patch) | |
| tree | a7a88ad6ba0f5ab3c346cc655fd4bcadad92b126 /searchlib/src/tests | |
| parent | 76883f3d368a048f42496e1592a84b306b86a88c (diff) | |
Deinline as compiler makes the best choices.
Diffstat (limited to 'searchlib/src/tests')
3 files changed, 8 insertions, 7 deletions
diff --git a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp index 70ed03716de..ba4db3cd99e 100644 --- a/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp +++ b/searchlib/src/tests/queryeval/fake_searchable/fake_searchable_test.cpp @@ -1,7 +1,4 @@ // 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("fake_searchable_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/queryeval/fake_searchable.h> @@ -11,12 +8,16 @@ LOG_SETUP("fake_searchable_test"); #include <vespa/searchlib/query/tree/simplequery.h> #include <vespa/searchlib/fef/matchdata.h> +#include <vespa/log/log.h> +LOG_SETUP("fake_searchable_test"); + using namespace search::queryeval; using namespace search::query; using namespace search::fef; class Test : public vespalib::TestApp { public: + ~Test(); int Main() override; void testTestFakeResult(); void testTerm(); @@ -28,6 +29,7 @@ private: FakeRequestContext _requestContext; }; +Test::~Test() {} void Test::testTestFakeResult() { diff --git a/searchlib/src/tests/queryeval/weak_and/rise_wand.h b/searchlib/src/tests/queryeval/weak_and/rise_wand.h index 60e1ec889b3..34d47687b93 100644 --- a/searchlib/src/tests/queryeval/weak_and/rise_wand.h +++ b/searchlib/src/tests/queryeval/weak_and/rise_wand.h @@ -119,10 +119,10 @@ private: public: RiseWand(const Terms &terms, uint32_t n); - virtual ~RiseWand(); + ~RiseWand(); void next(); - virtual void doSeek(uint32_t docid) override; - virtual void doUnpack(uint32_t docid) override; + void doSeek(uint32_t docid) override; + void doUnpack(uint32_t docid) override; }; typedef RiseWand<TermFreqScorer, std::greater_equal<uint64_t> > TermFrequencyRiseWand; diff --git a/searchlib/src/tests/queryeval/weak_and/rise_wand.hpp b/searchlib/src/tests/queryeval/weak_and/rise_wand.hpp index 36a7176bccb..b4f1446775b 100644 --- a/searchlib/src/tests/queryeval/weak_and/rise_wand.hpp +++ b/searchlib/src/tests/queryeval/weak_and/rise_wand.hpp @@ -148,7 +148,6 @@ RiseWand<Scorer, Cmp>::_moveStreamsToDocAndSort(const uint32_t numStreamsToMove, } template <typename Scorer, typename Cmp> -inline void RiseWand<Scorer, Cmp>::_sortMerge(const uint32_t numStreamsToMove) { for (uint32_t i=0; i<numStreamsToMove; ++i) { |