import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / signals2 / detail / auto_buffer.hpp

diff --git a/ceph/src/boost/boost/signals2/detail/auto_buffer.hpp b/ceph/src/boost/boost/signals2/detail/auto_buffer.hpp
index 78af34f344a2e259fcea0a31b7afcd279c9837ed..87c1e8ddbe206d8677c04899687a9dd4f12bb0ed 100644 (file)
--- a/ceph/src/boost/boost/signals2/detail/auto_buffer.hpp
+++ b/ceph/src/boost/boost/signals2/detail/auto_buffer.hpp
@@ -19,6 +19,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/core/allocator_access.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/mpl/if.hpp>
@@ -140,14 +141,10 @@ namespace detail
     public:
         typedef Allocator                                allocator_type;
         typedef T                                        value_type;
-        typedef typename Allocator::size_type            size_type;
-        typedef typename Allocator::difference_type      difference_type;
+        typedef typename boost::allocator_size_type<Allocator>::type size_type;
+        typedef typename boost::allocator_difference_type<Allocator>::type difference_type;
         typedef T*                                       pointer;
-#ifdef BOOST_NO_CXX11_ALLOCATOR
-        typedef typename Allocator::pointer              allocator_pointer;
-#else
-        typedef typename std::allocator_traits<Allocator>::pointer allocator_pointer;
-#endif
+        typedef typename boost::allocator_pointer<Allocator>::type allocator_pointer;
         typedef const T*                                 const_pointer;
         typedef T&                                       reference;
         typedef const T&                                 const_reference;