diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-09 13:35:46 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-09 13:35:46 +0100 |
commit | 27821c298d6f61b025e400812cdd71871c1e3982 (patch) | |
tree | 377a8ae20b41f46631db2098c1b8eb41f477bce9 /searchlib/src/tests/ranksetup/ranksetup_test.cpp | |
parent | 7f3e8265707321bf3156e2fe4d4f6e56d17ed557 (diff) |
Deinline destructorsi and use -Winline gcc option.
Diffstat (limited to 'searchlib/src/tests/ranksetup/ranksetup_test.cpp')
-rw-r--r-- | searchlib/src/tests/ranksetup/ranksetup_test.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/searchlib/src/tests/ranksetup/ranksetup_test.cpp b/searchlib/src/tests/ranksetup/ranksetup_test.cpp index fd34e030d33..ba676ac8e2a 100644 --- a/searchlib/src/tests/ranksetup/ranksetup_test.cpp +++ b/searchlib/src/tests/ranksetup/ranksetup_test.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("ranksetup_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <map> @@ -98,14 +96,20 @@ private: RankProgram::UP _secondPhaseProgram; public: - RankExecutor(const vespalib::string &initRank, - const vespalib::string &finalRank, const RankEnvironment &rankEnv) : - _initRank(initRank), _finalRank(finalRank), _rankEnv(rankEnv), _layout(), - _rs(), _firstPhaseProgram(), _secondPhaseProgram() {} + RankExecutor(const vespalib::string &initRank, const vespalib::string &finalRank, const RankEnvironment &rankEnv); + ~RankExecutor(); bool setup(); RankResult execute(uint32_t docId = 1); }; +RankExecutor::RankExecutor(const vespalib::string &initRank, const vespalib::string &finalRank, + const RankEnvironment &rankEnv) + : _initRank(initRank), _finalRank(finalRank), _rankEnv(rankEnv), _layout(), + _rs(), _firstPhaseProgram(), _secondPhaseProgram() +{} + +RankExecutor::~RankExecutor() {} + bool RankExecutor::setup() { @@ -158,17 +162,21 @@ private: RankProgram::UP _rankProgram; public: - FeatureDumper(const RankEnvironment & rankEnv) : - _rankEnv(rankEnv), - _setup(_rankEnv.factory(), _rankEnv.indexEnvironment()), - _layout(), - _rankProgram() {} + FeatureDumper(const RankEnvironment & rankEnv); + ~FeatureDumper(); void addDumpFeature(const vespalib::string &name); void configure(); bool setup(); RankResult dump(); }; +FeatureDumper::FeatureDumper(const RankEnvironment & rankEnv) + : _rankEnv(rankEnv), + _setup(_rankEnv.factory(), _rankEnv.indexEnvironment()), + _layout(), + _rankProgram() +{} +FeatureDumper::~FeatureDumper() {} void FeatureDumper::addDumpFeature(const vespalib::string &name) { |