diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-22 13:11:12 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-22 13:11:12 +0100 |
commit | 269af3b147667a384772b2bf586d2bd98731a8c1 (patch) | |
tree | 3a34e43792c0e333777b3fbf01140e423d381e6b /config/src/tests | |
parent | 9c6fa5fda02b0dfa3d34e9ba2b56d46f1bf101be (diff) |
Only include what you need.
Diffstat (limited to 'config/src/tests')
-rw-r--r-- | config/src/tests/failover/failover.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/src/tests/failover/failover.cpp b/config/src/tests/failover/failover.cpp index baaae8ba19a..146cb517280 100644 --- a/config/src/tests/failover/failover.cpp +++ b/config/src/tests/failover/failover.cpp @@ -1,7 +1,5 @@ // 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("failover"); + #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/misc.h> #include <vespa/config/frt/protocol.h> @@ -9,6 +7,8 @@ LOG_SETUP("failover"); #include <vespa/fnet/frt/frt.h> #include "config-my.h" #include <vespa/vespalib/data/slime/slime.h> +#include <vespa/log/log.h> +LOG_SETUP("failover"); using namespace config; using vespalib::Barrier; @@ -86,7 +86,7 @@ void verifyConfig(std::unique_ptr<MyConfig> config) } struct ServerFixture { - typedef vespalib::LinkedPtr<ServerFixture> LP; + using UP = std::unique_ptr<ServerFixture>; FRT_Supervisor * supervisor; RPCServer server; Barrier b; @@ -130,14 +130,14 @@ struct ServerFixture { }; struct NetworkFixture { - std::vector<ServerFixture::LP> serverList; + std::vector<ServerFixture::UP> serverList; ServerSpec spec; bool running; NetworkFixture(const std::vector<vespalib::string> & serverSpecs) : spec(serverSpecs), running(true) { for (size_t i = 0; i < serverSpecs.size(); i++) { - serverList.push_back(ServerFixture::LP(new ServerFixture(serverSpecs[i]))); + serverList.push_back(std::make_unique<ServerFixture>(serverSpecs[i])); } } void start(size_t i) { |