diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp @@ -24,7 +24,7 @@ static_assert( std::is_default_constructible_v>); static_assert(!std::is_default_constructible_v>); - static_assert( std::is_nothrow_default_constructible_v>); + LIBCPP_STATIC_ASSERT( std::is_nothrow_default_constructible_v>); static_assert(!std::is_nothrow_default_constructible_v); static_assert(!std::is_nothrow_default_constructible_v>); diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp @@ -23,7 +23,7 @@ using View = std::ranges::transform_view; View transformView(MoveOnlyView{buff}, PlusOne{}); assert(*transformView.begin() == 1); - static_assert(!noexcept(*std::declval>())); + ASSERT_NOT_NOEXCEPT(*std::declval>()); ASSERT_SAME_TYPE(int, decltype(*std::declval().begin())); } { @@ -31,7 +31,7 @@ using View = std::ranges::transform_view; View transformView(MoveOnlyView{buff}, PlusOneMutable{}); assert(*transformView.begin() == 1); - static_assert(!noexcept(*std::declval>())); + ASSERT_NOT_NOEXCEPT(*std::declval>()); ASSERT_SAME_TYPE(int, decltype(*std::declval().begin())); } { @@ -39,7 +39,7 @@ using View = std::ranges::transform_view; View transformView(MoveOnlyView{buff}, PlusOneNoexcept{}); assert(*transformView.begin() == 1); - static_assert(noexcept(*std::declval>())); + LIBCPP_ASSERT_NOEXCEPT(*std::declval>()); ASSERT_SAME_TYPE(int, decltype(*std::declval().begin())); } { @@ -47,7 +47,7 @@ using View = std::ranges::transform_view; View transformView(MoveOnlyView{buff}, Increment{}); assert(*transformView.begin() == 1); - static_assert(!noexcept(*std::declval>())); + ASSERT_NOT_NOEXCEPT(*std::declval>()); ASSERT_SAME_TYPE(int&, decltype(*std::declval().begin())); } { @@ -55,7 +55,7 @@ using View = std::ranges::transform_view; View transformView(MoveOnlyView{buff}, IncrementRvalueRef{}); assert(*transformView.begin() == 1); - static_assert(!noexcept(*std::declval>())); + ASSERT_NOT_NOEXCEPT(*std::declval>()); ASSERT_SAME_TYPE(int&&, decltype(*std::declval().begin())); } diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/iter_move.pass.cpp @@ -24,7 +24,7 @@ { std::ranges::transform_view transformView(MoveOnlyView{buff}, PlusOneMutable{}); auto iter = transformView.begin(); - static_assert(!noexcept(std::ranges::iter_move(iter))); + ASSERT_NOT_NOEXCEPT(std::ranges::iter_move(iter)); assert(std::ranges::iter_move(iter) == 1); assert(std::ranges::iter_move(iter + 2) == 3); @@ -34,10 +34,10 @@ } { - static_assert( noexcept(std::ranges::iter_move( - std::declval>&>()))); - static_assert(!noexcept(std::ranges::iter_move( - std::declval>&>()))); + LIBCPP_ASSERT_NOEXCEPT(std::ranges::iter_move( + std::declval>&>())); + ASSERT_NOT_NOEXCEPT(std::ranges::iter_move( + std::declval>&>())); } return true; diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp @@ -24,10 +24,10 @@ assert(iter1[0] == 2); assert(iter1[4] == 6); - static_assert(!noexcept( - std::declval>>()[0])); - static_assert( noexcept( - std::declval>>()[0])); + ASSERT_NOT_NOEXCEPT( + std::declval>>()[0]); + LIBCPP_ASSERT_NOEXCEPT( + std::declval>>()[0]); ASSERT_SAME_TYPE( int, diff --git a/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp b/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp --- a/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp +++ b/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp @@ -191,8 +191,8 @@ BoolConvertibleComparison boolConv; BoolConvertibleComparison boolConv2; - static_assert(noexcept(boolConv.empty())); - static_assert(!noexcept(boolConv2.empty())); + LIBCPP_ASSERT_NOEXCEPT(boolConv.empty()); + ASSERT_NOT_NOEXCEPT(boolConv2.empty()); assert(!boolConv.empty()); assert(!static_cast const&>(boolConv).empty());