[Boost-commit] svn:boost r74317 - trunk/boost/unordered/detail

Subject: [Boost-commit] svn:boost r74317 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-09-08 17:10:40

Author: danieljames
Date: 2011-09-08 17:10:39 EDT (Thu, 08 Sep 2011)
New Revision: 74317
URL: http://svn.boost.org/trac/boost/changeset/74317

Log:
Unordered: Remove use of allocator utilities.
Text files modified: 
   trunk/boost/unordered/detail/allocator_helpers.hpp |    18 ------------------                      
   1 files changed, 0 insertions(+), 18 deletions(-)

Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp	(original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp	2011-09-08 17:10:39 EDT (Thu, 08 Sep 2011)
@@ -22,15 +22,6 @@
 #include <boost/limits.hpp>
 #include <boost/type_traits/add_lvalue_reference.hpp>
 
-#if (defined(BOOST_NO_STD_ALLOCATOR) || defined(BOOST_DINKUMWARE_STDLIB)) \
-    && !defined(__BORLANDC__)
-#  define BOOST_UNORDERED_USE_ALLOCATOR_UTILITIES
-#endif
-
-#if defined(BOOST_UNORDERED_USE_ALLOCATOR_UTILITIES)
-#  include <boost/detail/allocator_utilities.hpp>
-#endif
-
 #if BOOST_UNORDERED_USE_ALLOCATOR_TRAITS
 #  include <memory>
 #endif
@@ -87,17 +78,12 @@
     // Rebind allocators. For some problematic libraries, use rebind_to
     // from <boost/detail/allocator_utilities.hpp>.
 
-#   if defined(BOOST_UNORDERED_USE_ALLOCATOR_UTILITIES)
-    template <typename Alloc, typename T>
-    struct rebind_wrap : ::boost::detail::allocator::rebind_to<Alloc, T> {};
-#   else
     template <typename Alloc, typename T>
     struct rebind_wrap
     {
         typedef typename Alloc::BOOST_NESTED_TEMPLATE rebind<T>::other
             type;
     };
-#   endif
 
     template <typename T> typename boost::add_lvalue_reference<T>::type make();
     struct choice9 { typedef char (&type)[9]; };
@@ -477,8 +463,4 @@
     };
 }}}
 
-#if defined(BOOST_UNORDERED_USE_ALLOCATOR_UTILITIES)
-#  undef BOOST_UNORDERED_USE_ALLOCATOR_UTILITIES
-#endif
-
 #endif