summaryrefslogtreecommitdiff
path: root/boost/detail/allocator_utilities.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/detail/allocator_utilities.hpp')
-rw-r--r--boost/detail/allocator_utilities.hpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/boost/detail/allocator_utilities.hpp b/boost/detail/allocator_utilities.hpp
index ed3de8466d..11eecbe1b5 100644
--- a/boost/detail/allocator_utilities.hpp
+++ b/boost/detail/allocator_utilities.hpp
@@ -121,8 +121,13 @@ struct rebinder
template<typename Type>
struct result
{
- typedef typename Allocator::BOOST_NESTED_TEMPLATE
+#ifdef BOOST_NO_CXX11_ALLOCATOR
+ typedef typename Allocator::BOOST_NESTED_TEMPLATE
rebind<Type>::other other;
+#else
+ typedef typename std::allocator_traits<Allocator>::BOOST_NESTED_TEMPLATE
+ rebind_alloc<Type> other;
+#endif
};
};
@@ -159,7 +164,7 @@ void construct(void* p,const Type& t)
*/
#pragma warning(push)
-#pragma warning(disable:4100)
+#pragma warning(disable:4100)
#endif
template<typename Type>