From: Kefu Chai Date: Sun, 5 Jul 2020 13:48:19 +0000 (+0800) Subject: crimson/osd: use operator=(...) instead of claim() X-Git-Tag: v16.1.0~1836^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35935%2Fhead;p=ceph.git crimson/osd: use operator=(...) instead of claim() to silence warnings like objclass.cc:300:26: warning: 'void ceph::buffer::v15_2_0::list::claim(ceph::buffer::v15_2_0::list&)' is deprecated: in favor of operator=(list&&) [-Wdeprecated-declarations] 300 | outbl->claim(op.outdata); | ^ Signed-off-by: Kefu Chai --- diff --git a/src/crimson/osd/objclass.cc b/src/crimson/osd/objclass.cc index a26e07780def..a627f8524ccd 100644 --- a/src/crimson/osd/objclass.cc +++ b/src/crimson/osd/objclass.cc @@ -297,7 +297,7 @@ int cls_cxx_map_read_header(cls_method_context_t hctx, bufferlist *outbl) if (const auto ret = execute_osd_op(hctx, op); ret < 0) { return ret; } - outbl->claim(op.outdata); + outbl = std::move(op.outdata); return 0; } @@ -357,7 +357,7 @@ int cls_cxx_map_clear(cls_method_context_t hctx) int cls_cxx_map_write_header(cls_method_context_t hctx, bufferlist *inbl) { OSDOp op{CEPH_OSD_OP_OMAPSETHEADER}; - op.indata.claim(*inbl); + op.indata = std::move(*inbl); return execute_osd_op(hctx, op); }