import quincy beta 17.1.0

[ceph.git] / ceph / src / librbd / ImageCtx.h

diff --git a/ceph/src/librbd/ImageCtx.h b/ceph/src/librbd/ImageCtx.h
index 043b26efe300d97f7e4a6341c64490a1c3b4bb5f..729b962be4f2cc08377554f8e9cff4cb07354041 100644 (file)
--- a/ceph/src/librbd/ImageCtx.h
+++ b/ceph/src/librbd/ImageCtx.h
@@ -13,7 +13,6 @@
 #include <string>
 #include <vector>
 
-#include "common/allocator.h"
 #include "common/Timer.h"
 #include "common/ceph_mutex.h"
 #include "common/config_proxy.h"
@@ -83,7 +82,7 @@ namespace librbd {
       }
     };
 
-    static const string METADATA_CONF_PREFIX;
+    static const std::string METADATA_CONF_PREFIX;
 
     CephContext *cct;
     ConfigProxy config;
@@ -199,9 +198,7 @@ namespace librbd {
 
     PluginRegistry<ImageCtx>* plugin_registry;
 
-    typedef boost::lockfree::queue<
-      io::AioCompletion*,
-      boost::lockfree::allocator<ceph::allocator<void>>> Completions;
+    using Completions = boost::lockfree::queue<io::AioCompletion*>;
 
     Completions event_socket_completions;
     EventSocket event_socket;
@@ -283,7 +280,7 @@ namespace librbd {
 
     uint64_t get_current_size() const;
     uint64_t get_object_size() const;
-    string get_object_name(uint64_t num) const;
+    std::string get_object_name(uint64_t num) const;
     uint64_t get_stripe_unit() const;
     uint64_t get_stripe_count() const;
     uint64_t get_stripe_period() const;
@@ -326,7 +323,7 @@ namespace librbd {
     int get_parent_overlap(librados::snap_t in_snap_id,
                           uint64_t *overlap) const;
     void register_watch(Context *on_finish);
-    uint64_t prune_parent_extents(vector<pair<uint64_t,uint64_t> >& objectx,
+    uint64_t prune_parent_extents(std::vector<std::pair<uint64_t,uint64_t> >& objectx,
                                  uint64_t overlap);
 
     void cancel_async_requests();