diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:16 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:16 +0200 |
commit | 72dfbf262ebe6ceff3df6f26d18c3d707bda919c (patch) | |
tree | f06a5c9c86ea7da955aaa0359a914f6a59234273 /juniper/src | |
parent | 06b2de2791183013dd22d185d137e00e2c83336d (diff) |
add override in juniper module
Diffstat (limited to 'juniper/src')
-rw-r--r-- | juniper/src/test/SrcTestSuite.cpp | 2 | ||||
-rw-r--r-- | juniper/src/test/auxTest.cpp | 12 | ||||
-rw-r--r-- | juniper/src/test/auxTest.h | 4 | ||||
-rw-r--r-- | juniper/src/test/auxTestApp.cpp | 2 | ||||
-rw-r--r-- | juniper/src/test/fakerewriter.h | 8 | ||||
-rw-r--r-- | juniper/src/test/matchobjectTest.h | 4 | ||||
-rw-r--r-- | juniper/src/test/matchobjectTestApp.cpp | 2 | ||||
-rw-r--r-- | juniper/src/test/mcandTest.cpp | 4 | ||||
-rw-r--r-- | juniper/src/test/mcandTest.h | 4 | ||||
-rw-r--r-- | juniper/src/test/mcandTestApp.cpp | 2 | ||||
-rw-r--r-- | juniper/src/test/queryparserTest.h | 4 | ||||
-rw-r--r-- | juniper/src/test/queryparserTestApp.cpp | 2 | ||||
-rw-r--r-- | juniper/src/test/testenv.h | 2 |
13 files changed, 25 insertions, 27 deletions
diff --git a/juniper/src/test/SrcTestSuite.cpp b/juniper/src/test/SrcTestSuite.cpp index 689ed5b57bf..f73e4c8fc3a 100644 --- a/juniper/src/test/SrcTestSuite.cpp +++ b/juniper/src/test/SrcTestSuite.cpp @@ -53,7 +53,7 @@ SrcTestSuite::SrcTestSuite() : */ class SrcTestSuiteApp : public vespalib::TestApp { public: - virtual int Main(); + virtual int Main() override; }; int SrcTestSuiteApp::Main() { diff --git a/juniper/src/test/auxTest.cpp b/juniper/src/test/auxTest.cpp index 4b1274cb2a6..2dc3457e6c3 100644 --- a/juniper/src/test/auxTest.cpp +++ b/juniper/src/test/auxTest.cpp @@ -560,8 +560,7 @@ void AuxTest::test_summary(Matcher& m, const char* content, size_t content_len, class DefProps : public IJuniperProperties { public: - virtual const char* GetProperty(const char*, const char* def) - { + virtual const char* GetProperty(const char*, const char* def) override { return def; } }; @@ -627,13 +626,12 @@ public: TokenChecker(Token* output) : _out(output), i(0) { } - virtual void handle_token(Token& token) - { + virtual void handle_token(Token& token) override { _out[i] = token; i++; } - virtual void handle_end(Token&) {} + virtual void handle_end(Token&) override {} }; @@ -672,13 +670,13 @@ private: std::vector<std::string> _tokens; public: TokenProcessor(const std::string & text) : _text(text), _tokens() {} - virtual void handle_token(Token & t) { + virtual void handle_token(Token & t) override { _tokens.push_back(std::string(_text.c_str() + t.bytepos, t.bytelen)); //LOG(info, "handle_token(%s): bytepos(%d), wordpos(%d), bytelen(%d), curlen(%d)", //_tokens.back().c_str(), //(int)t.bytepos, (int)t.wordpos, t.bytelen, t.curlen); } - virtual void handle_end(Token & t) { + virtual void handle_end(Token & t) override { _tokens.push_back(std::string(_text.c_str() + t.bytepos, t.bytelen)); //LOG(info, "handle_end(%s): bytepos(%d), wordpos(%d), bytelen(%d), curlen(%d)", //_tokens.back().c_str(), diff --git a/juniper/src/test/auxTest.h b/juniper/src/test/auxTest.h index 43b89058b16..218dcaab6d0 100644 --- a/juniper/src/test/auxTest.h +++ b/juniper/src/test/auxTest.h @@ -25,14 +25,14 @@ public: void Run(MethodContainer::iterator &itr); void Run(const char* method); void Run(int argc, char* argv[]); - virtual void Run(); + virtual void Run() override; protected: /** * Since we are running within Emacs, the default behavior of * print_progress which includes backspace does not work. * We'll use a single '.' instead. */ - virtual void print_progress() { *m_osptr << '.' << std::flush; } + virtual void print_progress() override { *m_osptr << '.' << std::flush; } private: // tests: void TestPropertyMap(); diff --git a/juniper/src/test/auxTestApp.cpp b/juniper/src/test/auxTestApp.cpp index 906a1c133dc..3f43c706d35 100644 --- a/juniper/src/test/auxTestApp.cpp +++ b/juniper/src/test/auxTestApp.cpp @@ -6,7 +6,7 @@ class AuxTestApp : public vespalib::TestApp { public: - virtual int Main(); + virtual int Main() override; }; diff --git a/juniper/src/test/fakerewriter.h b/juniper/src/test/fakerewriter.h index 8d09de56644..0a0554f76fc 100644 --- a/juniper/src/test/fakerewriter.h +++ b/juniper/src/test/fakerewriter.h @@ -8,10 +8,10 @@ class FakeRewriter: public juniper::IRewriter { public: FakeRewriter() : _name() {} - virtual const char* Name() const; - virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term); - virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term, size_t length); - virtual const char* NextTerm(juniper::RewriteHandle* exp, size_t& length); + virtual const char* Name() const override; + virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term) override; + virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term, size_t length) override; + virtual const char* NextTerm(juniper::RewriteHandle* exp, size_t& length) override; private: std::string _name; }; diff --git a/juniper/src/test/matchobjectTest.h b/juniper/src/test/matchobjectTest.h index fb2c4bc0578..9e0828cfa77 100644 --- a/juniper/src/test/matchobjectTest.h +++ b/juniper/src/test/matchobjectTest.h @@ -98,7 +98,7 @@ protected: * print_progress which includes backspace does not work. * We'll use a single '.' instead. */ - virtual void print_progress() { *m_osptr << '.' << std::flush; } + virtual void print_progress() override { *m_osptr << '.' << std::flush; } public: @@ -109,7 +109,7 @@ public: * main entry points *************************************************************************/ void Run(MethodContainer::iterator &itr); - virtual void Run(); + virtual void Run() override; void Run(const char *method); void Run(int argc, char* argv[]); }; diff --git a/juniper/src/test/matchobjectTestApp.cpp b/juniper/src/test/matchobjectTestApp.cpp index b83691ef338..065af199589 100644 --- a/juniper/src/test/matchobjectTestApp.cpp +++ b/juniper/src/test/matchobjectTestApp.cpp @@ -29,7 +29,7 @@ */ class MatchObjectTestApp : public vespalib::TestApp { public: - virtual int Main() { + virtual int Main() override { juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str()); MatchObjectTest test; test.SetStream(&std::cout); diff --git a/juniper/src/test/mcandTest.cpp b/juniper/src/test/mcandTest.cpp index 3da6b452ace..b185707c1be 100644 --- a/juniper/src/test/mcandTest.cpp +++ b/juniper/src/test/mcandTest.cpp @@ -405,13 +405,13 @@ struct MyTokenProcessor : public ITokenProcessor Matcher &_m; std::vector<size_t> _cands; MyTokenProcessor(Matcher &m) : _m(m), _cands() {} - virtual void handle_token(Token &token) { + virtual void handle_token(Token &token) override { _m.handle_token(token); const match_sequence *ms = _m.GetWorkSet(); _cands.push_back(ms[0].size()); LOG(info, "match_sequence[0].size(%zu)", _cands.back()); } - virtual void handle_end(Token &token) { + virtual void handle_end(Token &token) override { _m.handle_end(token); } }; diff --git a/juniper/src/test/mcandTest.h b/juniper/src/test/mcandTest.h index 52a8c626a15..754c18ee9dd 100644 --- a/juniper/src/test/mcandTest.h +++ b/juniper/src/test/mcandTest.h @@ -196,7 +196,7 @@ protected: * print_progress which includes backspace does not work. * We'll use a single '.' instead. */ - virtual void print_progress() { *m_osptr << '.' << std::flush; } + virtual void print_progress() override { *m_osptr << '.' << std::flush; } public: @@ -207,7 +207,7 @@ public: * main entry points *************************************************************************/ void Run(MethodContainer::iterator &itr); - virtual void Run(); + virtual void Run() override; void Run(const char *method); void Run(int argc, char* argv[]); }; diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp index 28692a01c73..8a93c14cfc9 100644 --- a/juniper/src/test/mcandTestApp.cpp +++ b/juniper/src/test/mcandTestApp.cpp @@ -29,7 +29,7 @@ */ class MatchCandidateTestApp : public vespalib::TestApp { public: - virtual int Main() { + virtual int Main() override { juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str()); MatchCandidateTest test; test.SetStream(&std::cout); diff --git a/juniper/src/test/queryparserTest.h b/juniper/src/test/queryparserTest.h index 1a13e4d3cc1..b4f464f7592 100644 --- a/juniper/src/test/queryparserTest.h +++ b/juniper/src/test/queryparserTest.h @@ -97,7 +97,7 @@ protected: * print_progress which includes backspace does not work. * We'll use a single '.' instead. */ - virtual void print_progress() { *m_osptr << '.' << std::flush; } + virtual void print_progress() override { *m_osptr << '.' << std::flush; } public: @@ -108,7 +108,7 @@ public: * main entry points *************************************************************************/ void Run(MethodContainer::iterator &itr); - virtual void Run(); + virtual void Run() override; void Run(const char *method); void Run(int argc, char* argv[]); }; diff --git a/juniper/src/test/queryparserTestApp.cpp b/juniper/src/test/queryparserTestApp.cpp index 2c999247478..3559b0177b6 100644 --- a/juniper/src/test/queryparserTestApp.cpp +++ b/juniper/src/test/queryparserTestApp.cpp @@ -29,7 +29,7 @@ */ class QueryParserTestApp : public vespalib::TestApp { public: - virtual int Main() { + virtual int Main() override { juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str()); QueryParserTest test; test.SetStream(&std::cout); diff --git a/juniper/src/test/testenv.h b/juniper/src/test/testenv.h index 1200ce6928e..88d250767fc 100644 --- a/juniper/src/test/testenv.h +++ b/juniper/src/test/testenv.h @@ -57,7 +57,7 @@ public: PropertyMap(); virtual ~PropertyMap(); PropertyMap &set(const char *name, const char *value); - virtual const char* GetProperty(const char* name, const char* def = NULL); + virtual const char* GetProperty(const char* name, const char* def = NULL) override; }; |