From 8cb85937c478a5e8422ba57ee1be853337d3462c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 6 May 2012 12:28:57 +0000 Subject: [PATCH] Unordered: Reactivate std::allocator_traits for gcc 4.7, and try for Visual C++ 11 [SVN r78348] --- include/boost/unordered/detail/allocator_helpers.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/boost/unordered/detail/allocator_helpers.hpp b/include/boost/unordered/detail/allocator_helpers.hpp index 6b59aec3..c4da2e68 100644 --- a/include/boost/unordered/detail/allocator_helpers.hpp +++ b/include/boost/unordered/detail/allocator_helpers.hpp @@ -27,17 +27,13 @@ #include #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.