Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r78348 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2012-05-06 08:28:58


Author: danieljames
Date: 2012-05-06 08:28:57 EDT (Sun, 06 May 2012)
New Revision: 78348
URL: http://svn.boost.org/trac/boost/changeset/78348

Log:
Unordered: Reactivate std::allocator_traits for gcc 4.7, and try for Visual C++ 11
Text files modified:
   trunk/boost/unordered/detail/allocator_helpers.hpp | 8 ++------
   1 files changed, 2 insertions(+), 6 deletions(-)

Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp (original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp 2012-05-06 08:28:57 EDT (Sun, 06 May 2012)
@@ -27,17 +27,13 @@
 #include <boost/utility/addressof.hpp>
 
 #if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS)
-// An allocator_traits test is currently failing for gcc 4.7 on mingw. I think
-// this is because it's an older development version. Temporarily disabling
-// std::allocator_traits in order ot get clean test results. Will reactivate
-// later.
 
-/*
 # if defined(__GXX_EXPERIMENTAL_CXX0X__) && \
             (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
 # define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 1
+# elif BOOST_MSVC >= 1700 && defined(_CPPLIB_VER)
+# define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 1
 # endif
-*/
 
 // Use container's allocator_traits for older versions of Visual C++ as I don't
 // test with them.


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk