Revert "Balder/enforce override 2"

2 files changed, 8 insertions, 6 deletions

diff --git a/vbench/src/apps/dumpurl/dumpurl.cpp b/vbench/src/apps/dumpurl/dumpurl.cpp
index 44ebc1d2ac2..706dd061763 100644
--- a/vbench/src/apps/dumpurl/dumpurl.cpp
+++ b/vbench/src/apps/dumpurl/dumpurl.cpp
@@ -1,9 +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 <vbench/http/http_result_handler.h>
 #include <vbench/http/server_spec.h>
 #include <vbench/http/http_client.h>
-#include <vespa/fastos/app.h>
 
 using namespace vbench;
 
@@ -14,14 +13,14 @@ public:
 };
 
 struct MyHttpHandler : public HttpResultHandler {
-    void handleHeader(const string &name, const string &value) override {
+    virtual void handleHeader(const string &name, const string &value) override {
         fprintf(stderr, "got header: '%s': '%s'\n", name.c_str(), value.c_str());
     }
-    void handleContent(const Memory &data) override {
+    virtual void handleContent(const Memory &data) override {
         fprintf(stderr, "got data: %zu bytes\n", data.size);
         fwrite(data.data, 1, data.size, stdout);
     }
-    void handleFailure(const string &reason) override {
+    virtual void handleFailure(const string &reason) override {
         fprintf(stderr, "got FAILURE: '%s'\n", reason.c_str());
     }
 };
diff --git a/vbench/src/apps/vbench/vbench.cpp b/vbench/src/apps/vbench/vbench.cpp
index fa6bc91e035..32af3d70c3d 100644
--- a/vbench/src/apps/vbench/vbench.cpp
+++ b/vbench/src/apps/vbench/vbench.cpp
@@ -1,10 +1,13 @@
 // 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/vespalib/util/signalhandler.h>
 #include <vespa/vespalib/util/programoptions.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vespalib/util/thread.h>
 #include <vespa/vespalib/util/runnable_pair.h>
 #include <vbench/vbench/vbench.h>
+#include <vespa/vespalib/data/slime/slime.h>
+#include <string>
 #include <iostream>
 
 using namespace vbench;
@@ -14,7 +17,7 @@ typedef vespalib::SignalHandler SIG;
 struct NotifyDone : public vespalib::Runnable {
     vespalib::Gate &done;
     NotifyDone(vespalib::Gate &d) : done(d) {}
-    void run() override {
+    virtual void run() override {
         done.countDown();
     }
 };