From c48fd6f9038e925765c756cb87af70d5274e5232 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Mon, 16 Jun 2014 14:27:52 +0300 Subject: [PATCH 1/2] [test][util] replace compile time check that uses __cplusplus with BOOST_NO_LONG_LONG --- test/util/math_sqrt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/util/math_sqrt.cpp b/test/util/math_sqrt.cpp index b76e1f5f1..aba010cfe 100644 --- a/test/util/math_sqrt.cpp +++ b/test/util/math_sqrt.cpp @@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE( test_math_sqrt_fundamental ) check_sqrt::apply(2, sqrt2); check_sqrt::apply(2, sqrt2); check_sqrt::apply(2L, sqrt2); -#if ( __cplusplus >= 201103L ) +#if !defined(BOOST_NO_LONG_LONG) check_sqrt::apply(2LL, sqrt2); #endif check_sqrt::apply(2LL, sqrt2); From d265965b2ead5fa0a6810d8d6357119d37c5ef51 Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Mon, 16 Jun 2014 14:36:11 +0300 Subject: [PATCH 2/2] [test][util] replace 2LL literal by boost::long_long_type(2) --- test/util/math_sqrt.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/util/math_sqrt.cpp b/test/util/math_sqrt.cpp index aba010cfe..7ce9781e6 100644 --- a/test/util/math_sqrt.cpp +++ b/test/util/math_sqrt.cpp @@ -121,7 +121,10 @@ BOOST_AUTO_TEST_CASE( test_math_sqrt_fundamental ) #if !defined(BOOST_NO_LONG_LONG) check_sqrt::apply(2LL, sqrt2); #endif - check_sqrt::apply(2LL, sqrt2); + check_sqrt + < + boost::long_long_type, double + >::apply(boost::long_long_type(2), sqrt2); }