diff --git a/test/check_integral_constant.hpp b/test/check_integral_constant.hpp index 5d73e58..abf8ab4 100644 --- a/test/check_integral_constant.hpp +++ b/test/check_integral_constant.hpp @@ -31,12 +31,12 @@ namespace boost{ { return static_cast(found) == expected; } #define BOOST_CHECK_INTEGRAL_CONSTANT(expression, expected_value)\ - if(!::boost::detail::tt_compare(::boost::detail::integral_constant<(int)(expression)>::value(), expression)){\ + if(!::boost::detail::tt_compare(::boost::detail::integral_constant<(int)(expression)>::value(), (int)expression)){\ BOOST_CHECK_MESSAGE(false, "The expression: \"" << BOOST_STRINGIZE(expression) << "\" had differing values depending upon whether it was used as an integral constant expression or not");\ }else{\ BOOST_CHECK_MESSAGE(true, "Validating Integral Constant Expression: \"" << BOOST_STRINGIZE(expression) << "\"");\ }\ - if(!::boost::detail::tt_compare(expression, expected_value))\ + if(!::boost::detail::tt_compare((int)expression, expected_value))\ BOOST_CHECK_MESSAGE(false, "The expression: \"" << BOOST_STRINGIZE(expression) << "\" had an invalid value (found " << ::boost::detail::integral_constant<(int)(expression)>::value() << ", expected " << expected_value << ")" ) /* @@ -49,13 +49,13 @@ namespace boost{ */ #define BOOST_CHECK_SOFT_INTEGRAL_CONSTANT(expression, expected_value, alternate_value)\ - if(!::boost::detail::tt_compare(::boost::detail::integral_constant<(int)(expression)>::value(), expression)){\ + if(!::boost::detail::tt_compare(::boost::detail::integral_constant<(int)(expression)>::value(), (int)expression)){\ BOOST_CHECK_MESSAGE(false, "The expression: \"" << BOOST_STRINGIZE(expression) << "\" had differing values depending upon whether it was used as an integral constant expression or not");\ }else{\ BOOST_CHECK_MESSAGE(true, "Validating Integral Constant Expression: \"" << BOOST_STRINGIZE(expression) << "\"");\ }\ - if(!::boost::detail::tt_compare(expression, expected_value))\ - if(!::boost::detail::tt_compare(expression, alternate_value))\ + if(!::boost::detail::tt_compare((int)expression, expected_value))\ + if(!::boost::detail::tt_compare((int)expression, alternate_value))\ BOOST_CHECK_MESSAGE(false, "The expression: \"" << BOOST_STRINGIZE(expression) << "\" had an invalid value (found " << ::boost::detail::integral_constant<(int)(expression)>::value() << ", expected " << expected_value << ")" );\ else\ BOOST_WARN_MESSAGE(false, "The expression: \"" << BOOST_STRINGIZE(expression) << "\" did not have the value we wish it to have (found " << ::boost::detail::integral_constant<(int)(expression)>::value() << ", expected " << expected_value << ")" ) @@ -69,3 +69,4 @@ namespace boost{ +