diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 14:41:39 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 15:50:29 +0100 |
commit | 51bc810507f2067ebd2646274d3cda5cb583a620 (patch) | |
tree | cbff1f6464262c2e6b3a622db93d044bab69a532 /vespaclient | |
parent | 530e52e17a85836d58cac58c89b71c189c6f9873 (diff) |
Further decouple some hpp files, config and the attributevector.
Diffstat (limited to 'vespaclient')
5 files changed, 13 insertions, 14 deletions
diff --git a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp index 3816fc765d2..b6367281be9 100644 --- a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp +++ b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.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 <vespa/vespaclient/clusterlist/clusterlist.h> #include <vespa/config/config.h> +#include <vespa/config/helper/configgetter.hpp> #include <sstream> using namespace vespaclient; diff --git a/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp b/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp index d338769d4fd..37a2b981063 100644 --- a/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp +++ b/vespaclient/src/vespa/vespaclient/vdsstates/statesapp.cpp @@ -1,19 +1,21 @@ // 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/document/util/stringutil.h> #include <vespa/fnet/frt/frt.h> #include <vespa/slobrok/sbmirror.h> #include <iostream> -#include <vespa/log/log.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vespalib/util/programoptions.h> #include <vespa/vespaclient/clusterlist/clusterlist.h> #include <vespa/vespalib/text/lowercase.h> #include <vespa/config-stor-distribution.h> +#include <vespa/config/helper/configgetter.hpp> +#include <vespa/fastos/app.h> +#include <vespa/log/log.h> LOG_SETUP("vdsstatetool"); namespace storage { diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp b/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp index 6bca0db2991..ae2c362aae2 100644 --- a/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp +++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/locator.cpp @@ -1,5 +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 <boost/tokenizer.hpp> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/messagebus/configagent.h> @@ -8,6 +8,8 @@ #include <vespa/vdslib/bucketdistribution.h> #include <vespa/messagebus/config-messagebus.h> #include <vespa/config/helper/configgetter.h> +#include <vespa/config/helper/configgetter.hpp> + #include "locator.h" diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp index 7d4db8732c0..c5d29b23d99 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp @@ -1,25 +1,18 @@ // 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("vesparoute"); #include "application.h" -#include "params.h" -#include <vespa/config/helper/configgetter.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/util/stringutil.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/messagebus/configagent.h> -#include <vespa/messagebus/network/rpcsendv1.h> -#include <vespa/messagebus/routing/policydirective.h> +#include <vespa/messagebus/routing/routingtable.h> #include <vespa/messagebus/routing/routedirective.h> #include <vespa/messagebus/rpcmessagebus.h> -#include <vespa/messagebus/config-messagebus.h> #include <vespa/slobrok/sbmirror.h> -#include <algorithm> -#include <vector> +#include <vespa/config/helper/configgetter.hpp> + using config::ConfigGetter; using document::DocumenttypesConfig; diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.h b/vespaclient/src/vespa/vespaclient/vesparoute/application.h index bdfbd8d3c92..215ffaecfcf 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.h +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.h @@ -3,6 +3,7 @@ #include <vespa/fastos/app.h> #include <vespa/messagebus/messagebus.h> +#include <vespa/messagebus/routing/hopblueprint.h> #include "mynetwork.h" #include "params.h" #include <vespa/documentapi/loadtypes/loadtypeset.h> |