update sources to v12.2.4

[ceph.git] / ceph / src / rgw / rgw_op.h

diff --git a/ceph/src/rgw/rgw_op.h b/ceph/src/rgw/rgw_op.h
index 063af352cbeb4ead6189ae2c18f70c291a87a783..0a127d2a9a46c2491a311d5c5c8e25f987a4426f 100644 (file)
--- a/ceph/src/rgw/rgw_op.h
+++ b/ceph/src/rgw/rgw_op.h
@@ -973,7 +973,7 @@ protected:
   const char *supplied_etag;
   const char *if_match;
   const char *if_nomatch;
-  const char *copy_source;
+  std::string copy_source;
   const char *copy_source_range;
   RGWBucketInfo copy_source_bucket_info;
   string copy_source_tenant_name;
@@ -1004,7 +1004,6 @@ public:
                 supplied_etag(NULL),
                 if_match(NULL),
                 if_nomatch(NULL),
-                copy_source(NULL),
                 copy_source_range(NULL),
                 copy_source_range_fst(0),
                 copy_source_range_lst(0),
@@ -1316,7 +1315,7 @@ public:
     copy_if_newer = false;
   }
 
-  static bool parse_copy_location(const string& src,
+  static bool parse_copy_location(const boost::string_view& src,
                                   string& bucket_name,
                                   rgw_obj_key& object);