Revert "Balder/enforce override 2"

10 files changed, 58 insertions, 19 deletions

diff --git a/memfilepersistence/src/tests/device/devicemanagertest.cpp b/memfilepersistence/src/tests/device/devicemanagertest.cpp
index f5e16032361..15882663383 100644
--- a/memfilepersistence/src/tests/device/devicemanagertest.cpp
+++ b/memfilepersistence/src/tests/device/devicemanagertest.cpp
@@ -1,8 +1,10 @@
 // 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/memfilepersistence/device/devicemanager.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/util/exception.h>
+#include <sys/errno.h>
 #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>
 
 namespace storage {
@@ -68,17 +70,19 @@ namespace {
         std::ostringstream ost;
 
         Listener() : ost() { ost << "\n"; }
-        ~Listener() {}
+        virtual ~Listener() {}
 
-        void handleDirectoryEvent(Directory& dir, const IOEvent& e) override {
+        virtual void handleDirectoryEvent(Directory& dir, const IOEvent& e) override {
             ost << "Dir " << dir.getPath() << ": " << e.toString(true) << "\n";
         }
-        void handlePartitionEvent(Partition& part, const IOEvent& e) override {
-            ost << "Partition " << part.getMountPoint() << ": " << e.toString(true) << "\n";
+        virtual void handlePartitionEvent(Partition& part, const IOEvent& e) override {
+            ost << "Partition " << part.getMountPoint() << ": "
+                << e.toString(true) << "\n";
         }
-        void handleDiskEvent(Disk& disk, const IOEvent& e) override {
+        virtual void handleDiskEvent(Disk& disk, const IOEvent& e) override {
             ost << "Disk " << disk.getId() << ": " << e.toString(true) << "\n";
         }
+
     };
 
 }
diff --git a/memfilepersistence/src/tests/device/partitionmonitortest.cpp b/memfilepersistence/src/tests/device/partitionmonitortest.cpp
index d1f40e07320..44f3752d840 100644
--- a/memfilepersistence/src/tests/device/partitionmonitortest.cpp
+++ b/memfilepersistence/src/tests/device/partitionmonitortest.cpp
@@ -1,5 +1,6 @@
 // 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/memfilepersistence/device/partitionmonitor.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
@@ -55,7 +56,7 @@ struct FakeStatter : public PartitionMonitor::Statter {
         _info.f_bfree -= (size / _info.f_bsize);
     }
 
-    void statFileSystem(const std::string&, struct statvfs& info) override {
+    virtual void statFileSystem(const std::string&, struct statvfs& info) override {
         info = _info;
     }
 };
diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
index 4372a8a45a7..673a72068b7 100644
--- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
@@ -1,9 +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 <set>
+#include <vector>
+#include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h>
 #include <tests/spi/memfiletestutils.h>
 #include <tests/spi/simulatedfailurefile.h>
 #include <tests/spi/options_builder.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/select/parser.h>
 
 namespace storage {
diff --git a/memfilepersistence/src/tests/spi/memcachetest.cpp b/memfilepersistence/src/tests/spi/memcachetest.cpp
index 7eece580b0a..07697b79cac 100644
--- a/memfilepersistence/src/tests/spi/memcachetest.cpp
+++ b/memfilepersistence/src/tests/spi/memcachetest.cpp
@@ -1,8 +1,10 @@
 // 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/memfilepersistence/memfile/memfilecache.h>
 #include <vespa/storageframework/defaultimplementation/memory/simplememorylogic.h>
 #include <tests/spi/memfiletestutils.h>
+#include <vespa/vdstestlib/cppunit/macros.h>
 
 
 namespace storage {
diff --git a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
index 265054a02ba..eefe962979d 100644
--- a/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
+++ b/memfilepersistence/src/tests/spi/memfileautorepairtest.cpp
@@ -1,9 +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/memfilepersistence/mapper/memfilemapper.h>
 #include <vespa/memfilepersistence/mapper/memfile_v1_serializer.h>
 #include <vespa/memfilepersistence/mapper/memfile_v1_verifier.h>
+#include <vespa/memfilepersistence/mapper/fileinfo.h>
+#include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h>
 #include <tests/spi/memfiletestutils.h>
+#include <vespa/vdstestlib/cppunit/macros.h>
 
 namespace storage {
 namespace memfile {
diff --git a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
index f612bec1189..ad20a28ed0c 100644
--- a/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
+++ b/memfilepersistence/src/tests/spi/memfilev1serializertest.cpp
@@ -1,8 +1,11 @@
 // 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/memfilepersistence/mapper/memfilemapper.h>
 #include <vespa/memfilepersistence/mapper/memfile_v1_serializer.h>
+#include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h>
 #include <tests/spi/memfiletestutils.h>
+#include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/memfilepersistence/mapper/locationreadplanner.h>
 #include <tests/spi/simulatedfailurefile.h>
 #include <tests/spi/options_builder.h>
@@ -226,16 +229,23 @@ struct DummyMemFileIOInterface : MemFileIOInterface {
     void clear(DocumentPart) override {}
     bool verifyConsistent() const override { return true; }
     void move(const FileSpecification&) override {}
-    DataLocation copyCache(const MemFileIOInterface&, DocumentPart, DataLocation) override {
+    DataLocation copyCache(const MemFileIOInterface&,
+                           DocumentPart,
+                           DataLocation) override
+    {
         return DataLocation();
     }
 
-    void close() override {};
+    void close() override {}
     bool isCached(DataLocation, DocumentPart) const override { return false; }
     bool isPersisted(DataLocation, DocumentPart) const override { return false; }
-    uint32_t getSerializedSize(DocumentPart, DataLocation) const override { return 0; }
+    uint32_t getSerializedSize(DocumentPart,
+                               DataLocation) const override { return 0; }
 
-    void ensureCached(Environment&, DocumentPart, const std::vector<DataLocation>&) override {}
+    void ensureCached(Environment&,
+                      DocumentPart,
+                      const std::vector<DataLocation>&) override
+    {}
 
     size_t getCachedSize(DocumentPart) const override { return 0; }
 };
diff --git a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
index 632bded6c6c..51951e22aea 100644
--- a/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
+++ b/memfilepersistence/src/tests/spi/memfilev1verifiertest.cpp
@@ -1,9 +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/memfilepersistence/mapper/memfilemapper.h>
 #include <vespa/memfilepersistence/mapper/memfile_v1_serializer.h>
 #include <vespa/memfilepersistence/mapper/memfile_v1_verifier.h>
+#include <vespa/memfilepersistence/mapper/fileinfo.h>
+#include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h>
 #include <tests/spi/memfiletestutils.h>
+#include <vespa/vdstestlib/cppunit/macros.h>
+#include <tests/spi/simulatedfailurefile.h>
 
 namespace storage {
 namespace memfile {
diff --git a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
index cb1bc057705..ffe7972552f 100644
--- a/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
+++ b/memfilepersistence/src/tests/spi/simplememfileiobuffertest.cpp
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h>
+#include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/spi/memfiletestutils.h>
 #include <tests/spi/options_builder.h>
 
@@ -50,15 +51,19 @@ class SimpleMemFileIOBufferTest : public SingleDiskMemFileTestUtils
 public:
     class DummyFileReader : public VersionSerializer {
     public:
-        FileVersion getFileVersion() override { return FileVersion(); }
-        void loadFile(MemFile&, Environment&, Buffer&, uint64_t ) override {}
-        FlushResult flushUpdatesToFile(MemFile&, Environment&) override {
+        virtual FileVersion getFileVersion() override { return FileVersion(); }
+        virtual void loadFile(MemFile&, Environment&, Buffer&, uint64_t ) override {}
+        virtual FlushResult flushUpdatesToFile(MemFile&, Environment&) override {
             return FlushResult::TooSmall;
         }
-        void rewriteFile(MemFile&, Environment&) override {}
-        bool verify(MemFile&, Environment&, std::ostream&, bool, uint16_t) override { return false; };
-        void cacheLocations(MemFileIOInterface&, Environment&, const Options&,
-                            DocumentPart, const std::vector<DataLocation>&) override {}
+        virtual void rewriteFile(MemFile&, Environment&) override {}
+        virtual bool verify(MemFile&, Environment&,
+                            std::ostream&, bool, uint16_t) override { return false; };
+        virtual void cacheLocations(MemFileIOInterface&,
+                                    Environment&,
+                                    const Options&,
+                                    DocumentPart,
+                                    const std::vector<DataLocation>&) override {}
     };
 
     DummyFileReader dfr;
diff --git a/memfilepersistence/src/tests/testrunner.cpp b/memfilepersistence/src/tests/testrunner.cpp
index 5baa0f60b6e..16027870c47 100644
--- a/memfilepersistence/src/tests/testrunner.cpp
+++ b/memfilepersistence/src/tests/testrunner.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 <iostream>
+#include <vespa/log/log.h>
 #include <vespa/vdstestlib/cppunit/cppunittestrunner.h>
 
-#include <vespa/log/log.h>
 LOG_SETUP("persistencecppunittests");
 
 int
-main(int argc, const char *argv[])
+main(int argc, char **argv)
 {
     vdstestlib::CppUnitTestRunner testRunner;
     return testRunner.run(argc, argv);
diff --git a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp
index 5de40311b2f..0f36f0a0571 100644
--- a/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp
+++ b/memfilepersistence/src/tests/tools/vdsdisktooltest.cpp
@@ -1,5 +1,6 @@
 // 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/config/subscription/configuri.h>
 #include <vespa/memfilepersistence/tools/vdsdisktool.h>
 #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>