From 531f6804ad7aeb4d15d35aa5a73b3456112953a1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 23 Apr 2012 20:52:08 +0000 Subject: [PATCH] Unordered: Disable std::allocator_traits on gcc for now. [SVN r78166] --- include/boost/unordered/detail/allocator_helpers.hpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/boost/unordered/detail/allocator_helpers.hpp b/include/boost/unordered/detail/allocator_helpers.hpp index b0b6f175..4f2e13d8 100644 --- a/include/boost/unordered/detail/allocator_helpers.hpp +++ b/include/boost/unordered/detail/allocator_helpers.hpp @@ -27,14 +27,24 @@ #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 # endif -# +*/ + +// Use container's allocator_traits for older versions of Visual C++ as I don't +// test with them. # if defined(BOOST_MSVC) && BOOST_MSVC < 1400 # define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 2 # endif + #endif #if !defined(BOOST_UNORDERED_USE_ALLOCATOR_TRAITS)