Move BucketIdListResult

3 files changed, 7 insertions, 8 deletions

diff --git a/document/src/vespa/document/bucket/bucketid.cpp b/document/src/vespa/document/bucket/bucketid.cpp
index f78fdbe89dc..f01bfb67674 100644
--- a/document/src/vespa/document/bucket/bucketid.cpp
+++ b/document/src/vespa/document/bucket/bucketid.cpp
@@ -151,5 +151,4 @@ operator>>(nbostream &is, BucketId &bucketId)
 
 } // document
 
-template class vespalib::Array<document::BucketId>;
 VESPALIB_HASH_SET_INSTANTIATE_H(document::BucketId, document::BucketId::hash);
diff --git a/document/src/vespa/document/bucket/bucketidlist.cpp b/document/src/vespa/document/bucket/bucketidlist.cpp
index 26f2062e1c4..0f5d18f7b3a 100644
--- a/document/src/vespa/document/bucket/bucketidlist.cpp
+++ b/document/src/vespa/document/bucket/bucketidlist.cpp
@@ -4,9 +4,8 @@
 
 namespace document::bucket {
 
-BucketIdList::BucketIdList() { }
 BucketIdList::BucketIdList(const BucketIdList & rhs) = default;
 BucketIdList & BucketIdList::operator = (const BucketIdList &) = default;
-BucketIdList::~BucketIdList() { }
+BucketIdList::~BucketIdList() = default;
 
 }
diff --git a/document/src/vespa/document/bucket/bucketidlist.h b/document/src/vespa/document/bucket/bucketidlist.h
index c21879ff375..b6fdb51740a 100644
--- a/document/src/vespa/document/bucket/bucketidlist.h
+++ b/document/src/vespa/document/bucket/bucketidlist.h
@@ -3,17 +3,18 @@
 #pragma once
 
 #include "bucketid.h"
-#include <vespa/vespalib/util/array.h>
+#include <vespa/vespalib/stllike/allocator.h>
+#include <vector>
 
 namespace document::bucket {
 
-using BucketIdListT = vespalib::Array<BucketId>;
+using BucketIdListT = std::vector<BucketId, vespalib::allocator_large<BucketId>>;
 
 class BucketIdList : public BucketIdListT {
 public:
-    BucketIdList();
-    BucketIdList(BucketIdList && rhs) = default;
-    BucketIdList & operator = (BucketIdList &&) = default;
+    using BucketIdListT::BucketIdListT;
+    BucketIdList(BucketIdList && rhs) noexcept = default;
+    BucketIdList & operator = (BucketIdList &&) noexcept = default;
     BucketIdList(const BucketIdList & rhs);
     BucketIdList & operator = (const BucketIdList &);
     ~BucketIdList();