Revert "Balder/enforce override 2"

2 files changed, 11 insertions, 5 deletions

diff --git a/vespalog/src/logger/llreader.h b/vespalog/src/logger/llreader.h
index 70b28d3996a..27b39d23df7 100644
--- a/vespalog/src/logger/llreader.h
+++ b/vespalog/src/logger/llreader.h
@@ -1,7 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#include <stdexcept>
 
+#include <vespa/log/log.h>
+#include <vespa/log/log-target.h>
 #include <vespa/log/llparser.h>
-#include <stdexcept>
 
 namespace ns_log {
 
@@ -16,6 +18,7 @@ public:
     const char *what() const throw() override { return _string; }
 };
 
+
 class InputBuf
 {
 private:
diff --git a/vespalog/src/test/threads/testthreads.cpp b/vespalog/src/test/threads/testthreads.cpp
index a708777f350..515fa10c11f 100644
--- a/vespalog/src/test/threads/testthreads.cpp
+++ b/vespalog/src/test/threads/testthreads.cpp
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/app.h>
-#include <vespa/fastos/time.h>
+#include <vespa/fastos/fastos.h>
 #include <vespa/log/log.h>
 #include <iostream>
+#include <string>
 
 using std::string;
 
@@ -15,7 +15,7 @@ class FileThread : public FastOS_Runnable
     string _file;
 public:
     FileThread(string file) : _done(false), _file(file) {}
-    void Run(FastOS_ThreadInterface *thread, void *arg) override;
+    virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
     void stop() {_done = true; }
 };
 
@@ -25,10 +25,13 @@ class LoggerThread : public FastOS_Runnable
 public:
     bool _useLogBuffer;
     LoggerThread() : _done(false), _useLogBuffer(false) {}
-    void Run(FastOS_ThreadInterface *thread, void *arg) override;
+    virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
     void stop() {_done = true; }
 };
 
+
+
+
 void
 FileThread::Run(FastOS_ThreadInterface *, void *)
 {