From f8948739c36b50a21b0c05adb5a1b8156bdfb8b2 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Wed, 17 Apr 2024 14:49:05 +0300 Subject: [PATCH] Restore some deleted move constructors. --- tiledb/common/pmr.h | 9 +++++---- tiledb/sm/rtree/rtree.h | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tiledb/common/pmr.h b/tiledb/common/pmr.h index a5d15a6f0bb..46cf3e9bda0 100644 --- a/tiledb/common/pmr.h +++ b/tiledb/common/pmr.h @@ -221,12 +221,13 @@ class vector : public pmr_vector { // Delete all default constructors because they don't require an allocator constexpr vector() noexcept(noexcept(allocator_type())) = delete; - constexpr vector(const vector& other) = delete; - constexpr vector(vector&& other) noexcept = delete; - // Delete non-allocator aware copy and move assign. + // Delete copy constructors + constexpr vector(const vector& other) = delete; constexpr vector& operator=(const vector& other) = delete; - constexpr vector& operator=(vector&& other) noexcept = delete; + + constexpr vector(vector&& other) noexcept = default; + constexpr vector& operator=(vector&& other) noexcept = default; constexpr explicit vector(const allocator_type& alloc) noexcept : pmr_vector(alloc) { diff --git a/tiledb/sm/rtree/rtree.h b/tiledb/sm/rtree/rtree.h index 35fd505d7be..17a2cbd9444 100644 --- a/tiledb/sm/rtree/rtree.h +++ b/tiledb/sm/rtree/rtree.h @@ -76,7 +76,10 @@ class RTree { ~RTree(); DISABLE_COPY_AND_COPY_ASSIGN(RTree); - DISABLE_MOVE_AND_MOVE_ASSIGN(RTree); + + RTree(RTree&&) = default; + RTree& operator=(RTree&&) = default; + // DISABLE_MOVE_AND_MOVE_ASSIGN(RTree); /* ********************************* */ /* API */