diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 2e8d22b23d7..d8529e0e632 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -208,6 +208,7 @@ // P1456R1 Move-Only Views // P1474R1 Helpful Pointers For contiguous_iterator // P1612R1 Relocating endian To +// P1614R2 Adding Spaceship <=> To The Library // P1645R1 constexpr For Algorithms // P1651R0 bind_front() Should Not Unwrap reference_wrapper // P1690R1 Refining Heterogeneous Lookup For Unordered Containers @@ -1248,7 +1249,7 @@ #define __cpp_lib_starts_ends_with 201711L #ifdef __cpp_lib_concepts // TRANSITION, GH-395 -#define __cpp_lib_three_way_comparison 201711L +#define __cpp_lib_three_way_comparison 201907L #endif // __cpp_lib_concepts #define __cpp_lib_to_address 201711L diff --git a/tests/libcxx/expected_results.txt b/tests/libcxx/expected_results.txt index 24c698b3d62..c0d3f0eac74 100644 --- a/tests/libcxx/expected_results.txt +++ b/tests/libcxx/expected_results.txt @@ -320,9 +320,6 @@ std/language.support/support.limits/support.limits.general/functional.version.pa std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp FAIL std/language.support/support.limits/support.limits.general/memory.version.pass.cpp FAIL -# C++20 P1614R2 "Adding Spaceship <=> To The Library" -std/language.support/support.limits/support.limits.general/compare.version.pass.cpp FAIL - # C++23 P1048R1 "is_scoped_enum" std/utilities/meta/meta.unary/meta.unary.prop/is_scoped_enum.pass.cpp FAIL diff --git a/tests/libcxx/skipped_tests.txt b/tests/libcxx/skipped_tests.txt index 4556745fa3e..0bbc0048e30 100644 --- a/tests/libcxx/skipped_tests.txt +++ b/tests/libcxx/skipped_tests.txt @@ -320,9 +320,6 @@ language.support\support.limits\support.limits.general\functional.version.pass.c language.support\support.limits\support.limits.general\iterator.version.pass.cpp language.support\support.limits\support.limits.general\memory.version.pass.cpp -# C++20 P1614R2 "Adding Spaceship <=> To The Library" -language.support\support.limits\support.limits.general\compare.version.pass.cpp - # C++23 P1048R1 "is_scoped_enum" utilities\meta\meta.unary\meta.unary.prop\is_scoped_enum.pass.cpp diff --git a/tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp b/tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp index f4ab60d8fcc..5aed20cb2f6 100644 --- a/tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp +++ b/tests/std/tests/VSO_0157762_feature_test_macros/test.compile.pass.cpp @@ -1406,10 +1406,10 @@ STATIC_ASSERT(__cpp_lib_string_view == 201803L); #if _HAS_CXX20 && defined(__cpp_lib_concepts) // TRANSITION, GH-395 #ifndef __cpp_lib_three_way_comparison #error __cpp_lib_three_way_comparison is not defined -#elif __cpp_lib_three_way_comparison != 201711L -#error __cpp_lib_three_way_comparison is not 201711L +#elif __cpp_lib_three_way_comparison != 201907L +#error __cpp_lib_three_way_comparison is not 201907L #else -STATIC_ASSERT(__cpp_lib_three_way_comparison == 201711L); +STATIC_ASSERT(__cpp_lib_three_way_comparison == 201907L); #endif #else #ifdef __cpp_lib_three_way_comparison