diff --git a/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.copy.pass.cpp b/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.copy.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.copy.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.copy.pass.cpp @@ -56,9 +56,7 @@ // Test: This constructor is trivial if // - is_trivially_copy_constructible_v is true and // - is_trivially_copy_constructible_v is true. -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_copy_constructible_v>); -#endif static_assert(!std::is_trivially_copy_constructible_v>); static_assert(!std::is_trivially_copy_constructible_v>); static_assert(!std::is_trivially_copy_constructible_v>); diff --git a/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.move.pass.cpp b/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.move.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.move.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.expected/ctor/ctor.move.pass.cpp @@ -62,9 +62,7 @@ // Test: This constructor is trivial if // - is_trivially_move_constructible_v is true and // - is_trivially_move_constructible_v is true. -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_move_constructible_v>); -#endif static_assert(!std::is_trivially_move_constructible_v>); static_assert(!std::is_trivially_move_constructible_v>); static_assert(!std::is_trivially_move_constructible_v>); diff --git a/libcxx/test/std/utilities/expected/expected.expected/dtor.pass.cpp b/libcxx/test/std/utilities/expected/expected.expected/dtor.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.expected/dtor.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.expected/dtor.pass.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "test_macros.h" @@ -30,9 +31,7 @@ ~NonTrivial() {} }; -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_destructible_v>); -#endif static_assert(!std::is_trivially_destructible_v>); static_assert(!std::is_trivially_destructible_v>); static_assert(!std::is_trivially_destructible_v>); @@ -62,6 +61,8 @@ } int main(int, char**) { + std::expected, int> a = std::make_unique(42); + test(); static_assert(test()); return 0; diff --git a/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.copy.pass.cpp b/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.copy.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.copy.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.copy.pass.cpp @@ -43,9 +43,7 @@ static_assert(!std::is_copy_constructible_v>); // Test: This constructor is trivial if is_trivially_copy_constructible_v is true. -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_copy_constructible_v>); -#endif static_assert(!std::is_trivially_copy_constructible_v>); constexpr bool test() { diff --git a/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.move.pass.cpp b/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.move.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.move.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.void/ctor/ctor.move.pass.cpp @@ -48,9 +48,7 @@ static_assert(!std::is_move_constructible_v>); // Test: This constructor is trivial if is_trivially_move_constructible_v is true. -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_move_constructible_v>); -#endif static_assert(!std::is_trivially_move_constructible_v>); // Test: noexcept(is_nothrow_move_constructible_v) diff --git a/libcxx/test/std/utilities/expected/expected.void/dtor.pass.cpp b/libcxx/test/std/utilities/expected/expected.void/dtor.pass.cpp --- a/libcxx/test/std/utilities/expected/expected.void/dtor.pass.cpp +++ b/libcxx/test/std/utilities/expected/expected.void/dtor.pass.cpp @@ -27,9 +27,7 @@ ~NonTrivial() {} }; -#if __cpp_concepts >= 202002 static_assert(std::is_trivially_destructible_v>); -#endif static_assert(!std::is_trivially_destructible_v>); struct TrackedDestroy {