From 64500ab17deb86b394edc81f4ad42b5a2c43fe30 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 19 May 2022 21:57:59 +0000
Subject: Fold staging_vespalib into vespalib

---
 storage/src/vespa/storageapi/buckets/bucketinfo.cpp | 3 +--
 storage/src/vespa/storageapi/buckets/bucketinfo.h   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'storage')

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);
-- 
cgit v1.2.3