diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 15:11:38 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:23 +0200 |
commit | ece112cf6aadbf135c92f1d5ddada739b290a118 (patch) | |
tree | 3fb49a56dcfd77e27ee335f5be1f172d3a7975c9 /storage | |
parent | 8438c19df2999aed6fd89c470c52a9c04c77dcdc (diff) |
Forward declare XmlOutputStream and FieldValue::IteratorHandler.
Diffstat (limited to 'storage')
7 files changed, 10 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h index d3a939d90c5..09cbc60b58e 100644 --- a/storage/src/vespa/storage/bucketdb/bucketmanager.h +++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h @@ -25,6 +25,7 @@ #include <vespa/storageapi/message/bucket.h> #include <vespa/config/subscription/configuri.h> #include <unordered_set> +#include <list> namespace storage { diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h index f56b45c71b3..92c00c4420a 100644 --- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h +++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h @@ -50,6 +50,7 @@ #include <vespa/vespalib/util/sync.h> #include <vespa/vdslib/state/nodestate.h> #include <vespa/config/subscription/configuri.h> +#include <list> namespace storage { diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.cpp b/storage/src/vespa/storage/common/statusmetricconsumer.cpp index 3111508fddc..8cb5c9018f4 100644 --- a/storage/src/vespa/storage/common/statusmetricconsumer.cpp +++ b/storage/src/vespa/storage/common/statusmetricconsumer.cpp @@ -1,20 +1,19 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "statusmetricconsumer.h" - +#include <vespa/storageframework/generic/memory/memorymanagerinterface.h> +#include <vespa/storageframework/generic/status/htmlstatusreporter.h> #include <boost/assign.hpp> #include <boost/lexical_cast.hpp> -#include <vespa/log/log.h> #include <vespa/metrics/printutils.h> #include <vespa/metrics/jsonwriter.h> #include <vespa/metrics/textwriter.h> #include <vespa/metrics/xmlwriter.h> #include <vespa/storageapi/messageapi/storagemessage.h> #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/storageframework/generic/memory/memorymanagerinterface.h> -#include <vespa/storageframework/generic/status/htmlstatusreporter.h> - +#include <vespa/vespalib/util/xmlstream.h> +#include <vespa/log/log.h> LOG_SETUP(".status.metricreporter"); namespace storage { diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp index 068f42f8b31..eede73bed63 100644 --- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp +++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp @@ -7,6 +7,7 @@ #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/removelocation.h> #include <vespa/storageapi/message/multioperation.h> +#include <vespa/vespalib/util/xmlstream.h> #include <vespa/log/log.h> LOG_SETUP(".distributor.bucketdb.updater"); diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h index 3f0989e9b4f..3bd86fc3db6 100644 --- a/storage/src/vespa/storage/distributor/bucketdbupdater.h +++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h @@ -17,6 +17,7 @@ #include <vespa/storageapi/messageapi/messagehandler.h> #include <set> #include <deque> +#include <list> namespace storage::distributor { diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp index 9497bf05f17..5a2f0d35e8c 100644 --- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp +++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp @@ -4,7 +4,7 @@ #include "bucketdbupdater.h" #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storage/common/bucketoperationlogger.h> -#include <vespa/vespalib/util/xmlserializable.hpp> +#include <vespa/vespalib/util/xmlstream.hpp> #include <vespa/log/log.h> LOG_SETUP(".pendingclusterstate"); diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h index 3add8c56e4b..f55cb18366c 100644 --- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h +++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h @@ -16,6 +16,7 @@ #include <vespa/storageapi/message/bucket.h> #include <vespa/storageframework/generic/status/htmlstatusreporter.h> #include <vespa/config/config.h> +#include <list> namespace storage { |