Revert "Balder/enforce override 2"

4 files changed, 22 insertions, 2 deletions

diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/application.h b/vespaclient/src/vespa/vespaclient/spoolmaster/application.h
index 2a20dd1b290..87f628e631c 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,9 +23,19 @@ private:
     bool findOutboxes();
     void moveLinks();
 public:
+    /**
+     * Constructs a new spoolmaster object.
+     */
     Application();
-    ~Application();
+
+    /**
+     * Destructor. Frees any allocated resources.
+     */
+    virtual ~Application();
+
+    // Implements FastOS_Application.
     int Main() override;
 };
 
 }
+
diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h b/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h
index fdb4129a188..2e50ffde2c0 100644
--- a/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h
+++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/application.h
@@ -17,6 +17,7 @@ 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 e77b70f1454..e7eefb7f16d 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/application.h
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.h
@@ -64,9 +64,13 @@ 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 4c50ec9cb38..f9737d1de9a 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/mynetwork.h
@@ -21,7 +21,11 @@ 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;
 
     /**
@@ -39,3 +43,4 @@ public:
      */
     void removeNodes(std::vector<mbus::RoutingNode*> &nodes);
 };
+