From f82805a83bfdc2de0d82bb0772c50ff9fb9f6dcc Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Tue, 6 Apr 2021 15:21:30 -0400 Subject: [PATCH] rgw: Fix brace-enclosed-scalar warning Signed-off-by: Adam C. Emerson --- src/rgw/rgw_file.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc index b9cd6e02cc8ec..9f465a8f00509 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -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(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); -- 2.39.5