Use override

3 files changed, 4 insertions, 9 deletions

diff --git a/memfilepersistence/src/tests/testrunner.cpp b/memfilepersistence/src/tests/testrunner.cpp
index 16027870c47..5baa0f60b6e 100644
--- a/memfilepersistence/src/tests/testrunner.cpp
+++ b/memfilepersistence/src/tests/testrunner.cpp
@@ -1,14 +1,12 @@
 // 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, char **argv)
+main(int argc, const char *argv[])
 {
     vdstestlib::CppUnitTestRunner testRunner;
     return testRunner.run(argc, argv);
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h b/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h
index 23e4857fdb3..cc2145444a5 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/common/filespecification.h
@@ -37,8 +37,7 @@ public:
     const String& getPath() const { return _path; }
     FileVersion getWantedFileVersion() const { return _wantedVersion; }
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const override;
+     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     bool operator==(const FileSpecification& o) const {
         return (_bucketId == o._bucketId && _dir == o._dir
@@ -48,4 +47,3 @@ public:
 
 } // storage
 } // memfile
-
diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp
index b483d4691c4..b0fa6cf6667 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp
@@ -26,8 +26,7 @@ namespace {
     }
 
     struct RealStatter : public PartitionMonitor::Statter {
-        virtual void statFileSystem(const std::string& file, struct statvfs& info) override
-        {
+        void statFileSystem(const std::string& file, struct statvfs& info) override {
             if (statvfs(file.c_str(), &info) != 0) {
                 vespalib::asciistream ost;
                 ost << "Failed to run statvfs to find data on disk containing "