Update __cpp_lib_concepts (#2559)

microsoft · Feb 12, 2022 · afe0800 · afe0800
1 parent 6a478bf
commit afe0800
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h
@@ -1277,7 +1277,7 @@
 #endif // __cpp_char8_t
 
 #if !defined(__EDG__) || defined(__INTELLISENSE__) // TRANSITION, EDG concepts support
-#define __cpp_lib_concepts 201907L
+#define __cpp_lib_concepts 202002L
 #endif // !defined(__EDG__) || defined(__INTELLISENSE__)
 
 #define __cpp_lib_constexpr_algorithms    201806L

diff --git a/tests/libcxx/expected_results.txt b/tests/libcxx/expected_results.txt
@@ -64,9 +64,6 @@ std/language.support/support.limits/support.limits.general/optional.version.pass
 # test emits warning C4310: cast truncates constant value
 std/numerics/bit/bitops.rot/rotl.pass.cpp:0 FAIL
 
-# libc++ doesn't yet implement P1754R1 or P1964R2, so it expects an old value for `__cpp_lib_concepts`
-std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp FAIL
-
 # Bogus test believes that optional<non_constexpr_destructor> cannot be a literal type
 std/utilities/optional/optional.object/optional.object.dtor/dtor.pass.cpp:0 FAIL
 

diff --git a/tests/libcxx/skipped_tests.txt b/tests/libcxx/skipped_tests.txt
@@ -64,9 +64,6 @@ language.support\support.limits\support.limits.general\optional.version.pass.cpp
 # test emits warning C4310: cast truncates constant value
 numerics\bit\bitops.rot\rotl.pass.cpp
 
-# libc++ doesn't yet implement P1754R1 or P1964R2, so it expects an old value for `__cpp_lib_concepts`
-language.support\support.limits\support.limits.general\concepts.version.pass.cpp
-
 # Bogus test believes that optional<non_constexpr_destructor> cannot be a literal type
 utilities\optional\optional.object\optional.object.dtor\dtor.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
@@ -433,10 +433,10 @@ STATIC_ASSERT(__cpp_lib_complex_udls == 201309L);
 #if _HAS_CXX20 && !defined(__EDG__) // TRANSITION, EDG concepts support
 #ifndef __cpp_lib_concepts
 #error __cpp_lib_concepts is not defined
-#elif __cpp_lib_concepts != 201907L
-#error __cpp_lib_concepts is not 201907L
+#elif __cpp_lib_concepts != 202002L
+#error __cpp_lib_concepts is not 202002L
 #else
-STATIC_ASSERT(__cpp_lib_concepts == 201907L);
+STATIC_ASSERT(__cpp_lib_concepts == 202002L);
 #endif
 #else
 #ifdef __cpp_lib_concepts