Revert "Balder/enforce override 2"

6 files changed, 39 insertions, 17 deletions

diff --git a/slobrok/src/apps/check_slobrok/check_slobrok.cpp b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
index 9d588eab39f..8e2a91c100d 100644
--- a/slobrok/src/apps/check_slobrok/check_slobrok.cpp
+++ b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
@@ -1,12 +1,14 @@
 // 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("check_slobrok");
 
 #include <vespa/fnet/frt/frt.h>
-#include <vespa/fastos/app.h>
+
 #include <string>
 #include <sstream>
 
-#include <vespa/log/log.h>
-LOG_SETUP("check_slobrok");
 
 class Slobrok_Checker : public FastOS_Application
 {
@@ -23,9 +25,10 @@ public:
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
-    int Main() override;
+    virtual int Main() override;
 };
 
+
 Slobrok_Checker::~Slobrok_Checker()
 {
     LOG_ASSERT(_supervisor == NULL);
diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp
index a96c4609137..60a3dfc779b 100644
--- a/slobrok/src/apps/sbcmd/sbcmd.cpp
+++ b/slobrok/src/apps/sbcmd/sbcmd.cpp
@@ -1,12 +1,14 @@
 // 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("sb-cmd");
 
 #include <vespa/fnet/frt/frt.h>
-#include <vespa/fastos/app.h>
+
 #include <string>
 #include <sstream>
 
-#include <vespa/log/log.h>
-LOG_SETUP("sb-cmd");
 
 class Slobrok_CMD : public FastOS_Application
 {
@@ -23,15 +25,17 @@ public:
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
-    int Main() override;
+    virtual int Main() override;
 };
 
+
 Slobrok_CMD::~Slobrok_CMD()
 {
     LOG_ASSERT(_supervisor == NULL);
     LOG_ASSERT(_target == NULL);
 }
 
+
 int
 Slobrok_CMD::usage()
 {
diff --git a/slobrok/src/tests/mirrorapi/match_test.cpp b/slobrok/src/tests/mirrorapi/match_test.cpp
index 94900daa202..d9ebcfd6f29 100644
--- a/slobrok/src/tests/mirrorapi/match_test.cpp
+++ b/slobrok/src/tests/mirrorapi/match_test.cpp
@@ -4,11 +4,12 @@
 
 class MatchTester : public slobrok::api::IMirrorAPI
 {
-    SpecList lookup(const std::string &) const override {
+    virtual SpecList lookup(const std::string &) const override {
         return SpecList();
     }
-    uint32_t updates() const override { return 0; }
-    bool ready() const override { return true; }
+    virtual uint32_t updates() const override { return 0; }
+
+    virtual 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 b83392dec5e..1f0db564cae 100644
--- a/slobrok/src/tests/oldapi/mirror.h
+++ b/slobrok/src/tests/oldapi/mirror.h
@@ -1,5 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
+#ifndef Old_MIRROR_H
+#define Old_MIRROR_H
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/util/gencnt.h>
@@ -85,7 +86,10 @@ 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(); }
 
     /**
@@ -106,7 +110,10 @@ 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;
@@ -124,3 +131,5 @@ 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 be5418ff1a8..76b578d4f88 100644
--- a/slobrok/src/tests/startsome/rpc_info.cpp
+++ b/slobrok/src/tests/startsome/rpc_info.cpp
@@ -1,7 +1,8 @@
 // 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 7d3fcef8695..e2f6ae070b3 100644
--- a/slobrok/src/tests/startsome/tstdst.cpp
+++ b/slobrok/src/tests/startsome/tstdst.cpp
@@ -1,11 +1,15 @@
 // 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 <vespa/log/log.h>
-LOG_SETUP("testrpcserver");
+#include <vector>
+#include <string>
+#include <sstream>
 
 class FNET_Transport;
 class FNET_Scheduler;