diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-03 16:58:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 16:58:18 +0200 |
| commit | 56cda12279b911a004a2e8c41ab274665a7a8b5f (patch) | |
| tree | f1bfc1a650ff84310a6375e3ccf02660223e8ee8 /searchlib/src/tests/queryeval | |
| parent | 790c0537be1444dec6e1f4c6cdb597bedb707e91 (diff) | |
Revert "Revert "Fix warnings hidden earlier due to including application headers as s…""
Diffstat (limited to 'searchlib/src/tests/queryeval')
| -rw-r--r-- | searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index e231af20361..d17ab183c0c 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -163,8 +163,8 @@ public: Test() : vespalib::TestApp(), _md(MatchData::makeTestInstance(100, 10)) - { - } + {} + ~Test() {} Blueprint::UP buildBlueprint1(); Blueprint::UP buildBlueprint2(); void testBlueprintBuilding(); diff --git a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp index 4f99f01c290..dc0282c8ae2 100644 --- a/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp +++ b/searchlib/src/tests/queryeval/multibitvectoriterator/multibitvectoriterator_bench.cpp @@ -1,7 +1,5 @@ // 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("multibitvectoriterator_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/queryeval/multibitvectoriterator.h> #include <vespa/searchlib/queryeval/emptysearch.h> @@ -10,6 +8,8 @@ LOG_SETUP("multibitvectoriterator_test"); #include <vespa/searchlib/queryeval/orsearch.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/fef/termfieldmatchdataarray.h> +#include <vespa/log/log.h> +LOG_SETUP("multibitvectoriterator_test"); using namespace search::queryeval; using namespace search::fef; @@ -20,6 +20,7 @@ using namespace search; class Test : public vespalib::TestApp { public: + ~Test() {} void benchmark(); int Main() override; template <typename T> |