diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-19 21:57:59 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-20 12:38:48 +0000 |
| commit | 64500ab17deb86b394edc81f4ad42b5a2c43fe30 (patch) | |
| tree | 64334ba1513b697dacd5068981a8ee5b7ad92f3b /storage | |
| parent | cfa6ec5cdbd1cf39558d3f85101de05230d6c225 (diff) | |
Fold staging_vespalib into vespalib
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storageapi/buckets/bucketinfo.cpp | 3 | ||||
| -rw-r--r-- | storage/src/vespa/storageapi/buckets/bucketinfo.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/storage/src/vespa/storageapi/buckets/bucketinfo.cpp b/storage/src/vespa/storageapi/buckets/bucketinfo.cpp index ff2f40e736b..8305b999afc 100644 --- a/storage/src/vespa/storageapi/buckets/bucketinfo.cpp +++ b/storage/src/vespa/storageapi/buckets/bucketinfo.cpp @@ -2,7 +2,6 @@ #include "bucketinfo.h" #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/xmlstream.h> -#include <ostream> namespace storage::api { @@ -111,7 +110,7 @@ BucketInfo::toString() const } void -BucketInfo::printXml(vespalib::XmlOutputStream& xos) const +BucketInfo::printXml(vespalib::xml::XmlOutputStream& xos) const { using namespace vespalib::xml; xos << XmlAttribute("checksum", _checksum, XmlAttribute::HEX) diff --git a/storage/src/vespa/storageapi/buckets/bucketinfo.h b/storage/src/vespa/storageapi/buckets/bucketinfo.h index d7b407185f6..e535dee3152 100644 --- a/storage/src/vespa/storageapi/buckets/bucketinfo.h +++ b/storage/src/vespa/storageapi/buckets/bucketinfo.h @@ -14,9 +14,9 @@ #pragma once #include <vespa/storageapi/defs.h> -#include <vespa/vespalib/util/xmlserializable.h> #include <vespa/vespalib/stllike/string.h> +namespace vespalib::xml { class XmlOutputStream; } namespace storage::api { class BucketInfo @@ -76,7 +76,7 @@ public: return _metaCount == 0 && _usedFileSize == 0 && _checksum == 0; } vespalib::string toString() const; - void printXml(vespalib::XmlOutputStream&) const; + void printXml(vespalib::xml::XmlOutputStream&) const; }; std::ostream & operator << (std::ostream & os, const BucketInfo & bucketInfo); |