import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / heap / d_ary_heap.hpp

diff --git a/ceph/src/boost/boost/heap/d_ary_heap.hpp b/ceph/src/boost/boost/heap/d_ary_heap.hpp
index 12ef99e4653bc521362909801927218c1f0631b8..6e54c8cd64d2634da6f647245bee06451603b087 100644 (file)
--- a/ceph/src/boost/boost/heap/d_ary_heap.hpp
+++ b/ceph/src/boost/boost/heap/d_ary_heap.hpp
@@ -66,11 +66,7 @@ class d_ary_heap:
     typedef typename heap_base_maker::type super_t;
     typedef typename super_t::internal_type internal_type;
 
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-    typedef typename heap_base_maker::allocator_argument::template rebind<internal_type>::other internal_type_allocator;
-#else
-    typedef typename std::allocator_traits<typename heap_base_maker::allocator_argument>::template rebind_alloc<internal_type> internal_type_allocator;
-#endif
+    typedef typename boost::allocator_rebind<typename heap_base_maker::allocator_argument, internal_type>::type internal_type_allocator;
     typedef std::vector<internal_type, internal_type_allocator> container_type;
     typedef typename container_type::const_iterator container_iterator;