From a7c9d05aa56a6937776ec40e8f2fe97b5062ecb0 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 11 Jul 2022 12:39:49 -0700 Subject: [PATCH] Suppress non-ISO type warnings in constexpr testing --- test/constexpr_arithmetric_test.hpp | 52 +++++++++++----------- test/constexpr_test_arithmetic_backend.cpp | 4 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/test/constexpr_arithmetric_test.hpp b/test/constexpr_arithmetric_test.hpp index a07ac8f5..de6a3907 100644 --- a/test/constexpr_arithmetric_test.hpp +++ b/test/constexpr_arithmetric_test.hpp @@ -60,12 +60,12 @@ BOOST_CXX14_CONSTEXPR T test_constexpr_add_subtract(T a) a += do_test_constexpr_add_subtract(a, static_cast(2)); a += do_test_constexpr_add_subtract(a, static_cast(2)); #if defined(BOOST_HAS_INT128) && !defined(BOOST_NO_CXX17_IF_CONSTEXPR) - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) { - a += do_test_constexpr_add_subtract(a, static_cast<__int128>(2)); - a += do_test_constexpr_add_subtract(a, static_cast(2)); - a -= do_test_constexpr_add_subtract(a, static_cast<__int128>(2)); - a -= do_test_constexpr_add_subtract(a, static_cast(2)); + a += do_test_constexpr_add_subtract(a, static_cast(2)); + a += do_test_constexpr_add_subtract(a, static_cast(2)); + a -= do_test_constexpr_add_subtract(a, static_cast(2)); + a -= do_test_constexpr_add_subtract(a, static_cast(2)); } #endif @@ -124,12 +124,12 @@ BOOST_CXX14_CONSTEXPR T test_constexpr_mul_divide(T a) a += do_test_constexpr_mul_divide(a, static_cast(2)); a += do_test_constexpr_mul_divide(a, static_cast(2)); #if defined(BOOST_HAS_INT128) && !defined(BOOST_NO_CXX17_IF_CONSTEXPR) - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) { - a += do_test_constexpr_mul_divide(a, static_cast<__int128>(2)); - a += do_test_constexpr_mul_divide(a, static_cast(2)); - a -= do_test_constexpr_mul_divide(a, static_cast<__int128>(2)); - a -= do_test_constexpr_mul_divide(a, static_cast(2)); + a += do_test_constexpr_mul_divide(a, static_cast(2)); + a += do_test_constexpr_mul_divide(a, static_cast(2)); + a -= do_test_constexpr_mul_divide(a, static_cast(2)); + a -= do_test_constexpr_mul_divide(a, static_cast(2)); } #endif @@ -169,7 +169,7 @@ BOOST_CXX14_CONSTEXPR T do_test_constexpr_bitwise(T a, U b) a = a >> 2; return a; -} +} template BOOST_CXX14_CONSTEXPR T test_constexpr_bitwise(T a) @@ -187,10 +187,10 @@ BOOST_CXX14_CONSTEXPR T test_constexpr_bitwise(T a) a += do_test_constexpr_bitwise(a, static_cast(2)); a += do_test_constexpr_bitwise(a, static_cast(2)); #if defined(BOOST_HAS_INT128) && !defined(BOOST_NO_CXX17_IF_CONSTEXPR) - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) { - a += do_test_constexpr_bitwise(a, static_cast<__int128>(2)); - a += do_test_constexpr_bitwise(a, static_cast(2)); + a += do_test_constexpr_bitwise(a, static_cast(2)); + a += do_test_constexpr_bitwise(a, static_cast(2)); } #endif @@ -214,7 +214,7 @@ BOOST_CXX14_CONSTEXPR T do_test_constexpr_logical(T a, U b) if(!a) ++result; return result; -} +} template BOOST_CXX14_CONSTEXPR T test_constexpr_logical(T a) @@ -232,12 +232,12 @@ BOOST_CXX14_CONSTEXPR T test_constexpr_logical(T a) a += do_test_constexpr_logical(a, static_cast(2)); a += do_test_constexpr_logical(a, static_cast(2)); #if defined(BOOST_HAS_INT128) && !defined(BOOST_NO_CXX17_IF_CONSTEXPR) - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) { - a += do_test_constexpr_logical(a, static_cast<__int128>(2)); - a += do_test_constexpr_logical(a, static_cast(2)); - a -= do_test_constexpr_logical(a, static_cast<__int128>(2)); - a -= do_test_constexpr_logical(a, static_cast(2)); + a += do_test_constexpr_logical(a, static_cast(2)); + a += do_test_constexpr_logical(a, static_cast(2)); + a -= do_test_constexpr_logical(a, static_cast(2)); + a -= do_test_constexpr_logical(a, static_cast(2)); } #endif @@ -278,7 +278,7 @@ BOOST_CXX14_CONSTEXPR T do_test_constexpr_compare(T a, U b) ++result; return result; -} +} template BOOST_CXX14_CONSTEXPR T test_constexpr_compare(T a) @@ -296,12 +296,12 @@ BOOST_CXX14_CONSTEXPR T test_constexpr_compare(T a) a += do_test_constexpr_compare(a, static_cast(2)); a += do_test_constexpr_compare(a, static_cast(2)); #if defined(BOOST_HAS_INT128) && !defined(BOOST_NO_CXX17_IF_CONSTEXPR) - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) { - a += do_test_constexpr_compare(a, static_cast<__int128>(2)); - a += do_test_constexpr_compare(a, static_cast(2)); - a -= do_test_constexpr_compare(a, static_cast<__int128>(2)); - a -= do_test_constexpr_compare(a, static_cast(2)); + a += do_test_constexpr_compare(a, static_cast(2)); + a += do_test_constexpr_compare(a, static_cast(2)); + a -= do_test_constexpr_compare(a, static_cast(2)); + a -= do_test_constexpr_compare(a, static_cast(2)); } #endif diff --git a/test/constexpr_test_arithmetic_backend.cpp b/test/constexpr_test_arithmetic_backend.cpp index ed971918..22f1f805 100644 --- a/test/constexpr_test_arithmetic_backend.cpp +++ b/test/constexpr_test_arithmetic_backend.cpp @@ -10,7 +10,7 @@ template constexpr int expected_1() { #ifdef BOOST_HAS_INT128 - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) return 230; else #endif @@ -20,7 +20,7 @@ template constexpr int expected_2() { #ifdef BOOST_HAS_INT128 - if constexpr (std::is_constructible::value) + if constexpr (std::is_constructible::value) return 120; else #endif