diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-05 21:59:00 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:45 +0100 |
| commit | 36be03af9ccb5ede87f7a5bc3d37526cdc9b2bc4 (patch) | |
| tree | 4f95a3c666ad80a5e6066dfcf2d75f54e67d6866 /documentapi | |
| parent | f94a9a21d6d546868ef2cf63ea3532469450ffd7 (diff) | |
Avoid pulling in all of slobrok and config everywhere.
Diffstat (limited to 'documentapi')
4 files changed, 8 insertions, 6 deletions
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp index 75f569b306f..54d7a47e4b8 100644 --- a/documentapi/src/tests/messages/testbase.cpp +++ b/documentapi/src/tests/messages/testbase.cpp @@ -1,11 +1,11 @@ // 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(".testbase"); #include "testbase.h" #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> +#include <vespa/vespalib/util/exception.h> +#include <vespa/log/log.h> +LOG_SETUP(".testbase"); using document::DocumentTypeRepo; using document::readDocumenttypesConfig; diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp index cb30e5377aa..0c4fd90a5c4 100644 --- a/documentapi/src/tests/policies/testframe.cpp +++ b/documentapi/src/tests/policies/testframe.cpp @@ -311,7 +311,7 @@ bool TestFrame::waitSlobrok(const string &pattern, uint32_t cnt) { for (uint32_t i = 0; i < 1000; ++i) { - slobrok::api::MirrorAPI::SpecList res = _net->getMirror().lookup(pattern); + slobrok::api::IMirrorAPI::SpecList res = _net->getMirror().lookup(pattern); if (res.size() == cnt) { return true; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp index 01eaa8b5523..4ac6a91fd47 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp @@ -1,7 +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 "getbucketlistreply.h" #include <vespa/documentapi/messagebus/documentprotocol.h> -#include <vespa/documentapi/messagebus/messages/getbucketlistreply.h> +#include <ostream> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h index ade2c78024a..536be0044fe 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h @@ -7,6 +7,7 @@ #include <vespa/messagebus/routing/route.h> #include <vespa/messagebus/routing/routingcontext.h> #include <vespa/vespalib/util/sync.h> +#include <vespa/vespalib/util/ptrholder.h> #include <vespa/config-messagetyperouteselectorpolicy.h> #include <vespa/config/config.h> #include <vespa/config/helper/configfetcher.h> |