]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Fix brace-enclosed-scalar warning
authorAdam C. Emerson <aemerson@redhat.com>
Tue, 6 Apr 2021 19:21:30 +0000 (15:21 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Wed, 7 Apr 2021 17:29:08 +0000 (13:29 -0400)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/rgw/rgw_file.cc

index b9cd6e02cc8ec16991b7798c41795ff9976adb31..9f465a8f005095189dc981dc717cc27d16f7d9c9 100644 (file)
@@ -950,7 +950,7 @@ namespace rgw {
   static inline std::string prefix_xattr_keystr(const rgw_xattrstr& key) {
     std::string keystr;
     keystr.reserve(sizeof(RGW_ATTR_META_PREFIX) + key.len);
-    keystr += {RGW_ATTR_META_PREFIX};
+    keystr += string{RGW_ATTR_META_PREFIX};
     keystr += string{key.val, key.len};
     return keystr;
   }
@@ -1829,7 +1829,7 @@ namespace rgw {
                       &state->dest_placement,
                       state->bucket_owner.get_id(),
                       *static_cast<RGWObjectCtx *>(state->obj_ctx),
-                      std::move(state->object->clone()), olh_epoch, state->req_id,
+                      state->object->clone(), olh_epoch, state->req_id,
                      this, state->yield);
 
     op_ret = processor->prepare(state->yield);