From b46a12e277568b18c4e8099445e03dce6540e581 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Sun, 10 Sep 2023 11:31:35 +0300 Subject: [PATCH] rgw/test: adding a qualifier to 'move' rgw: adding a qualifier to 'move' as Clang now requires fully specifying std::move, as per https://reviews.llvm.org/D119670?id=408276 Signed-off-by: Ronen Friedman --- src/rgw/driver/rados/rgw_rados.cc | 4 ++-- src/rgw/rgw_op.cc | 4 ++-- src/test/rgw/test_rgw_compression.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc index faf27301e36..207ab44380a 100644 --- a/src/rgw/driver/rados/rgw_rados.cc +++ b/src/rgw/driver/rados/rgw_rados.cc @@ -1161,7 +1161,7 @@ int RGWRados::register_to_service_map(const DoutPrefixProvider *dpp, const strin int RGWRados::update_service_map(const DoutPrefixProvider *dpp, std::map&& status) { - int ret = rados.service_daemon_update_status(move(status)); + int ret = rados.service_daemon_update_status(std::move(status)); if (ret < 0) { ldpp_dout(dpp, 0) << "ERROR: service_daemon_update_status() returned ret=" << ret << ": " << cpp_strerror(-ret) << dendl; return ret; @@ -4288,7 +4288,7 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx, cs_info.compression_type = plugin->get_type_name(); cs_info.orig_size = cb.get_data_len(); cs_info.compressor_message = compressor->get_compressor_message(); - cs_info.blocks = move(compressor->get_compression_blocks()); + cs_info.blocks = std::move(compressor->get_compression_blocks()); encode(cs_info, tmp); cb.get_attrs()[RGW_ATTR_COMPRESSION] = tmp; } diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 366a122eb33..7b9cd0a063d 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -4297,7 +4297,7 @@ void RGWPutObj::execute(optional_yield y) cs_info.compression_type = plugin->get_type_name(); cs_info.orig_size = s->obj_size; cs_info.compressor_message = compressor->get_compressor_message(); - cs_info.blocks = move(compressor->get_compression_blocks()); + cs_info.blocks = std::move(compressor->get_compression_blocks()); encode(cs_info, tmp); attrs[RGW_ATTR_COMPRESSION] = tmp; ldpp_dout(this, 20) << "storing " << RGW_ATTR_COMPRESSION @@ -4639,7 +4639,7 @@ void RGWPostObj::execute(optional_yield y) cs_info.compression_type = plugin->get_type_name(); cs_info.orig_size = s->obj_size; cs_info.compressor_message = compressor->get_compressor_message(); - cs_info.blocks = move(compressor->get_compression_blocks()); + cs_info.blocks = std::move(compressor->get_compression_blocks()); encode(cs_info, tmp); emplace_attr(RGW_ATTR_COMPRESSION, std::move(tmp)); } diff --git a/src/test/rgw/test_rgw_compression.cc b/src/test/rgw/test_rgw_compression.cc index a3465353039..139172e799b 100644 --- a/src/test/rgw/test_rgw_compression.cc +++ b/src/test/rgw/test_rgw_compression.cc @@ -130,7 +130,7 @@ TEST(Compress, LimitedChunkSize) cs_info.compression_type = plugin->get_type_name(); cs_info.orig_size = s; cs_info.compressor_message = compressor.get_compressor_message(); - cs_info.blocks = move(compressor.get_compression_blocks()); + cs_info.blocks = std::move(compressor.get_compression_blocks()); ut_get_sink_size d_sink; RGWGetObj_Decompress decompress(g_ceph_context, &cs_info, false, &d_sink); @@ -169,7 +169,7 @@ TEST(Compress, BillionZeros) cs_info.compression_type = plugin->get_type_name(); cs_info.orig_size = size*1000; cs_info.compressor_message = compressor.get_compressor_message(); - cs_info.blocks = move(compressor.get_compression_blocks()); + cs_info.blocks = std::move(compressor.get_compression_blocks()); ut_get_sink d_sink; RGWGetObj_Decompress decompress(g_ceph_context, &cs_info, false, &d_sink); -- 2.39.5