import quincy beta 17.1.0

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

diff --git a/ceph/src/rgw/rgw_gc.h b/ceph/src/rgw/rgw_gc.h
index 2345db85146edb23363c77b28d9211b42fcee4c9..f66b0be89c8482dd65e512f5cae5f0bba1e15479 100644 (file)
--- a/ceph/src/rgw/rgw_gc.h
+++ b/ceph/src/rgw/rgw_gc.h
@@ -23,12 +23,12 @@ class RGWGC : public DoutPrefixProvider {
   CephContext *cct;
   RGWRados *store;
   int max_objs;
-  string *obj_names;
+  std::string *obj_names;
   std::atomic<bool> down_flag = { false };
 
   static constexpr uint64_t seed = 8675309;
 
-  int tag_index(const string& tag);
+  int tag_index(const std::string& tag);
 
   class GCWorker : public Thread {
     const DoutPrefixProvider *dpp;
@@ -50,22 +50,22 @@ public:
     stop_processor();
     finalize();
   }
-  vector<bool> transitioned_objects_cache;
-  int send_chain(cls_rgw_obj_chain& chain, const string& tag);
+  std::vector<bool> transitioned_objects_cache;
+  int send_chain(cls_rgw_obj_chain& chain, const std::string& tag);
 
   // asynchronously defer garbage collection on an object that's still being read
-  int async_defer_chain(const string& tag, const cls_rgw_obj_chain& info);
+  int async_defer_chain(const std::string& tag, const cls_rgw_obj_chain& info);
 
   // callback for when async_defer_chain() fails with ECANCELED
   void on_defer_canceled(const cls_rgw_gc_obj_info& info);
 
-  int remove(int index, const std::vector<string>& tags, librados::AioCompletion **pc);
+  int remove(int index, const std::vector<std::string>& tags, librados::AioCompletion **pc);
   int remove(int index, int num_entries);
 
   void initialize(CephContext *_cct, RGWRados *_store);
   void finalize();
 
-  int list(int *index, string& marker, uint32_t max, bool expired_only, std::list<cls_rgw_gc_obj_info>& result, bool *truncated, bool& processing_queue);
+  int list(int *index, std::string& marker, uint32_t max, bool expired_only, std::list<cls_rgw_gc_obj_info>& result, bool *truncated, bool& processing_queue);
   void list_init(int *index) { *index = 0; }
   int process(int index, int process_max_secs, bool expired_only,
               RGWGCIOManager& io_manager);