summaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-04-05 02:32:06 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-04-23 02:03:47 +0200
commitb57308e4a134fb6139d2cb52a031d3e7185f16cf (patch)
tree7c31d445e2f76bb737ef90ce29e0e7e6738d6eb1 /vespalog
parent40b8ba5a3f34028d208d4e0dc1b46940d6fe5a47 (diff)
Use override
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/logger/llreader.h5
-rw-r--r--vespalog/src/test/threads/testthreads.cpp11
2 files changed, 5 insertions, 11 deletions
diff --git a/vespalog/src/logger/llreader.h b/vespalog/src/logger/llreader.h
index 27b39d23df7..70b28d3996a 100644
--- a/vespalog/src/logger/llreader.h
+++ b/vespalog/src/logger/llreader.h
@@ -1,9 +1,7 @@
// 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 {
@@ -18,7 +16,6 @@ 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 515fa10c11f..a708777f350 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/fastos.h>
+#include <vespa/fastos/app.h>
+#include <vespa/fastos/time.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) {}
- virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
+ void Run(FastOS_ThreadInterface *thread, void *arg) override;
void stop() {_done = true; }
};
@@ -25,13 +25,10 @@ class LoggerThread : public FastOS_Runnable
public:
bool _useLogBuffer;
LoggerThread() : _done(false), _useLogBuffer(false) {}
- virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
+ void Run(FastOS_ThreadInterface *thread, void *arg) override;
void stop() {_done = true; }
};
-
-
-
void
FileThread::Run(FastOS_ThreadInterface *, void *)
{