diff --git a/test/unordered/compile_tests.hpp b/test/unordered/compile_tests.hpp index 20dbf08f..33692831 100644 --- a/test/unordered/compile_tests.hpp +++ b/test/unordered/compile_tests.hpp @@ -36,11 +36,7 @@ template T rvalue_default() { return T(); } template T implicit_construct() { return {}; } -#if !defined(BOOST_NO_CXX11_NOEXCEPT) #define TEST_NOEXCEPT_EXPR(x) BOOST_STATIC_ASSERT((noexcept(x))); -#else -#define TEST_NOEXCEPT_EXPR(x) -#endif template void container_test(X& r, T const&) { diff --git a/test/unordered/noexcept_tests.cpp b/test/unordered/noexcept_tests.cpp index 31fbbddf..bbe5a1a1 100644 --- a/test/unordered/noexcept_tests.cpp +++ b/test/unordered/noexcept_tests.cpp @@ -176,18 +176,9 @@ namespace noexcept_tests { boost::is_nothrow_swappable::value; // Check that the traits work when expected. -#if !defined(BOOST_NO_CXX11_NOEXCEPT) && !defined(BOOST_NO_SFINAE_EXPR) && \ - !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40800) BOOST_TEST(have_is_nothrow_move); BOOST_TEST(have_is_nothrow_move_assign); -#endif - -#if !defined(BOOST_NO_SFINAE_EXPR) && !defined(BOOST_NO_CXX11_NOEXCEPT) && \ - !defined(BOOST_NO_CXX11_DECLTYPE) && \ - !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) && \ - !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700) BOOST_TEST(have_is_nothrow_swap); -#endif BOOST_LIGHTWEIGHT_TEST_OSTREAM << "have_is_nothrow_move: " << have_is_nothrow_move << std::endl