import quincy beta 17.1.0

[ceph.git] / ceph / src / rgw / services / svc_zone_utils.h

diff --git a/ceph/src/rgw/services/svc_zone_utils.h b/ceph/src/rgw/services/svc_zone_utils.h
index 24abe528e53b31ccc40269e0b2cb7bc9105cb9f9..c534e7ea346ea2de42bfc7d18a685dd1287561b3 100644 (file)
--- a/ceph/src/rgw/services/svc_zone_utils.h
+++ b/ceph/src/rgw/services/svc_zone_utils.h
@@ -16,7 +16,7 @@ class RGWSI_ZoneUtils : public RGWServiceInstance
   RGWSI_RADOS *rados_svc{nullptr};
   RGWSI_Zone *zone_svc{nullptr};
 
-  string trans_id_suffix;
+  std::string trans_id_suffix;
 
   void init(RGWSI_RADOS *_rados_svc,
             RGWSI_Zone *_zone_svc) {
@@ -31,8 +31,8 @@ class RGWSI_ZoneUtils : public RGWServiceInstance
 public:
   RGWSI_ZoneUtils(CephContext *cct): RGWServiceInstance(cct) {}
 
-  string gen_host_id();
-  string unique_id(uint64_t unique_num);
+  std::string gen_host_id();
+  std::string unique_id(uint64_t unique_num);
 
-  string unique_trans_id(const uint64_t unique_num);
+  std::string unique_trans_id(const uint64_t unique_num);
 };