diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-18 10:05:45 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 14:03:14 +0200 |
commit | e8b3a767a47daa723eb66feecda1bfd99f3fc225 (patch) | |
tree | 88a1f3dbef9f80c12162e56c366782a2c31e36d9 /vespaclient | |
parent | d781938ec3beb5f8158333c0e46b6b1bb88156c5 (diff) |
override and optimise 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); }; - |