Add asciistream::StateSaver and use it in BucketSpace/BucketId

2 files changed, 2 insertions, 8 deletions

diff --git a/document/src/vespa/document/bucket/bucketid.cpp b/document/src/vespa/document/bucket/bucketid.cpp
index cea593e5fe2..520d3675982 100644
--- a/document/src/vespa/document/bucket/bucketid.cpp
+++ b/document/src/vespa/document/bucket/bucketid.cpp
@@ -125,13 +125,10 @@ BucketId::contains(const BucketId& id) const
 
 vespalib::asciistream& operator<<(vespalib::asciistream& os, const BucketId& id)
 {
-    size_t width = os.getWidth();
-    char fill = os.getFill();
-    vespalib::Base base = os.getBase();
+    vespalib::asciistream::StateSaver stateSaver(os);
     return os << "BucketId(0x"
               << vespalib::hex << vespalib::setw(sizeof(BucketId::Type)*2) << vespalib::setfill('0')
               << id.getId()
-              << base << vespalib::setw(width) << vespalib::setfill(fill)
               << ")";
 }
 
diff --git a/document/src/vespa/document/bucket/bucketspace.cpp b/document/src/vespa/document/bucket/bucketspace.cpp
index 8b5b46b393d..c29d229208f 100644
--- a/document/src/vespa/document/bucket/bucketspace.cpp
+++ b/document/src/vespa/document/bucket/bucketspace.cpp
@@ -19,13 +19,10 @@ void BucketSpace::print(std::ostream& os) const
 
 vespalib::asciistream& operator<<(vespalib::asciistream& os, const BucketSpace& id)
 {
-    size_t width = os.getWidth();
-    char fill = os.getFill();
-    vespalib::Base base = os.getBase();
+    vespalib::asciistream::StateSaver stateSaver(os);
     return os << "BucketSpace(0x"
               << vespalib::hex << vespalib::setw(sizeof(BucketSpace::Type)*2) << vespalib::setfill('0')
               << id.getId()
-              << base << vespalib::setw(width) << vespalib::setfill(fill)
               << ")";
 }