Skip to content

Commit

Permalink
Restore some deleted move constructors.
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-tsirpanis committed Apr 17, 2024
1 parent c5d8c38 commit f894873
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
9 changes: 5 additions & 4 deletions tiledb/common/pmr.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,13 @@ class vector : public pmr_vector<Tp> {

// 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<Tp>(alloc) {
Expand Down
5 changes: 4 additions & 1 deletion tiledb/sm/rtree/rtree.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit f894873

Please sign in to comment.