diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-05 02:32:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 02:03:47 +0200 |
commit | b57308e4a134fb6139d2cb52a031d3e7185f16cf (patch) | |
tree | 7c31d445e2f76bb737ef90ce29e0e7e6738d6eb1 /slobrok/src/tests | |
parent | 40b8ba5a3f34028d208d4e0dc1b46940d6fe5a47 (diff) |
Use override
Diffstat (limited to 'slobrok/src/tests')
-rw-r--r-- | slobrok/src/tests/mirrorapi/match_test.cpp | 7 | ||||
-rw-r--r-- | slobrok/src/tests/oldapi/mirror.h | 11 | ||||
-rw-r--r-- | slobrok/src/tests/startsome/rpc_info.cpp | 5 | ||||
-rw-r--r-- | slobrok/src/tests/startsome/tstdst.cpp | 10 |
4 files changed, 9 insertions, 24 deletions
diff --git a/slobrok/src/tests/mirrorapi/match_test.cpp b/slobrok/src/tests/mirrorapi/match_test.cpp index d9ebcfd6f29..94900daa202 100644 --- a/slobrok/src/tests/mirrorapi/match_test.cpp +++ b/slobrok/src/tests/mirrorapi/match_test.cpp @@ -4,12 +4,11 @@ class MatchTester : public slobrok::api::IMirrorAPI { - virtual SpecList lookup(const std::string &) const override { + SpecList lookup(const std::string &) const override { return SpecList(); } - virtual uint32_t updates() const override { return 0; } - - virtual bool ready() const override { return true; } + uint32_t updates() const override { return 0; } + bool ready() const override { return true; } const std::string name; diff --git a/slobrok/src/tests/oldapi/mirror.h b/slobrok/src/tests/oldapi/mirror.h index 1f0db564cae..b83392dec5e 100644 --- a/slobrok/src/tests/oldapi/mirror.h +++ b/slobrok/src/tests/oldapi/mirror.h @@ -1,6 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#ifndef Old_MIRROR_H -#define Old_MIRROR_H +#pragma once #include <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/gencnt.h> @@ -86,10 +85,7 @@ public: **/ ~MirrorOld(); - // Inherit doc from IMirrorOld. SpecList lookup(const std::string & pattern) const override; - - // Inherit doc from IMirrorOld. uint32_t updates() const override { return _updates.getAsInt(); } /** @@ -110,10 +106,7 @@ private: MirrorOld(const MirrorOld &); MirrorOld &operator=(const MirrorOld &); - /** from FNET_Task, polls slobrok **/ void PerformTask() override; - - /** from FRT_IRequestWait **/ void RequestDone(FRT_RPCRequest *req) override; FRT_Supervisor &_orb; @@ -131,5 +124,3 @@ private: } // namespace api } // namespace slobrok - -#endif diff --git a/slobrok/src/tests/startsome/rpc_info.cpp b/slobrok/src/tests/startsome/rpc_info.cpp index 76b578d4f88..be5418ff1a8 100644 --- a/slobrok/src/tests/startsome/rpc_info.cpp +++ b/slobrok/src/tests/startsome/rpc_info.cpp @@ -1,8 +1,7 @@ // 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("rpc_info"); + #include <vespa/fnet/frt/frt.h> +#include <vespa/fastos/app.h> class RPCInfo : public FastOS_Application { diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp index e2f6ae070b3..7d3fcef8695 100644 --- a/slobrok/src/tests/startsome/tstdst.cpp +++ b/slobrok/src/tests/startsome/tstdst.cpp @@ -1,15 +1,11 @@ // 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("testrpcserver"); #include <vespa/vespalib/util/host_name.h> -#include <vespa/fnet/fnet.h> #include <vespa/fnet/frt/frt.h> +#include <vespa/fastos/app.h> -#include <vector> -#include <string> -#include <sstream> +#include <vespa/log/log.h> +LOG_SETUP("testrpcserver"); class FNET_Transport; class FNET_Scheduler; |