From 93a0024982cc590ec9391a7be23acdaff3bc63f9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 10 Oct 2018 15:12:00 -0400 Subject: [PATCH] rgw: add const to some manifest generator functions Signed-off-by: Casey Bodley --- src/rgw/rgw_rados.cc | 2 +- src/rgw/rgw_rados.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index b611a87a4c3..dd36a180924 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2197,7 +2197,7 @@ void RGWObjManifest::obj_iterator::operator++() update_location(); } -int RGWObjManifest::generator::create_begin(CephContext *cct, RGWObjManifest *_m, const string& placement_rule, rgw_bucket& _b, rgw_obj& _obj) +int RGWObjManifest::generator::create_begin(CephContext *cct, RGWObjManifest *_m, const string& placement_rule, const rgw_bucket& _b, const rgw_obj& _obj) { manifest = _m; diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 32d913dbcfb..159116858d3 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -807,15 +807,15 @@ public: public: generator() : manifest(NULL), last_ofs(0), cur_part_ofs(0), cur_part_id(0), cur_stripe(0), cur_stripe_size(0) {} - int create_begin(CephContext *cct, RGWObjManifest *manifest, const string& placement_rule, rgw_bucket& bucket, rgw_obj& obj); + int create_begin(CephContext *cct, RGWObjManifest *manifest, const string& placement_rule, const rgw_bucket& bucket, const rgw_obj& obj); int create_next(uint64_t ofs); rgw_raw_obj get_cur_obj(RGWZoneGroup& zonegroup, RGWZoneParams& zone_params) { return cur_obj.get_raw_obj(zonegroup, zone_params); } - rgw_raw_obj get_cur_obj(RGWRados *store) { return cur_obj.get_raw_obj(store); } + rgw_raw_obj get_cur_obj(RGWRados *store) const { return cur_obj.get_raw_obj(store); } /* total max size of current stripe (including head obj) */ - uint64_t cur_stripe_max_size() { + uint64_t cur_stripe_max_size() const { return cur_stripe_size; } }; -- 2.39.5