]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw/test: adding a qualifier to 'move'
authorRonen Friedman <rfriedma@redhat.com>
Sun, 10 Sep 2023 08:31:35 +0000 (11:31 +0300)
committerMark Kogan <mkogan@redhat.com>
Sun, 10 Sep 2023 16:31:48 +0000 (19:31 +0300)
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 <rfriedma@redhat.com>
src/rgw/driver/rados/rgw_rados.cc
src/rgw/rgw_op.cc
src/test/rgw/test_rgw_compression.cc

index faf27301e360ec5665cdc69030e90ce0ebc8cf71..207ab44380a4d4dd724865306da46cf498744b1a 100644 (file)
@@ -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<std::string, std::string>&& 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;
   }
index 366a122eb33746884ce82bff37fceb8c0b6a19d3..7b9cd0a063dc19c53eceedc5e94ab338b3e15c59 100644 (file)
@@ -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));
     }
index a34653530393ff1655137c6d5997782206a9f063..139172e799b028f5e173fdb0498e5c4ace2b8f49 100644 (file)
@@ -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);