summaryrefslogtreecommitdiffstats
path: root/slobrok
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-04-04 00:43:28 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-04-04 16:36:18 +0200
commit67e9b3bd5b22ae02c079e47e56ec9ad7fb7df402 (patch)
tree7ad1cac03d3dbe238537e34c75cd465d2c91f5e9 /slobrok
parentf65d05c33c1ff6654860900c8e464ff36263dcdc (diff)
Use override
Diffstat (limited to 'slobrok')
-rw-r--r--slobrok/src/vespa/slobrok/server/remote_check.h3
-rw-r--r--slobrok/src/vespa/slobrok/server/sbenv.cpp6
-rw-r--r--slobrok/src/vespa/slobrok/server/slobrokserver.h3
3 files changed, 1 insertions, 11 deletions
diff --git a/slobrok/src/vespa/slobrok/server/remote_check.h b/slobrok/src/vespa/slobrok/server/remote_check.h
index aa0326c5fbf..44962b1654d 100644
--- a/slobrok/src/vespa/slobrok/server/remote_check.h
+++ b/slobrok/src/vespa/slobrok/server/remote_check.h
@@ -1,8 +1,7 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
-#include <vespa/fnet/fnet.h>
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/task.h>
namespace slobrok {
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp
index a766c6cfdf8..0cc0b2467e2 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.cpp
+++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp
@@ -1,15 +1,9 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "sbenv.h"
-#include "rpchooks.h"
#include "selfcheck.h"
#include "remote_check.h"
-#include <vespa/fnet/fnet.h>
-#include <vespa/fnet/frt/frt.h>
-#include <memory>
-#include <string>
#include <sstream>
-#include <vespa/vespalib/util/exception.h>
#include <vespa/vespalib/net/state_server.h>
#include <vespa/vespalib/util/host_name.h>
#include <vespa/vespalib/stllike/asciistream.h>
diff --git a/slobrok/src/vespa/slobrok/server/slobrokserver.h b/slobrok/src/vespa/slobrok/server/slobrokserver.h
index a87902d0aa1..2b62f62956c 100644
--- a/slobrok/src/vespa/slobrok/server/slobrokserver.h
+++ b/slobrok/src/vespa/slobrok/server/slobrokserver.h
@@ -5,12 +5,9 @@
#include "configshim.h"
#include <vespa/vespalib/util/thread.h>
#include <vespa/vespalib/util/runnable.h>
-#include <vespa/config/config.h>
-#include <vespa/config-slobroks.h>
namespace slobrok {
-
class SlobrokServer : public vespalib::Runnable
{
private: