Use override

4 files changed, 11 insertions, 13 deletions

diff --git a/config/src/vespa/config/configgen/map_inserter.h b/config/src/vespa/config/configgen/map_inserter.h
index 75238df912a..8a061a6759c 100644
--- a/config/src/vespa/config/configgen/map_inserter.h
+++ b/config/src/vespa/config/configgen/map_inserter.h
@@ -1,10 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <memory>
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/vespalib/data/slime/slime.h>
 #include "value_converter.h"
+#include <vespa/vespalib/data/slime/object_traverser.h>
+#include <vespa/vespalib/stllike/string.h>
+
 #include <map>
 
 namespace config {
@@ -15,7 +15,7 @@ template<typename T, typename Converter = config::internal::ValueConverter<T> >
 class MapInserter : public ::vespalib::slime::ObjectTraverser {
 public:
     MapInserter(std::map<vespalib::string, T> & map);
-    void field(const ::vespalib::Memory & symbol, const ::vespalib::slime::Inspector & inspector);
+    void field(const ::vespalib::Memory & symbol, const ::vespalib::slime::Inspector & inspector) override;
 private:
     std::map<vespalib::string, T> & _map;
 };
diff --git a/config/src/vespa/config/configgen/vector_inserter.h b/config/src/vespa/config/configgen/vector_inserter.h
index 36d324f3555..1de4679714c 100644
--- a/config/src/vespa/config/configgen/vector_inserter.h
+++ b/config/src/vespa/config/configgen/vector_inserter.h
@@ -1,10 +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 <memory>
-#include <vespa/vespalib/stllike/string.h>
-#include <vespa/vespalib/data/slime/slime.h>
 #include "value_converter.h"
+#include <vespa/vespalib/data/slime/array_traverser.h>
+#include <vespa/vespalib/stllike/string.h>
 
 namespace config {
 
@@ -14,7 +13,7 @@ template<typename T, typename Converter = ::config::internal::ValueConverter<T>
 class VectorInserter : public ::vespalib::slime::ArrayTraverser {
 public:
     VectorInserter(std::vector<T> & vector);
-    void entry(size_t idx, const ::vespalib::slime::Inspector & inspector);
+    void entry(size_t idx, const ::vespalib::slime::Inspector & inspector) override;
 private:
     std::vector<T> & _vector;
 };
diff --git a/config/src/vespa/config/print/fileconfigreader.h b/config/src/vespa/config/print/fileconfigreader.h
index 6b5f14b4318..e3221403c1c 100644
--- a/config/src/vespa/config/print/fileconfigreader.h
+++ b/config/src/vespa/config/print/fileconfigreader.h
@@ -1,10 +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 <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/config/common/misc.h>
-#include <vespa/config/common/configvalue.h>
-#include <vespa/vespalib/util/exceptions.h>
 #include "configreader.h"
 
 namespace config {
@@ -15,7 +11,7 @@ public:
     FileConfigReader(const vespalib::string & fileName);
 
     // Implements ConfigReader
-    std::unique_ptr<ConfigType> read(const ConfigFormatter & formatter);
+    std::unique_ptr<ConfigType> read(const ConfigFormatter & formatter) override;
 
     /**
      * Read config from this file using old config format.
diff --git a/config/src/vespa/config/print/fileconfigreader.hpp b/config/src/vespa/config/print/fileconfigreader.hpp
index f5ab49da240..b677e379c28 100644
--- a/config/src/vespa/config/print/fileconfigreader.hpp
+++ b/config/src/vespa/config/print/fileconfigreader.hpp
@@ -1,6 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include "fileconfigreader.h"
 #include <vespa/config/common/exceptions.h>
+#include <vespa/config/common/misc.h>
+#include <vespa/vespalib/util/exceptions.h>
 #include <fstream>
 #include <sstream>