Fix warnings-as-errors.

TileDB-Inc · Jan 2, 2025 · 1421da9 · 1421da9
1 parent 5ff4a35
commit 1421da9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/tiledb/sm/filter/filter_buffer.cc b/tiledb/sm/filter/filter_buffer.cc
@@ -55,11 +55,7 @@ FilterBuffer::BufferOrView::BufferOrView(
       tdb_new(Buffer, (char*)buffer->data() + offset, nbytes));
 }
 
-FilterBuffer::BufferOrView::BufferOrView(BufferOrView&& other) {
-  underlying_buffer_.swap(other.underlying_buffer_);
-  view_.swap(other.view_);
-  std::swap(is_view_, other.is_view_);
-}
+FilterBuffer::BufferOrView::BufferOrView(BufferOrView&& other) = default;
 
 Buffer* FilterBuffer::BufferOrView::buffer() const {
   return is_view_ ? view_.get() : underlying_buffer_.get();

diff --git a/tiledb/sm/filter/filter_pipeline.cc b/tiledb/sm/filter/filter_pipeline.cc
@@ -68,6 +68,8 @@ FilterPipeline::FilterPipeline(
     , max_chunk_size_(max_chunk_size) {
 }
 
+// Unlike move constructors, copy constructors must not use default,
+// because individual filters are being copied by calling clone.
 FilterPipeline::FilterPipeline(const FilterPipeline& other) {
   for (auto& filter : other.filters_) {
     add_filter(*filter);
@@ -85,9 +87,7 @@ FilterPipeline::FilterPipeline(
   max_chunk_size_ = other.max_chunk_size_;
 }
 
-FilterPipeline::FilterPipeline(FilterPipeline&& other) {
-  swap(other);
-}
+FilterPipeline::FilterPipeline(FilterPipeline&& other) = default;
 
 FilterPipeline& FilterPipeline::operator=(const FilterPipeline& other) {
   // Call copy constructor
@@ -97,10 +97,7 @@ FilterPipeline& FilterPipeline::operator=(const FilterPipeline& other) {
   return *this;
 }
 
-FilterPipeline& FilterPipeline::operator=(FilterPipeline&& other) {
-  swap(other);
-  return *this;
-}
+FilterPipeline& FilterPipeline::operator=(FilterPipeline&& other) = default;
 
 void FilterPipeline::add_filter(const Filter& filter) {
   shared_ptr<Filter> copy(filter.clone());