import quincy beta 17.1.0

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

diff --git a/ceph/src/rgw/services/svc_sys_obj_core.h b/ceph/src/rgw/services/svc_sys_obj_core.h
index 52c94051c718821fc311ae2429b6f45bd2bb3a34..7a6ffce0e028ab742c35826e8d425a5e9920a0e6 100644 (file)
--- a/ceph/src/rgw/services/svc_sys_obj_core.h
+++ b/ceph/src/rgw/services/svc_sys_obj_core.h
@@ -35,7 +35,7 @@ protected:
 
   virtual int raw_stat(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, uint64_t *psize,
                        real_time *pmtime, uint64_t *epoch,
-                       map<string, bufferlist> *attrs, bufferlist *first_chunk,
+                       std::map<std::string, bufferlist> *attrs, bufferlist *first_chunk,
                        RGWObjVersionTracker *objv_tracker,
                        optional_yield y);
 
@@ -45,7 +45,7 @@ protected:
                    RGWObjVersionTracker *objv_tracker,
                    const rgw_raw_obj& obj,
                    bufferlist *bl, off_t ofs, off_t end,
-                   map<string, bufferlist> *attrs,
+                   std::map<std::string, bufferlist> *attrs,
                   bool raw_attrs,
                    rgw_cache_entry_info *cache_info,
                    boost::optional<obj_version>,
@@ -60,7 +60,7 @@ protected:
   virtual int write(const DoutPrefixProvider *dpp, 
                     const rgw_raw_obj& obj,
                     real_time *pmtime,
-                    map<std::string, bufferlist>& attrs,
+                    std::map<std::string, bufferlist>& attrs,
                     bool exclusive,
                     const bufferlist& data,
                     RGWObjVersionTracker *objv_tracker,
@@ -79,18 +79,18 @@ protected:
                        optional_yield y);
 
   virtual int set_attrs(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj,
-                        map<string, bufferlist>& attrs,
-                        map<string, bufferlist> *rmattrs,
+                        std::map<std::string, bufferlist>& attrs,
+                        std::map<std::string, bufferlist> *rmattrs,
                         RGWObjVersionTracker *objv_tracker,
                         optional_yield y);
 
-  virtual int omap_get_all(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, std::map<string, bufferlist> *m,
+  virtual int omap_get_all(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, std::map<std::string, bufferlist> *m,
                            optional_yield y);
   virtual int omap_get_vals(const DoutPrefixProvider *dpp, 
                             const rgw_raw_obj& obj,
-                            const string& marker,
+                            const std::string& marker,
                             uint64_t count,
-                            std::map<string, bufferlist> *m,
+                            std::map<std::string, bufferlist> *m,
                             bool *pmore,
                             optional_yield y);
   virtual int omap_set(const DoutPrefixProvider *dpp, 
@@ -98,7 +98,7 @@ protected:
                        bufferlist& bl, bool must_exist,
                        optional_yield y);
   virtual int omap_set(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj,
-                       const map<std::string, bufferlist>& m, bool must_exist,
+                       const std::map<std::string, bufferlist>& m, bool must_exist,
                        optional_yield y);
   virtual int omap_del(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, const std::string& key,
                        optional_yield y);
@@ -110,21 +110,22 @@ protected:
 
   virtual int pool_list_prefixed_objs(const DoutPrefixProvider *dpp,
                                       const rgw_pool& pool,
-                                      const string& prefix,
-                                      std::function<void(const string&)> cb);
+                                      const std::string& prefix,
+                                      std::function<void(const std::string&)> cb);
 
   virtual int pool_list_objects_init(const DoutPrefixProvider *dpp,
                                      const rgw_pool& pool,
                                      const std::string& marker,
                                      const std::string& prefix,
                                      RGWSI_SysObj::Pool::ListCtx *ctx);
-  virtual int pool_list_objects_next(RGWSI_SysObj::Pool::ListCtx& ctx,
+  virtual int pool_list_objects_next(const DoutPrefixProvider *dpp,
+                                     RGWSI_SysObj::Pool::ListCtx& ctx,
                                      int max,
-                                     vector<string> *oids,
+                                     std::vector<std::string> *oids,
                                      bool *is_truncated);
 
   virtual int pool_list_objects_get_marker(RGWSI_SysObj::Pool::ListCtx& _ctx,
-                                           string *marker);
+                                           std::string *marker);
 
   /* wrappers */
   int get_system_obj_state_impl(RGWSysObjectCtxBase *rctx,
@@ -141,7 +142,7 @@ protected:
   int stat(RGWSysObjectCtxBase& obj_ctx,
            RGWSI_SysObj_Obj_GetObjState& state,
            const rgw_raw_obj& obj,
-           map<string, bufferlist> *attrs,
+           std::map<std::string, bufferlist> *attrs,
           bool raw_attrs,
            real_time *lastmod,
            uint64_t *obj_size,