add override in staging_vespalib module

25 files changed, 71 insertions, 69 deletions

diff --git a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp b/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
index bb23c7183b2..ce21c918219 100644
--- a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
+++ b/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
@@ -16,7 +16,7 @@ public:
 private:
     void benchmarkTree(size_t count);
     void benchmarkTreeInArray(size_t count);
-    int Main();
+    int Main() override;
 };
 
 template <typename T>
diff --git a/staging_vespalib/src/tests/array/allocinarray_test.cpp b/staging_vespalib/src/tests/array/allocinarray_test.cpp
index de6e5792b35..059fff91cec 100644
--- a/staging_vespalib/src/tests/array/allocinarray_test.cpp
+++ b/staging_vespalib/src/tests/array/allocinarray_test.cpp
@@ -14,7 +14,7 @@ using namespace vespalib;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
 private:
     template <typename T, typename V>
     void testAllocInArray();
diff --git a/staging_vespalib/src/tests/array/sort_benchmark.cpp b/staging_vespalib/src/tests/array/sort_benchmark.cpp
index 525eb4d3427..9e2b286e864 100644
--- a/staging_vespalib/src/tests/array/sort_benchmark.cpp
+++ b/staging_vespalib/src/tests/array/sort_benchmark.cpp
@@ -18,7 +18,7 @@ private:
     void sortDirect(size_t count);
     template<typename T>
     void sortInDirect(size_t count);
-    int Main();
+    int Main() override;
 };
 
 template<size_t N>
diff --git a/staging_vespalib/src/tests/benchmark/testbase.h b/staging_vespalib/src/tests/benchmark/testbase.h
index 45b0e30019e..02f11e21cac 100644
--- a/staging_vespalib/src/tests/benchmark/testbase.h
+++ b/staging_vespalib/src/tests/benchmark/testbase.h
@@ -45,7 +45,7 @@ public:
 private:
     typedef std::vector<int> Vector;
     size_t callByReference(const Vector & values) const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ParamByValueVectorInt : public Benchmark
@@ -55,7 +55,7 @@ public:
 private:
     typedef std::vector<int> Vector;
     size_t callByValue(Vector values) const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ParamByReferenceVectorString : public Benchmark
@@ -65,7 +65,7 @@ public:
 private:
     typedef std::vector<std::string> Vector;
     size_t callByReference(const Vector & values) const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ParamByValueVectorString : public Benchmark
@@ -75,7 +75,7 @@ public:
 private:
     typedef std::vector<std::string> Vector;
     size_t callByValue(Vector values) const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ReturnByReferenceVectorString : public Benchmark
@@ -85,7 +85,7 @@ public:
 private:
     typedef std::vector<std::string> Vector;
     const Vector & returnByReference(Vector & values) const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ReturnByValueVectorString : public Benchmark
@@ -95,7 +95,7 @@ public:
 private:
     typedef std::vector<std::string> Vector;
     Vector returnByValue() const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ReturnByValueMultiVectorString : public Benchmark
@@ -105,7 +105,7 @@ public:
 private:
     typedef std::vector<std::string> Vector;
     Vector returnByValue() const __attribute__((noinline));
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class CreateVespalibString : public Benchmark
@@ -113,7 +113,7 @@ class CreateVespalibString : public Benchmark
 public:
     DECLARE_BENCHMARK(CreateVespalibString);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockSystem : public Benchmark
@@ -121,7 +121,7 @@ class ClockSystem : public Benchmark
 public:
     DECLARE_BENCHMARK(ClockSystem);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockREALTIME : public Benchmark
@@ -129,7 +129,7 @@ class ClockREALTIME : public Benchmark
 public:
     DECLARE_BENCHMARK(ClockREALTIME);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockMONOTONIC : public Benchmark
@@ -137,7 +137,7 @@ class ClockMONOTONIC : public Benchmark
 public:
     DECLARE_BENCHMARK(ClockMONOTONIC);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockMONOTONIC_RAW : public Benchmark
@@ -146,7 +146,7 @@ public:
     DECLARE_BENCHMARK(ClockMONOTONIC_RAW);
     ClockMONOTONIC_RAW();
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockPROCESS_CPUTIME_ID : public Benchmark
@@ -154,7 +154,7 @@ class ClockPROCESS_CPUTIME_ID : public Benchmark
 public:
     DECLARE_BENCHMARK(ClockPROCESS_CPUTIME_ID);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 class ClockTHREAD_CPUTIME_ID : public Benchmark
@@ -162,7 +162,7 @@ class ClockTHREAD_CPUTIME_ID : public Benchmark
 public:
     DECLARE_BENCHMARK(ClockTHREAD_CPUTIME_ID);
 private:
-    virtual size_t onRun();
+    virtual size_t onRun() override;
 };
 
 }
diff --git a/staging_vespalib/src/tests/bits/bits_test.cpp b/staging_vespalib/src/tests/bits/bits_test.cpp
index 83e60f0f214..f7b3ef1bf84 100644
--- a/staging_vespalib/src/tests/bits/bits_test.cpp
+++ b/staging_vespalib/src/tests/bits/bits_test.cpp
@@ -11,7 +11,7 @@ using namespace vespalib;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
     template <typename T>
     void testFixed(const T * v, size_t sz);
     void testBuffer();
diff --git a/staging_vespalib/src/tests/clock/clock_test.cpp b/staging_vespalib/src/tests/clock/clock_test.cpp
index f7f15dd3d24..025d8766a29 100644
--- a/staging_vespalib/src/tests/clock/clock_test.cpp
+++ b/staging_vespalib/src/tests/clock/clock_test.cpp
@@ -11,7 +11,7 @@ using fastos::TimeStamp;
 class Test : public vespalib::TestApp
 {
 public:
-    int Main();
+    int Main() override;
 };
 
 
diff --git a/staging_vespalib/src/tests/crc/crc_test.cpp b/staging_vespalib/src/tests/crc/crc_test.cpp
index 6c028cc09ce..6a5a0779d8b 100644
--- a/staging_vespalib/src/tests/crc/crc_test.cpp
+++ b/staging_vespalib/src/tests/crc/crc_test.cpp
@@ -12,7 +12,7 @@ using namespace vespalib;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
     void testCorrectNess();
     void testBenchmark(bool our, size_t bufSz, size_t numRep);
 };
diff --git a/staging_vespalib/src/tests/databuffer/databuffer_test.cpp b/staging_vespalib/src/tests/databuffer/databuffer_test.cpp
index 3793af27aa7..7ec83e58b5c 100644
--- a/staging_vespalib/src/tests/databuffer/databuffer_test.cpp
+++ b/staging_vespalib/src/tests/databuffer/databuffer_test.cpp
@@ -13,7 +13,7 @@ class Test : public vespalib::TestApp {
 private:
     void testBasic();
 public:
-    int Main() {
+    int Main() override {
         TEST_INIT("databuffer_test");
 
         testBasic();           TEST_FLUSH();
diff --git a/staging_vespalib/src/tests/fileheader/fileheader_test.cpp b/staging_vespalib/src/tests/fileheader/fileheader_test.cpp
index 2d47739100c..f2a6c8402ee 100644
--- a/staging_vespalib/src/tests/fileheader/fileheader_test.cpp
+++ b/staging_vespalib/src/tests/fileheader/fileheader_test.cpp
@@ -40,7 +40,7 @@ private:
                       bool mapped);
 
 public:
-    int Main() {
+    int Main() override {
         TEST_INIT("fileheader_test");
 
         testTag();           TEST_FLUSH();
diff --git a/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp b/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp
index 41eed2f7dc9..98b6804ac8e 100644
--- a/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp
+++ b/staging_vespalib/src/tests/floatingpointtype/floatingpointtypetest.cpp
@@ -9,7 +9,7 @@ class Test : public vespalib::TestApp
 {
 public:
     void testFloatingPoint();
-    int Main();
+    int Main() override;
 };
 
 void
diff --git a/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp b/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp
index 121f8d2e011..aaf3f383c33 100644
--- a/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp
+++ b/staging_vespalib/src/tests/growablebytebuffer/growablebytebuffer_test.cpp
@@ -11,7 +11,7 @@ class Test : public TestApp
 {
 public:
     void testGrowing();
-    int Main();
+    int Main() override;
 };
 
 void
diff --git a/staging_vespalib/src/tests/json/json.cpp b/staging_vespalib/src/tests/json/json.cpp
index b01406d8a10..a64bb421fb9 100644
--- a/staging_vespalib/src/tests/json/json.cpp
+++ b/staging_vespalib/src/tests/json/json.cpp
@@ -19,7 +19,7 @@ private:
     void testJsonStreamStateReporting();
 
 public:
-    int Main();
+    int Main() override;
 };
 
 void
diff --git a/staging_vespalib/src/tests/librarypool/librarypool_test.cpp b/staging_vespalib/src/tests/librarypool/librarypool_test.cpp
index 5808d1c91e5..665dbca8a86 100644
--- a/staging_vespalib/src/tests/librarypool/librarypool_test.cpp
+++ b/staging_vespalib/src/tests/librarypool/librarypool_test.cpp
@@ -11,7 +11,7 @@ using namespace vespalib;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
 };
 
 int
diff --git a/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp b/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp
index 34bf061bb32..5430e8c1465 100644
--- a/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp
+++ b/staging_vespalib/src/tests/memorydatastore/memorydatastore.cpp
@@ -15,7 +15,7 @@ private:
     void testMemoryDataStore();
     void testVariableSizeVector();
 public:
-    int Main();
+    int Main() override;
 };
 
 void
diff --git a/staging_vespalib/src/tests/objectdump/objectdump.cpp b/staging_vespalib/src/tests/objectdump/objectdump.cpp
index 1488397911e..671e89b5011 100644
--- a/staging_vespalib/src/tests/objectdump/objectdump.cpp
+++ b/staging_vespalib/src/tests/objectdump/objectdump.cpp
@@ -22,7 +22,7 @@ IMPLEMENT_IDENTIFIABLE(Base, vespalib::Identifiable);
 struct Baz : public Base
 {
     DECLARE_IDENTIFIABLE(Baz);
-    virtual Baz *clone() const { return new Baz(*this); }
+    virtual Baz *clone() const override { return new Baz(*this); }
 };
 IMPLEMENT_IDENTIFIABLE(Baz, Base);
 
@@ -45,9 +45,9 @@ struct Bar : public Base
             _int32(-4), _uint32(4), _int64(-8), _uint64(8),
             _float(2.5), _double(2.75), _string("bla bla") {}
 
-    virtual Bar *clone() const { return new Bar(*this); }
+    virtual Bar *clone() const override { return new Bar(*this); }
 
-    virtual void visitMembers(ObjectVisitor &v) const {
+    virtual void visitMembers(ObjectVisitor &v) const override {
         visit(v, "_bool", _bool);
         visit(v, "_int8", _int8);
         visit(v, "_uint8", _uint8);
diff --git a/staging_vespalib/src/tests/objects/identifiable_test.cpp b/staging_vespalib/src/tests/objects/identifiable_test.cpp
index ca6f40542aa..c60f33b9b55 100644
--- a/staging_vespalib/src/tests/objects/identifiable_test.cpp
+++ b/staging_vespalib/src/tests/objects/identifiable_test.cpp
@@ -19,7 +19,7 @@ class IdentifiableTest : public TestApp {
     template <typename T>
     void testSerializer(const T & a);
 public:
-    int Main();
+    int Main() override;
 };
 
 #define CID_Abstract  0x700000
@@ -40,7 +40,7 @@ class A : public Abstract
 public:
     DECLARE_IDENTIFIABLE(A);
     A() { }
-    virtual void someAbstractVirtualMethod() { };
+    virtual void someAbstractVirtualMethod() override { }
 };
 
 class B : public A
diff --git a/staging_vespalib/src/tests/objectselection/objectselection.cpp b/staging_vespalib/src/tests/objectselection/objectselection.cpp
index 5b51ea5ae59..27ecb068231 100644
--- a/staging_vespalib/src/tests/objectselection/objectselection.cpp
+++ b/staging_vespalib/src/tests/objectselection/objectselection.cpp
@@ -17,7 +17,7 @@ struct Foo : public Identifiable
 
     DECLARE_IDENTIFIABLE(Foo);
     virtual Foo *clone() const { return new Foo(*this); }
-    virtual void selectMembers(const ObjectPredicate &p, ObjectOperation &o) {
+    virtual void selectMembers(const ObjectPredicate &p, ObjectOperation &o) override {
         for (uint32_t i = 0; i < nodes.size(); ++i) {
             nodes[i]->select(p, o);
         }
@@ -32,7 +32,7 @@ struct Bar : public Foo
     DECLARE_IDENTIFIABLE(Bar);
     Bar() : value(0) {}
     Bar(int v) { value = v; }
-    virtual Bar *clone() const { return new Bar(*this); }
+    virtual Bar *clone() const override { return new Bar(*this); }
 };
 IMPLEMENT_IDENTIFIABLE(Bar, Identifiable);
 
@@ -40,7 +40,7 @@ struct ObjectType : public ObjectPredicate
 {
     uint32_t cid;
     ObjectType(uint32_t id) : cid(id) {}
-    virtual bool check(const Identifiable &obj) const {
+    virtual bool check(const Identifiable &obj) const override {
         return (obj.getClass().id() == cid);
     }
 };
@@ -48,7 +48,7 @@ struct ObjectType : public ObjectPredicate
 struct ObjectCollect : public ObjectOperation
 {
     std::vector<Identifiable*> nodes;
-    virtual void execute(Identifiable &obj) {
+    virtual void execute(Identifiable &obj) override {
         nodes.push_back(&obj);
     }
 };
diff --git a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp b/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp
index 9d549d3cc34..affb7287674 100644
--- a/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp
+++ b/staging_vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp
@@ -111,8 +111,8 @@ TEST("require that primitive arrays conforms") {
 class Factory : public ComplexArrayT<A>::Factory
 {
 public:
-    A * create() { return new Complex(); }
-    virtual Factory * clone() const { return new Factory(*this); }
+    A * create() override { return new Complex(); }
+    virtual Factory * clone() const override { return new Factory(*this); }
 };
 
 TEST("require that complex arrays conforms") {
diff --git a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp b/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
index cabff89f9bb..881954bfa3f 100644
--- a/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
+++ b/staging_vespalib/src/tests/programoptions/programoptions_test.cpp
@@ -21,7 +21,7 @@ public:
     void testVectorArgument();
     void testAllHiddenOption();
     void testOptionsAfterArguments();
-    int Main();
+    int Main() override;
 };
 
 int
diff --git a/staging_vespalib/src/tests/rusage/rusage_test.cpp b/staging_vespalib/src/tests/rusage/rusage_test.cpp
index 3da7f1d0b54..0367ab8c374 100644
--- a/staging_vespalib/src/tests/rusage/rusage_test.cpp
+++ b/staging_vespalib/src/tests/rusage/rusage_test.cpp
@@ -11,7 +11,7 @@ using namespace vespalib;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
     void testRUsage();
 };
 
diff --git a/staging_vespalib/src/tests/state_server/state_server_test.cpp b/staging_vespalib/src/tests/state_server/state_server_test.cpp
index a5df5778368..f572dbcd8e1 100644
--- a/staging_vespalib/src/tests/state_server/state_server_test.cpp
+++ b/staging_vespalib/src/tests/state_server/state_server_test.cpp
@@ -54,7 +54,8 @@ struct DummyHandler : JsonGetHandler {
     DummyHandler(const vespalib::string &result_in) : result(result_in) {}
     virtual vespalib::string get(const vespalib::string &,
                                  const vespalib::string &,
-                                 const std::map<vespalib::string,vespalib::string> &) const
+                                 const std::map<vespalib::string,vespalib::string> &)
+        const override
     {
         return result;
     }
@@ -114,7 +115,8 @@ TEST_FFFF("require that handler is selected based on longest matching url prefix
 struct EchoHost : JsonGetHandler {
     virtual vespalib::string get(const vespalib::string &host,
                                  const vespalib::string &,
-                                 const std::map<vespalib::string,vespalib::string> &) const
+                                 const std::map<vespalib::string,vespalib::string> &)
+        const override
     {
         return "[\"" + host + "\"]";
     }
@@ -314,10 +316,10 @@ TEST_FFFFF("require that custom handlers can be added to the state server",
 }
 
 struct EchoConsumer : MetricsProducer {
-    virtual vespalib::string getMetrics(const vespalib::string &consumer) {
+    virtual vespalib::string getMetrics(const vespalib::string &consumer) override {
         return "[\"" + consumer + "\"]";
     }
-    virtual vespalib::string getTotalMetrics(const vespalib::string &consumer) {
+    virtual vespalib::string getTotalMetrics(const vespalib::string &consumer) override {
         return "[\"" + consumer + "\"]";        
     }
 };
diff --git a/staging_vespalib/src/tests/stllike/cache_test.cpp b/staging_vespalib/src/tests/stllike/cache_test.cpp
index 892c9bc81c7..2a070fa8ab2 100644
--- a/staging_vespalib/src/tests/stllike/cache_test.cpp
+++ b/staging_vespalib/src/tests/stllike/cache_test.cpp
@@ -31,7 +31,7 @@ public:
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
 private:
     typedef LruParam<uint32_t, string> P;
     typedef Map<uint32_t, string> B;
diff --git a/staging_vespalib/src/tests/timer/timer_test.cpp b/staging_vespalib/src/tests/timer/timer_test.cpp
index de2f081f48a..ad782f4089f 100644
--- a/staging_vespalib/src/tests/timer/timer_test.cpp
+++ b/staging_vespalib/src/tests/timer/timer_test.cpp
@@ -13,7 +13,7 @@ typedef Executor::Task Task;
 class Test : public TestApp
 {
 public:
-    int Main();
+    int Main() override;
     void testScheduling();
     void testReset();
 };
@@ -23,7 +23,7 @@ private:
     vespalib::CountDownLatch &_latch;
 public:
     TestTask(vespalib::CountDownLatch & latch) : _latch(latch) { }
-    void run() { _latch.countDown(); }
+    void run() override { _latch.countDown(); }
 };
 
 int
diff --git a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp
index a44802735eb..1035c021f68 100644
--- a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp
+++ b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp
@@ -15,7 +15,7 @@ public:
     void testNesting();
     void testIndent();
 
-    int Main();
+    int Main() override;
 };
 
 int
@@ -93,7 +93,7 @@ namespace {
 
         LookAndFeel() {}
 
-        void printXml(XmlOutputStream& out) const {
+        void printXml(XmlOutputStream& out) const override {
             using namespace vespalib::xml;
             out << XmlAttribute("color", "blue")
                 << XmlTag("other")
diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.h b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
index d809a44e26f..58d1d133d04 100644
--- a/staging_vespalib/src/vespa/vespalib/util/programoptions.h
+++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
@@ -237,9 +237,9 @@ struct ProgramOptions::OptionParser {
 
 struct ProgramOptions::OptionHeader : public OptionParser {
     OptionHeader(const std::string& desc) : OptionParser("", 0, desc) {}
-    virtual void set(const std::vector<std::string>&) {}
-    virtual void setDefault() {}
-    virtual bool isHeader() const { return true; }
+    virtual void set(const std::vector<std::string>&) override {}
+    virtual void setDefault() override {}
+    virtual bool isHeader() const override { return true; }
 };
 
 template<typename Number>
@@ -265,11 +265,11 @@ struct ProgramOptions::NumberOptionParser : public OptionParser {
     {
     }
 
-    virtual void set(const std::vector<std::string>& arguments);
+    virtual void set(const std::vector<std::string>& arguments) override;
 
-    virtual void setDefault() { _number = _defaultValue; }
+    virtual void setDefault() override { _number = _defaultValue; }
 
-    virtual std::string getArgType(uint32_t /* index */) const
+    virtual std::string getArgType(uint32_t /* index */) const override
         { return getTypeName<Number>(); }
 
 };
@@ -281,9 +281,9 @@ struct ProgramOptions::BoolOptionParser : public OptionParser {
     BoolOptionParser(const std::string& nameList, bool& value,
                      const std::string& description);
 
-    virtual void set(const std::vector<std::string>&) { _value = true; }
+    virtual void set(const std::vector<std::string>&) override { _value = true; }
 
-    virtual void setDefault() { _value = false; }
+    virtual void setDefault() override { _value = false; }
 };
 
 struct ProgramOptions::FlagOptionParser : public OptionParser {
@@ -295,9 +295,9 @@ struct ProgramOptions::FlagOptionParser : public OptionParser {
     FlagOptionParser(const std::string& nameList, bool& value,
                      const bool& unsetValue, const std::string& description);
 
-    virtual void set(const std::vector<std::string>&) { _value = !_unsetValue; }
+    virtual void set(const std::vector<std::string>&) override { _value = !_unsetValue; }
 
-    virtual void setDefault() { _value = _unsetValue; }
+    virtual void setDefault() override { _value = _unsetValue; }
 };
 
 struct ProgramOptions::StringOptionParser : public OptionParser {
@@ -310,12 +310,12 @@ struct ProgramOptions::StringOptionParser : public OptionParser {
     StringOptionParser(const std::string& nameList, std::string& value,
                        const std::string& defVal, const std::string& desc);
 
-    virtual void set(const std::vector<std::string>& arguments)
+    virtual void set(const std::vector<std::string>& arguments) override
         { _value = arguments[0]; }
 
-    virtual void setDefault() { _value = _defaultValue; }
+    virtual void setDefault() override { _value = _defaultValue; }
 
-    virtual std::string getArgType(uint32_t /* index */) const
+    virtual std::string getArgType(uint32_t /* index */) const override
         { return "string"; }
 };
 
@@ -327,14 +327,14 @@ struct ProgramOptions::MapOptionParser : public OptionParser {
                     std::map<std::string, std::string>& value,
                     const std::string& description);
 
-    virtual void set(const std::vector<std::string>& arguments)
+    virtual void set(const std::vector<std::string>& arguments) override
         { _value[arguments[0]] = arguments[1]; }
 
-    virtual std::string getArgType(uint32_t /* index */) const
+    virtual std::string getArgType(uint32_t /* index */) const override
         { return "string"; }
 
         // Default of map is just an empty map.
-    virtual void setDefault() { _value.clear(); }
+    virtual void setDefault() override { _value.clear(); }
 };
 
 template<typename T>
@@ -357,8 +357,8 @@ struct ProgramOptions::ListOptionParser : public OptionParser {
         _entryParser = std::move(entryParser);
     }
 
-    virtual bool isRequired() const { return false; }
-    virtual void set(const std::vector<std::string>& arguments) {
+    virtual bool isRequired() const override { return false; }
+    virtual void set(const std::vector<std::string>& arguments) override {
         for (uint32_t i=0; i<arguments.size(); ++i) {
             std::vector<std::string> v;
             v.push_back(arguments[i]);
@@ -366,10 +366,10 @@ struct ProgramOptions::ListOptionParser : public OptionParser {
             _value.push_back(_singleValue);
         }
     }
-    virtual void setDefault() {
+    virtual void setDefault() override {
         _value.clear();
     }
-    virtual std::string getArgType(uint32_t index) const {
+    virtual std::string getArgType(uint32_t index) const override {
         return _entryParser->getArgType(index) + "[]";
     }
 };