Use override

13 files changed, 35 insertions, 44 deletions

diff --git a/vdslib/src/vespa/vdslib/container/documentlist.h b/vdslib/src/vespa/vdslib/container/documentlist.h
index e6817619228..5ac2ce21288 100644
--- a/vdslib/src/vespa/vdslib/container/documentlist.h
+++ b/vdslib/src/vespa/vdslib/container/documentlist.h
@@ -22,9 +22,9 @@
 
 #pragma once
 
+#include <vespa/vdslib/defs.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/vdslib/defs.h>
 
 namespace document {
     class DocumentUpdate;
@@ -118,7 +118,7 @@ public:
                     + sizeof(MetaEntry);
         }
 
-        void print(std::ostream& out, bool verbose, const std::string& indent) const;
+        void print(std::ostream& out, bool verbose, const std::string& indent) const override;
         bool operator==(const Entry& e) const { return (_start == e._start && _entry == e._entry); }
     };
 
@@ -184,7 +184,7 @@ public:
     }
 
     void checkConsistency(bool do_memset = false);
-    void print(std::ostream& out, bool verbose, const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
     const document::DocumentTypeRepo::SP & getTypeRepo() const { return _repo; }
 
 protected:
diff --git a/vdslib/src/vespa/vdslib/container/parameters.h b/vdslib/src/vespa/vdslib/container/parameters.h
index 2a551d6ff39..9ed86333e7a 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.h
+++ b/vdslib/src/vespa/vdslib/container/parameters.h
@@ -42,9 +42,9 @@ public:
 private:
     ParametersMap _parameters;
 
-    void onSerialize(document::ByteBuffer& buffer) const;
-    void onDeserialize(const document::DocumentTypeRepo &repo, document::ByteBuffer& buffer);
-    void printXml(document::XmlOutputStream& xos) const;
+    void onSerialize(document::ByteBuffer& buffer) const override;
+    void onDeserialize(const document::DocumentTypeRepo &repo, document::ByteBuffer& buffer) override;
+    void printXml(document::XmlOutputStream& xos) const override;
 
 public:
     Parameters();
@@ -53,9 +53,9 @@ public:
 
     bool operator==(const Parameters &other) const;
 
-    Parameters* clone() const;
+    Parameters* clone() const override;
 
-    size_t getSerializedSize() const;
+    size_t getSerializedSize() const override;
 
     bool hasValue(const KeyT & id)                const { return (_parameters.find(id) != _parameters.end()); }
     unsigned int size()                           const { return _parameters.size(); }
diff --git a/vdslib/src/vespa/vdslib/container/visitorstatistics.h b/vdslib/src/vespa/vdslib/container/visitorstatistics.h
index 5812ea25fde..d668b7fa693 100644
--- a/vdslib/src/vespa/vdslib/container/visitorstatistics.h
+++ b/vdslib/src/vespa/vdslib/container/visitorstatistics.h
@@ -1,8 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <string>
-#include <stdint.h>
 #include <vespa/document/util/printable.h>
 
 namespace vdslib {
@@ -35,7 +33,7 @@ public:
     uint64_t getSecondPassBytesReturned() const { return _secondPassBytesReturned; }
     void setSecondPassBytesReturned(uint32_t bytesReturned) { _secondPassBytesReturned = bytesReturned; }
 
-    void print(std::ostream& out, bool verbose, const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 private:
     uint32_t _bucketsVisited;
     uint64_t _documentsVisited;
diff --git a/vdslib/src/vespa/vdslib/defs.h b/vdslib/src/vespa/vdslib/defs.h
index da4a4589715..91421787e1b 100644
--- a/vdslib/src/vespa/vdslib/defs.h
+++ b/vdslib/src/vespa/vdslib/defs.h
@@ -1,5 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#pragma once
+
+#include <cstdint>
+
 namespace vdslib {
 
 typedef uint64_t Timestamp;
diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
index 0997c9047e1..a75ba591af5 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
@@ -7,7 +7,6 @@
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <boost/lexical_cast.hpp>
 #include <vespa/config/config.h>
-#include <vespa/config/common/misc.h>
 #include <vespa/config/print/asciiconfigwriter.h>
 #include <vespa/config/print/asciiconfigreader.h>
 #include <vespa/vespalib/util/exceptions.h>
diff --git a/vdslib/src/vespa/vdslib/distribution/group.h b/vdslib/src/vespa/vdslib/distribution/group.h
index 8e8740ca739..07ba774931a 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.h
+++ b/vdslib/src/vespa/vdslib/distribution/group.h
@@ -11,17 +11,13 @@
  */
 #pragma once
 
-#include <map>
-#include <vector>
+#include "redundancygroupdistribution.h"
 #include <vespa/vespalib/objects/floatingpointtype.h>
-#include <vespa/vdslib/distribution/redundancygroupdistribution.h>
 #include <vespa/vespalib/util/crc.h>
+#include <map>
+#include <vector>
 
-namespace vespalib {
-
-class asciistream;
-
-}
+namespace vespalib { class asciistream; }
 
 namespace storage {
 namespace lib {
@@ -64,8 +60,7 @@ public:
 
     bool isLeafGroup() const { return _nodes.size() > 0; }
     bool operator==(const Group& other) const;
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     vespalib::Double getCapacity() const { return _capacity; }
     const vespalib::string & getName() const { return _name; }
diff --git a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
index 3b45cc3d612..080e5042440 100644
--- a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
+++ b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
@@ -38,7 +38,7 @@ public:
     bool operator==(const RedundancyGroupDistribution& o) const
         { return (_values == o._values); }
 
-    void print(std::ostream&, bool verbose, const std::string& indent) const;
+    void print(std::ostream&, bool verbose, const std::string& indent) const override;
 
 private:
     uint16_t getFirstAsterixIndex() const;
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h
index 2d0f73413fd..dcea1308b6b 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.h
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
+#include "node.h"
+#include "nodestate.h"
 #include <map>
-#include <vespa/vdslib/state/node.h>
-#include <vespa/vdslib/state/nodestate.h>
 
 namespace storage {
 namespace lib {
@@ -63,8 +63,7 @@ public:
     void setDescription(const vespalib::stringref & s) { _description = s; }
     void setDistributionBitCount(uint16_t count) { _distributionBits = count; }
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     void printStateGroupwise(std::ostream& out,
                              const Distribution&, bool verbose = false,
diff --git a/vdslib/src/vespa/vdslib/state/diskstate.h b/vdslib/src/vespa/vdslib/state/diskstate.h
index 9a6855efedd..9c92f211b73 100644
--- a/vdslib/src/vespa/vdslib/state/diskstate.h
+++ b/vdslib/src/vespa/vdslib/state/diskstate.h
@@ -6,8 +6,8 @@
  */
 #pragma once
 
+#include "state.h"
 #include <vespa/document/util/printable.h>
-#include <vespa/vdslib/state/state.h>
 #include <vespa/vespalib/objects/floatingpointtype.h>
 
 namespace storage {
@@ -38,8 +38,7 @@ public:
     void setCapacity(double capacity);
     void setDescription(const vespalib::stringref & desc) { _description = desc; }
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
     bool operator==(const DiskState& other) const;
     bool operator!=(const DiskState& other) const;
 
diff --git a/vdslib/src/vespa/vdslib/state/node.h b/vdslib/src/vespa/vdslib/state/node.h
index 4b9718162ab..357f39c6694 100644
--- a/vdslib/src/vespa/vdslib/state/node.h
+++ b/vdslib/src/vespa/vdslib/state/node.h
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "nodetype.h"
 #include <vespa/vespalib/util/printable.h>
-#include <vespa/vdslib/state/nodetype.h>
 
 namespace storage {
 namespace lib {
@@ -24,7 +24,7 @@ public:
     const NodeType& getType() const { return *_type; }
     uint16_t getIndex() const { return _index; }
 
-    void print(vespalib::asciistream&, const PrintProperties&) const;
+    void print(vespalib::asciistream&, const PrintProperties&) const override;
 
     bool operator==(const Node& other) const
         { return (other._index == _index && *other._type == *_type); }
diff --git a/vdslib/src/vespa/vdslib/state/nodestate.h b/vdslib/src/vespa/vdslib/state/nodestate.h
index 275e8d5658c..0b5f38ecc92 100644
--- a/vdslib/src/vespa/vdslib/state/nodestate.h
+++ b/vdslib/src/vespa/vdslib/state/nodestate.h
@@ -10,12 +10,10 @@
  */
 #pragma once
 
-#include <string>
-#include <vector>
+#include "diskstate.h"
+#include "state.h"
+#include "random.h"
 #include <vespa/document/bucket/bucketidfactory.h>
-#include <vespa/vdslib/state/diskstate.h>
-#include <vespa/vdslib/state/state.h>
-#include <vespa/vdslib/state/random.h>
 
 namespace storage {
 namespace lib {
@@ -87,8 +85,8 @@ public:
     void setDiskCount(uint16_t count);
     void setDiskState(uint16_t index, const DiskState&);
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose,
+               const std::string& indent) const override;
     bool operator==(const NodeState& other) const;
     bool operator!=(const NodeState& other) const
         { return !(operator==(other)); }
diff --git a/vdslib/src/vespa/vdslib/state/state.h b/vdslib/src/vespa/vdslib/state/state.h
index f42402f687b..27c672f9132 100644
--- a/vdslib/src/vespa/vdslib/state/state.h
+++ b/vdslib/src/vespa/vdslib/state/state.h
@@ -9,9 +9,9 @@
  */
 #pragma once
 
+#include "nodetype.h"
 #include <vespa/vespalib/util/printable.h>
 #include <vespa/vespalib/stllike/string.h>
-#include <vespa/vdslib/state/nodetype.h>
 #include <vector>
 
 namespace storage {
@@ -70,8 +70,7 @@ public:
         return _name;
     }
 
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
+    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
     bool operator==(const State& other) const { return (&other == this); }
     bool operator!=(const State& other) const { return (&other != this); }
 
diff --git a/vdslib/src/vespa/vdslib/thread/taskscheduler.h b/vdslib/src/vespa/vdslib/thread/taskscheduler.h
index 558ebd46c1e..8e75e488c2b 100644
--- a/vdslib/src/vespa/vdslib/thread/taskscheduler.h
+++ b/vdslib/src/vespa/vdslib/thread/taskscheduler.h
@@ -97,8 +97,8 @@ private:
     TaskVector        _currentRunningTasks;
     uint64_t          _taskCounter;
 
-    virtual void run();
-    virtual bool onStop();
+    void run() override;
+    bool onStop() override;
 };
 
 } // vdslib