From e34ad30482d72b2a538093d30cfd22d480eb0866 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 13 Mar 2018 18:32:15 +0000 Subject: [PATCH] Fix some more gcc-4.5/6 testing errors. --- test/is_constructible_test.cpp | 2 ++ test/is_list_constructible_test.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/is_constructible_test.cpp b/test/is_constructible_test.cpp index 600a3bd..92eab87 100644 --- a/test/is_constructible_test.cpp +++ b/test/is_constructible_test.cpp @@ -52,6 +52,7 @@ BOOST_CHECK_SOFT_INTEGRAL_CONSTANT((::tt::is_constructible::value), true, false); BOOST_CHECK_SOFT_INTEGRAL_CONSTANT((::tt::is_constructible::value), true, false); BOOST_CHECK_SOFT_INTEGRAL_CONSTANT((::tt::is_constructible::value), true, false); +#if !BOOST_WORKAROUND(BOOST_GCC, < 40500) BOOST_CHECK_SOFT_INTEGRAL_CONSTANT((::tt::is_constructible::value), true, false); #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) BOOST_CHECK_SOFT_INTEGRAL_CONSTANT((::tt::is_constructible::value), true, false); @@ -60,6 +61,7 @@ BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_constructible::value), false); #endif +#endif BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_constructible::value), true); BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_constructible::value), true); diff --git a/test/is_list_constructible_test.cpp b/test/is_list_constructible_test.cpp index bbf1d59..5541406 100644 --- a/test/is_list_constructible_test.cpp +++ b/test/is_list_constructible_test.cpp @@ -19,7 +19,8 @@ #include "check_integral_constant.hpp" #if defined(BOOST_NO_SFINAE_EXPR) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_DECLTYPE) \ - || defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) + || defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)\ + || BOOST_WORKAROUND(BOOST_GCC, < 40700) int main() {}