diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc index fdbcb707bbe..eefeab0e6a0 100644 --- a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc +++ b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc @@ -24,18 +24,30 @@ static_assert(std::is_constructible_v, #endif // No implicit conversion from integer-like objects. -template - constexpr bool +template + consteval bool is_explicit() { - return std::is_nothrow_constructible_v - && !std::is_convertible_v; + if (!std::is_nothrow_constructible_v) + return false; + if constexpr (sizeof...(RIndicies) == 0) + if (std::is_convertible_v) + return false; + + extern void testConv(ExtentsType); + return !requires (OIndex index, RIndicies... rindicies) + { testConv({index, rindicies...}); }; } static_assert(is_explicit, int>()); static_assert(is_explicit, unsigned int>()); static_assert(is_explicit, int>()); +static_assert(is_explicit, int>()); +static_assert(is_explicit, int, int>()); +static_assert(is_explicit, int, int, int>()); + + constexpr bool test_all() {