update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / cls / otp / cls_otp_client.h

diff --git a/ceph/src/cls/otp/cls_otp_client.h b/ceph/src/cls/otp/cls_otp_client.h
index f1dec9f5681f2b1e9a13cb7e07df6636603f2eb5..a921e4e383f4659b24fd06b148c87e04c582bb8e 100644 (file)
--- a/ceph/src/cls/otp/cls_otp_client.h
+++ b/ceph/src/cls/otp/cls_otp_client.h
@@ -14,23 +14,23 @@ namespace rados {
       class OTP {
       public:
         static void create(librados::ObjectWriteOperation *op, const otp_info_t& config);
-        static void set(librados::ObjectWriteOperation *op, const list<otp_info_t>& entries);
-        static void remove(librados::ObjectWriteOperation *op, const string& id);
+        static void set(librados::ObjectWriteOperation *op, const std::list<otp_info_t>& entries);
+        static void remove(librados::ObjectWriteOperation *op, const std::string& id);
         static int get(librados::ObjectReadOperation *op,
-                       librados::IoCtx& ioctx, const string& oid,
-                       const string& id, otp_info_t *result);
+                       librados::IoCtx& ioctx, const std::string& oid,
+                       const std::string& id, otp_info_t *result);
         static int get_all(librados::ObjectReadOperation *op,
-                           librados::IoCtx& ioctx, const string& oid,
-                           list<otp_info_t> *result);
+                           librados::IoCtx& ioctx, const std::string& oid,
+                           std::list<otp_info_t> *result);
 // these overloads which call io_ctx.operate() or io_ctx.exec() should not be called in the rgw.
 // rgw_rados_operate() should be called after the overloads w/o calls to io_ctx.operate()/exec()
 #ifndef CLS_CLIENT_HIDE_IOCTX
         static int get(librados::ObjectReadOperation *op,
-                       librados::IoCtx& ioctx, const string& oid,
-                       const list<string> *ids, bool get_all, list<otp_info_t> *result);
-        static int check(CephContext *cct, librados::IoCtx& ioctx, const string& oid,
-                         const string& id, const string& val, otp_check_t *result);
-        static int get_current_time(librados::IoCtx& ioctx, const string& oid,
+                       librados::IoCtx& ioctx, const std::string& oid,
+                       const std::list<std::string> *ids, bool get_all, std::list<otp_info_t> *result);
+        static int check(CephContext *cct, librados::IoCtx& ioctx, const std::string& oid,
+                         const std::string& id, const std::string& val, otp_check_t *result);
+        static int get_current_time(librados::IoCtx& ioctx, const std::string& oid,
                                     ceph::real_time *result);
 #endif
       };
@@ -38,7 +38,7 @@ namespace rados {
       class TOTPConfig {
         otp_info_t config;
         public:
-          TOTPConfig(const string& id, const string& seed) {
+          TOTPConfig(const std::string& id, const std::string& seed) {
             config.type = OTP_TOTP;
             config.id = id;
             config.seed = seed;