diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 22:41:35 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 22:41:35 +0200 |
commit | d336400e3e95685d62ec05c09e1582c3abcb34fc (patch) | |
tree | 02c8d2dd3988e10bdc8bf9ff5902cf0124d5a3e5 /vespaclient | |
parent | 46dd4350fd595b42ef213981773487f62c86417b (diff) |
no virtual on override + optimize includes.
Diffstat (limited to 'vespaclient')
4 files changed, 2 insertions, 22 deletions
diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/application.h b/vespaclient/src/vespa/vespaclient/spoolmaster/application.h index 87f628e631c..2a20dd1b290 100644 --- a/vespaclient/src/vespa/vespaclient/spoolmaster/application.h +++ b/vespaclient/src/vespa/vespaclient/spoolmaster/application.h @@ -1,9 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include <vespa/fastos/app.h> #include <string> #include <vector> -#include <vespa/fastos/app.h> namespace spoolmaster { /** @@ -23,19 +23,9 @@ private: bool findOutboxes(); void moveLinks(); public: - /** - * Constructs a new spoolmaster object. - */ Application(); - - /** - * Destructor. Frees any allocated resources. - */ - virtual ~Application(); - - // Implements FastOS_Application. + ~Application(); int Main() override; }; } - diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h b/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h index 2e50ffde2c0..fdb4129a188 100644 --- a/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h +++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h @@ -17,7 +17,6 @@ private: bool printDocumentLocation(Locator &locator, const std::string &docId); public: - // Implements FastOS_Application. int Main() override; }; diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.h b/vespaclient/src/vespa/vespaclient/vesparoute/application.h index e7eefb7f16d..e77b70f1454 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.h +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.h @@ -64,13 +64,9 @@ private: std::vector<std::string> &oos, std::set<std::string> &errors) const; public: - /** Null member variables. */ Application(); ~Application(); - - // Inherit doc from FastOS_Application. int Main() override; }; } - diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h b/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h index f9737d1de9a..4c50ec9cb38 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h +++ b/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h @@ -21,11 +21,7 @@ public: // Overrides RPCNetwork. bool allocServiceAddress(mbus::RoutingNode &recipient) override; - - // Overrides RPCNetwork. void freeServiceAddress(mbus::RoutingNode &recipient) override; - - // Overrides RPCNetwork. void send(const mbus::Message &msg, const std::vector<mbus::RoutingNode*> &recipients) override; /** @@ -43,4 +39,3 @@ public: */ void removeNodes(std::vector<mbus::RoutingNode*> &nodes); }; - |