import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / heap / detail / mutable_heap.hpp

diff --git a/ceph/src/boost/boost/heap/detail/mutable_heap.hpp b/ceph/src/boost/boost/heap/detail/mutable_heap.hpp
index f0d2d695515f00651ad0359337f6481cc930ffcf..0fc0c5c78590649018dc0e0d6ce11f7946b48d34 100644 (file)
--- a/ceph/src/boost/boost/heap/detail/mutable_heap.hpp
+++ b/ceph/src/boost/boost/heap/detail/mutable_heap.hpp
@@ -47,11 +47,7 @@ public:
 private:
     typedef std::pair<value_type, size_type> node_type;
 
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-    typedef std::list<node_type, typename allocator_type::template rebind<node_type>::other> object_list;
-#else
-    typedef std::list<node_type, typename std::allocator_traits<allocator_type>::template rebind_alloc<node_type>> object_list;
-#endif
+    typedef std::list<node_type, typename boost::allocator_rebind<allocator_type, node_type>::type> object_list;
 
     typedef typename object_list::iterator list_iterator;
     typedef typename object_list::const_iterator const_list_iterator;
@@ -300,11 +296,7 @@ public:
         }
 
         std::priority_queue<iterator,
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-                            std::vector<iterator, typename allocator_type::template rebind<iterator>::other >,
-#else
-                            std::vector<iterator, typename std::allocator_traits<allocator_type>::template rebind_alloc<iterator> >,
-#endif
+                            std::vector<iterator, typename boost::allocator_rebind<allocator_type, iterator>::type>,
                             indirect_cmp
                            > unvisited_nodes;
         const priority_queue_mutable_wrapper * q_;