]> git-server-git.apps.pok.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)
committersinguliere <singuliere@autistici.org>
Fri, 9 Apr 2021 05:57:55 +0000 (07:57 +0200)
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit f82805a83bfdc2de0d82bb0772c50ff9fb9f6dcc)

src/rgw/rgw_file.cc

index 1a30f11cc55aeec5626e94437bf5161d2ab890d8..103e196e5ad77299caeb2bd26eadd7deaec654d9 100644 (file)
@@ -961,7 +961,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;
   }
@@ -1845,7 +1845,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);