aboutsummaryrefslogtreecommitdiffstats
path: root/vbench/src/tests
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2017-04-24 12:10:42 +0200
committerGitHub <noreply@github.com>2017-04-24 12:10:42 +0200
commit9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch)
treefc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /vbench/src/tests
parent32ae190acc9ac5081049e1c7008d1602c68cf821 (diff)
Revert "Balder/enforce override 2"
Diffstat (limited to 'vbench/src/tests')
-rw-r--r--vbench/src/tests/dispatcher/dispatcher_test.cpp4
-rw-r--r--vbench/src/tests/handler_thread/handler_thread_test.cpp2
-rw-r--r--vbench/src/tests/socket/socket_test.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/vbench/src/tests/dispatcher/dispatcher_test.cpp b/vbench/src/tests/dispatcher/dispatcher_test.cpp
index 0a278508d55..284f7c55d8a 100644
--- a/vbench/src/tests/dispatcher/dispatcher_test.cpp
+++ b/vbench/src/tests/dispatcher/dispatcher_test.cpp
@@ -7,14 +7,14 @@ using namespace vbench;
struct MyHandler : public Handler<int> {
int value;
MyHandler() : value(-1) {}
- void handle(std::unique_ptr<int> v) override { value = (v.get() != 0) ? *v : 0; }
+ virtual void handle(std::unique_ptr<int> v) override { value = (v.get() != 0) ? *v : 0; }
};
struct Fetcher : public vespalib::Runnable {
Provider<int> &provider;
Handler<int> &handler;
Fetcher(Provider<int> &p, Handler<int> &h) : provider(p), handler(h) {}
- void run() override { handler.handle(provider.provide()); }
+ virtual void run() override { handler.handle(provider.provide()); }
};
TEST("dispatcher") {
diff --git a/vbench/src/tests/handler_thread/handler_thread_test.cpp b/vbench/src/tests/handler_thread/handler_thread_test.cpp
index e8816e1cc96..a21bda82b6a 100644
--- a/vbench/src/tests/handler_thread/handler_thread_test.cpp
+++ b/vbench/src/tests/handler_thread/handler_thread_test.cpp
@@ -6,7 +6,7 @@ using namespace vbench;
struct MyHandler : Handler<int> {
std::vector<int> values;
- void handle(std::unique_ptr<int> value) override {
+ virtual void handle(std::unique_ptr<int> value) override {
values.push_back(*value);
vespalib::Thread::sleep(10); // for improved coverage
}
diff --git a/vbench/src/tests/socket/socket_test.cpp b/vbench/src/tests/socket/socket_test.cpp
index 56499a089b6..21c410f382e 100644
--- a/vbench/src/tests/socket/socket_test.cpp
+++ b/vbench/src/tests/socket/socket_test.cpp
@@ -34,7 +34,7 @@ struct Agent {
struct Client : public Agent, public vespalib::Runnable {
Client(Stream::UP s) : Agent(std::move(s)) {}
- void run() override {
+ virtual void run() override {
TEST_THREAD("client");
write("client-");
read("server-");
@@ -43,7 +43,7 @@ struct Client : public Agent, public vespalib::Runnable {
struct Server : public Agent, public vespalib::Runnable {
Server(Stream::UP s) : Agent(std::move(s)) {}
- void run() override {
+ virtual void run() override {
TEST_THREAD("server");
read("client-");
write("server-");