diff options
Diffstat (limited to 'slobrok/src')
-rw-r--r-- | slobrok/src/vespa/slobrok/sbregister.cpp | 8 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/slobrok/src/vespa/slobrok/sbregister.cpp b/slobrok/src/vespa/slobrok/sbregister.cpp index 0ca5d51aad2..a904a49884a 100644 --- a/slobrok/src/vespa/slobrok/sbregister.cpp +++ b/slobrok/src/vespa/slobrok/sbregister.cpp @@ -1,17 +1,17 @@ // 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/log/log.h> -LOG_SETUP(".slobrok.register"); + #include <vespa/fnet/frt/frt.h> #include <vespa/config-slobroks.h> #include "sbregister.h" #include <memory> #include <sstream> #include <vespa/vespalib/util/host_name.h> +#include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/log/log.h> +LOG_SETUP(".slobrok.register"); namespace { - vespalib::string createSpec(FRT_Supervisor &orb) { diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 858c6203f33..2217b976aa1 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -1,25 +1,22 @@ // 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 "sbenv.h" +#include "rpchooks.h" +#include "selfcheck.h" +#include "remote_check.h" #include <vespa/fnet/fnet.h> #include <vespa/fnet/frt/frt.h> - -#include "sbenv.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 "rpchooks.h" -#include "selfcheck.h" -#include "remote_check.h" +#include <vespa/vespalib/stllike/asciistream.h> #include <vespa/log/log.h> LOG_SETUP(".sbenv"); - namespace slobrok { namespace { |