import quincy beta 17.1.0

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

diff --git a/ceph/src/rgw/services/svc_meta_be_otp.h b/ceph/src/rgw/services/svc_meta_be_otp.h
index 9da97b024bbb784d54028c7968bb10c08ae50c03..52ea66b337359b8a45cd17f7566473940623a0bc 100644 (file)
--- a/ceph/src/rgw/services/svc_meta_be_otp.h
+++ b/ceph/src/rgw/services/svc_meta_be_otp.h
@@ -29,7 +29,7 @@
 using RGWSI_MBOTP_Handler_Module  = RGWSI_MBSObj_Handler_Module;
 using RGWSI_MetaBackend_Handler_OTP  = RGWSI_MetaBackend_Handler_SObj;
 
-using otp_devices_list_t = list<rados::cls::otp::otp_info_t>;
+using otp_devices_list_t = std::list<rados::cls::otp::otp_info_t>;
 
 struct RGWSI_MBOTP_GetParams : public RGWSI_MetaBackend::GetParams {
   otp_devices_list_t *pdevices{nullptr};
@@ -59,7 +59,7 @@ public:
     return MDBE_OTP;
   }
 
-  static string get_meta_key(const rgw_user& user);
+  static std::string get_meta_key(const rgw_user& user);
 
   void init(RGWSI_SysObj *_sysobj_svc,
             RGWSI_MDLog *_mdlog_svc,
@@ -74,14 +74,14 @@ public:
   int call_with_get_params(ceph::real_time *pmtime, std::function<int(RGWSI_MetaBackend::GetParams&)> cb) override;
 
   int get_entry(RGWSI_MetaBackend::Context *ctx,
-                const string& key,
+                const std::string& key,
                 RGWSI_MetaBackend::GetParams& _params,
                 RGWObjVersionTracker *objv_tracker,
                 optional_yield y,
                 const DoutPrefixProvider *dpp);
   int put_entry(const DoutPrefixProvider *dpp, 
                 RGWSI_MetaBackend::Context *ctx,
-                const string& key,
+                const std::string& key,
                 RGWSI_MetaBackend::PutParams& _params,
                 RGWObjVersionTracker *objv_tracker,
                 optional_yield y);