Revert "Balder/enforce override 2"

2 files changed, 13 insertions, 11 deletions

diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
index ed59b49ff04..bc71429032e 100644
--- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
+++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
@@ -1,5 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/document/base/testdocman.h>
+#include <vespa/document/document.h>
+#include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/update/fieldpathupdates.h>
+#include <iomanip>
+#include <sstream>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
@@ -10,16 +16,10 @@
 #include <vespa/storageapi/mbusprot/storageprotocol.h>
 #include <vespa/storageapi/mbusprot/storagecommand.h>
 #include <vespa/storageapi/mbusprot/storagereply.h>
-#include <vespa/storageapi/message/visitor.h>
-#include <vespa/document/base/testdocman.h>
-#include <vespa/document/document.h>
-#include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/document/update/fieldpathupdates.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/util/growablebytebuffer.h>
+#include <vespa/storageapi/message/visitor.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <iomanip>
-#include <sstream>
 
 using std::shared_ptr;
 using document::ByteBuffer;
@@ -837,7 +837,8 @@ namespace {
 
         api::StorageReply::UP makeReply() override;
 
-        void print(std::ostream& out, bool verbose, const std::string& indent) const override {
+        virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override
+        {
             out << "MyCommand()";
             if (verbose) {
                 out << " : ";
@@ -849,7 +850,8 @@ namespace {
     struct MyReply : public api::InternalReply {
         MyReply(const MyCommand& cmd) : InternalReply(102, cmd) {}
 
-        void print(std::ostream& out, bool verbose, const std::string& indent) const override {
+        virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override
+        {
             out << "MyReply()";
             if (verbose) {
                 out << " : ";
diff --git a/storageapi/src/tests/testrunner.cpp b/storageapi/src/tests/testrunner.cpp
index 05fb3184c04..9a07796a3f4 100644
--- a/storageapi/src/tests/testrunner.cpp
+++ b/storageapi/src/tests/testrunner.cpp
@@ -1,12 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/log/log.h>
 #include <vespa/vdstestlib/cppunit/cppunittestrunner.h>
 
-#include <vespa/log/log.h>
 LOG_SETUP("storageapicppunittestrunner");
 
 int
-main(int argc, const char *argv[])
+main(int argc, char **argv)
 {
     vdstestlib::CppUnitTestRunner testRunner;
     return testRunner.run(argc, argv);