Fix warnings hidden earlier due to including application headers as system includes

6 files changed, 17 insertions, 12 deletions

diff --git a/vbench/src/vbench/core/dispatcher.h b/vbench/src/vbench/core/dispatcher.h
index 29935ef6baa..4b099c8dd75 100644
--- a/vbench/src/vbench/core/dispatcher.h
+++ b/vbench/src/vbench/core/dispatcher.h
@@ -36,10 +36,11 @@ private:
 
 public:
     Dispatcher(Handler<T> &fallback);
+    ~Dispatcher();
     bool waitForThreads(size_t threads, size_t pollCnt) const;
-    virtual void close();
-    virtual void handle(std::unique_ptr<T> obj);
-    virtual std::unique_ptr<T> provide();
+    void close() override;
+    void handle(std::unique_ptr<T> obj) override;
+    std::unique_ptr<T> provide() override;
 };
 
 } // namespace vbench
diff --git a/vbench/src/vbench/core/dispatcher.hpp b/vbench/src/vbench/core/dispatcher.hpp
index b2c14d4ea7a..4f34c678b4e 100644
--- a/vbench/src/vbench/core/dispatcher.hpp
+++ b/vbench/src/vbench/core/dispatcher.hpp
@@ -14,6 +14,9 @@ Dispatcher<T>::Dispatcher(Handler<T> &fallback)
 }
 
 template <typename T>
+Dispatcher<T>::~Dispatcher() {}
+
+template <typename T>
 bool
 Dispatcher<T>::waitForThreads(size_t threads, size_t pollCnt) const
 {
diff --git a/vbench/src/vbench/core/handler_thread.h b/vbench/src/vbench/core/handler_thread.h
index cd7b53a6109..24753730b11 100644
--- a/vbench/src/vbench/core/handler_thread.h
+++ b/vbench/src/vbench/core/handler_thread.h
@@ -2,14 +2,13 @@
 
 #pragma once
 
+#include "handler.h"
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vespalib/util/arrayqueue.hpp>
 #include <vespa/vespalib/util/thread.h>
 #include <vespa/vespalib/util/runnable.h>
 #include <vespa/vespalib/util/joinable.h>
 
-#include "handler.h"
-
 namespace vbench {
 
 /**
@@ -31,13 +30,13 @@ private:
     vespalib::Thread                           _thread;
     bool                                       _done;
 
-    virtual void run();
+    void run() override;
 
 public:
     HandlerThread(Handler<T> &next);
-    virtual ~HandlerThread();
-    virtual void handle(std::unique_ptr<T> obj);
-    virtual void join();
+    ~HandlerThread();
+    void handle(std::unique_ptr<T> obj) override;
+    void join() override;
 };
 
 } // namespace vbench
diff --git a/vbench/src/vbench/core/input_file_reader.cpp b/vbench/src/vbench/core/input_file_reader.cpp
index 48a2b4e564e..dd24c3f9f36 100644
--- a/vbench/src/vbench/core/input_file_reader.cpp
+++ b/vbench/src/vbench/core/input_file_reader.cpp
@@ -14,6 +14,8 @@ InputFileReader::InputFileReader(const string &name)
     }
 }
 
+InputFileReader::~InputFileReader() {}
+
 bool
 InputFileReader::readLine(string &dst)
 {
diff --git a/vbench/src/vbench/core/input_file_reader.h b/vbench/src/vbench/core/input_file_reader.h
index 5883faab9aa..473df3de73b 100644
--- a/vbench/src/vbench/core/input_file_reader.h
+++ b/vbench/src/vbench/core/input_file_reader.h
@@ -23,6 +23,7 @@ private:
 
 public:
     InputFileReader(const string &name);
+    ~InputFileReader();
 
     /**
      * Read a single line from the input file and put it into
diff --git a/vbench/src/vbench/core/time_queue.h b/vbench/src/vbench/core/time_queue.h
index b7c287dbdc4..7375b70571d 100644
--- a/vbench/src/vbench/core/time_queue.h
+++ b/vbench/src/vbench/core/time_queue.h
@@ -2,12 +2,11 @@
 
 #pragma once
 
+#include "closeable.h"
 #include <vespa/vespalib/util/priority_queue.h>
 #include <vespa/vespalib/util/sync.h>
 #include <memory>
 
-#include "closeable.h"
-
 namespace vbench {
 
 /**
@@ -43,7 +42,7 @@ private:
 
 public:
     TimeQueue(double window, double tick);
-    virtual void close();
+    void close() override;
     void discard();
     void insert(std::unique_ptr<T> obj, double time);
     bool extract(double time, std::vector<std::unique_ptr<T> > &list, double &delay);