diff --git a/test/unordered/allocator_traits.cpp b/test/unordered/allocator_traits.cpp index e8fbbe15..69dedbe2 100644 --- a/test/unordered/allocator_traits.cpp +++ b/test/unordered/allocator_traits.cpp @@ -111,12 +111,8 @@ void test_empty_allocator() { typedef empty_allocator allocator; typedef boost::unordered::detail::allocator_traits traits; -#if !defined(BOOST_NO_CXX11_ALLOCATOR) BOOST_STATIC_ASSERT((boost::is_same::type>::value)); -#else - BOOST_STATIC_ASSERT((boost::is_same::value)); -#endif BOOST_STATIC_ASSERT( (boost::is_same::value)); BOOST_STATIC_ASSERT((boost::is_same::value)); @@ -153,12 +149,8 @@ void test_allocator1() { typedef allocator1 allocator; typedef boost::unordered::detail::allocator_traits traits; -#if !defined(BOOST_NO_CXX11_ALLOCATOR) BOOST_STATIC_ASSERT((boost::is_same::type>::value)); -#else - BOOST_STATIC_ASSERT((boost::is_same::value)); -#endif BOOST_STATIC_ASSERT( (boost::is_same::value)); BOOST_STATIC_ASSERT((boost::is_same::value)); @@ -213,15 +205,7 @@ void test_allocator2() BOOST_TEST(!traits::propagate_on_container_move_assignment::value); BOOST_TEST(!traits::propagate_on_container_swap::value); BOOST_TEST(!traits::is_always_equal::value); - -#if !defined(BOOST_NO_CXX11_ALLOCATOR) - // conditionally compile this assertion as all C++03 emulations of expression - // SFINAE are broken one way or another and the benefits of using Core's - // `allocator_traits` outweigh the costs of breaking this kind of code (i.e. - // inheriting SOCCC via a base) - // BOOST_TEST(call_select() == 1); -#endif } // allocator 3 diff --git a/test/unordered/minimal_allocator.cpp b/test/unordered/minimal_allocator.cpp index bbbb3f1a..9659c0d9 100644 --- a/test/unordered/minimal_allocator.cpp +++ b/test/unordered/minimal_allocator.cpp @@ -48,13 +48,8 @@ template void test_simple_allocator() BOOST_STATIC_ASSERT( (boost::is_same::value)); -#if !defined(BOOST_NO_CXX11_ALLOCATOR) BOOST_STATIC_ASSERT((boost::is_same::type>::value)); -#else - BOOST_STATIC_ASSERT( - (boost::is_same::value)); -#endif BOOST_TEST(!traits::propagate_on_container_copy_assignment::value); BOOST_TEST(!traits::propagate_on_container_move_assignment::value);