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 /vsm/src/tests | |
parent | 7f3e8265707321bf3156e2fe4d4f6e56d17ed557 (diff) |
Deinline destructorsi and use -Winline gcc option.
Diffstat (limited to 'vsm/src/tests')
-rw-r--r-- | vsm/src/tests/searcher/searcher.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp index d1c1cd2060b..fbbc8796a7c 100644 --- a/vsm/src/tests/searcher/searcher.cpp +++ b/vsm/src/tests/searcher/searcher.cpp @@ -68,9 +68,8 @@ public: QueryNodeResultFactory eqnr; std::vector<QueryTerm> qtv; QueryTermList qtl; - Query(const StringList & terms) : eqnr(), qtv(), qtl() { - setupQuery(terms); - } + Query(const StringList & terms); + ~Query(); static ParsedQueryTerm parseQueryTerm(const std::string & queryTerm) { size_t i = queryTerm.find(':'); if (i != std::string::npos) { @@ -91,23 +90,30 @@ public: } }; +Query::Query(const StringList & terms) : eqnr(), qtv(), qtl() { + setupQuery(terms); +} +Query::~Query() {} + struct SnippetModifierSetup { Query query; UTF8SubstringSnippetModifier::SP searcher; SharedSearcherBuf buf; SnippetModifier modifier; - explicit SnippetModifierSetup(const StringList & terms) : - query(terms), - searcher(new UTF8SubstringSnippetModifier()), - buf(new SearcherBuf(8)), - modifier(searcher) - { - searcher->prepare(query.qtl, buf); - } + explicit SnippetModifierSetup(const StringList & terms); + ~SnippetModifierSetup(); }; - +SnippetModifierSetup::SnippetModifierSetup(const StringList & terms) + : query(terms), + searcher(new UTF8SubstringSnippetModifier()), + buf(new SearcherBuf(8)), + modifier(searcher) +{ + searcher->prepare(query.qtl, buf); +} +SnippetModifierSetup::~SnippetModifierSetup() {} // helper functions ArrayFieldValue getFieldValue(const StringList &fv); |