Hide BucketId::List

2 files changed, 5 insertions, 5 deletions

diff --git a/persistence/src/vespa/persistence/spi/clusterstate.cpp b/persistence/src/vespa/persistence/spi/clusterstate.cpp
index 70bc8724c96..841fef4620d 100644
--- a/persistence/src/vespa/persistence/spi/clusterstate.cpp
+++ b/persistence/src/vespa/persistence/spi/clusterstate.cpp
@@ -5,9 +5,9 @@
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <cassert>
 
-namespace storage {
-namespace spi {
+namespace storage::spi {
 
 ClusterState::ClusterState(const lib::ClusterState& state,
                            uint16_t nodeIndex,
@@ -99,5 +99,4 @@ void ClusterState::serialize(vespalib::nbostream& o) const {
     o << _distribution->serialize();
 }
 
-} // spi
-} // storage
+}
diff --git a/persistence/src/vespa/persistence/spi/result.h b/persistence/src/vespa/persistence/spi/result.h
index 359f6af5164..93db642611f 100644
--- a/persistence/src/vespa/persistence/spi/result.h
+++ b/persistence/src/vespa/persistence/spi/result.h
@@ -5,6 +5,7 @@
 #include "bucketinfo.h"
 #include "bucket.h"
 #include "docentry.h"
+#include <vespa/document/bucket/bucketidlist.h>
 
 namespace storage::spi {
 
@@ -196,7 +197,7 @@ private:
 
 class BucketIdListResult : public Result {
 public:
-    typedef document::BucketId::List List;
+    using List = document::bucket::BucketIdList;
 
     /**
      * Constructor used when there was an error listing the buckets.