import quincy beta 17.1.0

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

diff --git a/ceph/src/rgw/rgw_meta_sync_status.h b/ceph/src/rgw/rgw_meta_sync_status.h
index 22dbe6479bb86d68ca03e6a6955cd8eed24169d4..6272b471db01b7d984b52a87f7e8a359fc4805ce 100644 (file)
--- a/ceph/src/rgw/rgw_meta_sync_status.h
+++ b/ceph/src/rgw/rgw_meta_sync_status.h
@@ -54,8 +54,8 @@ struct rgw_meta_sync_marker {
     IncrementalSync = 1,
   };
   uint16_t state;
-  string marker;
-  string next_step_marker;
+  std::string marker;
+  std::string next_step_marker;
   uint64_t total_entries;
   uint64_t pos;
   real_time timestamp;
@@ -97,7 +97,7 @@ WRITE_CLASS_ENCODER(rgw_meta_sync_marker)
 
 struct rgw_meta_sync_status {
   rgw_meta_sync_info sync_info;
-  map<uint32_t, rgw_meta_sync_marker> sync_markers;
+  std::map<uint32_t, rgw_meta_sync_marker> sync_markers;
 
   rgw_meta_sync_status() {}