[libc++] Update the value of __cpp_lib_constrained_equality after P3379R0 (#144553)
https://wg21.link/P3379R0 updated the value of __cpp_lib_constrained_equality, but we forgot to update it when we implemented the paper.
This commit is contained in:
parent
edbaf19c46
commit
945ce1aa3d
@ -83,8 +83,8 @@ __cpp_lib_constexpr_tuple 201811L <tuple>
|
|||||||
__cpp_lib_constexpr_typeinfo 202106L <typeinfo>
|
__cpp_lib_constexpr_typeinfo 202106L <typeinfo>
|
||||||
__cpp_lib_constexpr_utility 201811L <utility>
|
__cpp_lib_constexpr_utility 201811L <utility>
|
||||||
__cpp_lib_constexpr_vector 201907L <vector>
|
__cpp_lib_constexpr_vector 201907L <vector>
|
||||||
__cpp_lib_constrained_equality 202403L <optional> <tuple> <utility>
|
__cpp_lib_constrained_equality 202411L <expected> <optional> <tuple>
|
||||||
<variant>
|
<utility> <variant>
|
||||||
__cpp_lib_containers_ranges 202202L <deque> <forward_list> <list>
|
__cpp_lib_containers_ranges 202202L <deque> <forward_list> <list>
|
||||||
<map> <queue> <set>
|
<map> <queue> <set>
|
||||||
<stack> <string> <unordered_map>
|
<stack> <string> <unordered_map>
|
||||||
@ -551,7 +551,7 @@ __cpp_lib_void_t 201411L <type_traits>
|
|||||||
# define __cpp_lib_constexpr_new 202406L
|
# define __cpp_lib_constexpr_new 202406L
|
||||||
# endif
|
# endif
|
||||||
# define __cpp_lib_constexpr_queue 202502L
|
# define __cpp_lib_constexpr_queue 202502L
|
||||||
// # define __cpp_lib_constrained_equality 202403L
|
// # define __cpp_lib_constrained_equality 202411L
|
||||||
// # define __cpp_lib_copyable_function 202306L
|
// # define __cpp_lib_copyable_function 202306L
|
||||||
// # define __cpp_lib_debugging 202311L
|
// # define __cpp_lib_debugging 202311L
|
||||||
// # define __cpp_lib_default_template_type_for_algorithm_values 202403L
|
// # define __cpp_lib_default_template_type_for_algorithm_values 202403L
|
||||||
|
@ -20,6 +20,10 @@
|
|||||||
|
|
||||||
#if TEST_STD_VER < 14
|
#if TEST_STD_VER < 14
|
||||||
|
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined before c++26"
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef __cpp_lib_expected
|
# ifdef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should not be defined before c++23"
|
# error "__cpp_lib_expected should not be defined before c++23"
|
||||||
# endif
|
# endif
|
||||||
@ -30,6 +34,10 @@
|
|||||||
|
|
||||||
#elif TEST_STD_VER == 14
|
#elif TEST_STD_VER == 14
|
||||||
|
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined before c++26"
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef __cpp_lib_expected
|
# ifdef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should not be defined before c++23"
|
# error "__cpp_lib_expected should not be defined before c++23"
|
||||||
# endif
|
# endif
|
||||||
@ -40,6 +48,10 @@
|
|||||||
|
|
||||||
#elif TEST_STD_VER == 17
|
#elif TEST_STD_VER == 17
|
||||||
|
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined before c++26"
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef __cpp_lib_expected
|
# ifdef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should not be defined before c++23"
|
# error "__cpp_lib_expected should not be defined before c++23"
|
||||||
# endif
|
# endif
|
||||||
@ -50,6 +62,10 @@
|
|||||||
|
|
||||||
#elif TEST_STD_VER == 20
|
#elif TEST_STD_VER == 20
|
||||||
|
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined before c++26"
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef __cpp_lib_expected
|
# ifdef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should not be defined before c++23"
|
# error "__cpp_lib_expected should not be defined before c++23"
|
||||||
# endif
|
# endif
|
||||||
@ -60,6 +76,10 @@
|
|||||||
|
|
||||||
#elif TEST_STD_VER == 23
|
#elif TEST_STD_VER == 23
|
||||||
|
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined before c++26"
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifndef __cpp_lib_expected
|
# ifndef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should be defined in c++23"
|
# error "__cpp_lib_expected should be defined in c++23"
|
||||||
# endif
|
# endif
|
||||||
@ -73,6 +93,19 @@
|
|||||||
|
|
||||||
#elif TEST_STD_VER > 23
|
#elif TEST_STD_VER > 23
|
||||||
|
|
||||||
|
# if !defined(_LIBCPP_VERSION)
|
||||||
|
# ifndef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
|
# endif
|
||||||
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
|
# endif
|
||||||
|
# else
|
||||||
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
# error "__cpp_lib_constrained_equality should not be defined because it is unimplemented in libc++!"
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifndef __cpp_lib_expected
|
# ifndef __cpp_lib_expected
|
||||||
# error "__cpp_lib_expected should be defined in c++26"
|
# error "__cpp_lib_expected should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
|
@ -123,8 +123,8 @@
|
|||||||
# ifndef __cpp_lib_constrained_equality
|
# ifndef __cpp_lib_constrained_equality
|
||||||
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
# if __cpp_lib_constrained_equality != 202403L
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
# error "__cpp_lib_constrained_equality should have the value 202403L in c++26"
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef __cpp_lib_constrained_equality
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
@ -274,8 +274,8 @@
|
|||||||
# ifndef __cpp_lib_constrained_equality
|
# ifndef __cpp_lib_constrained_equality
|
||||||
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
# if __cpp_lib_constrained_equality != 202403L
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
# error "__cpp_lib_constrained_equality should have the value 202403L in c++26"
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef __cpp_lib_constrained_equality
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
@ -405,8 +405,8 @@
|
|||||||
# ifndef __cpp_lib_constrained_equality
|
# ifndef __cpp_lib_constrained_equality
|
||||||
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
# if __cpp_lib_constrained_equality != 202403L
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
# error "__cpp_lib_constrained_equality should have the value 202403L in c++26"
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef __cpp_lib_constrained_equality
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
@ -103,8 +103,8 @@
|
|||||||
# ifndef __cpp_lib_constrained_equality
|
# ifndef __cpp_lib_constrained_equality
|
||||||
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
# if __cpp_lib_constrained_equality != 202403L
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
# error "__cpp_lib_constrained_equality should have the value 202403L in c++26"
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef __cpp_lib_constrained_equality
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
@ -6575,8 +6575,8 @@
|
|||||||
# ifndef __cpp_lib_constrained_equality
|
# ifndef __cpp_lib_constrained_equality
|
||||||
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
# error "__cpp_lib_constrained_equality should be defined in c++26"
|
||||||
# endif
|
# endif
|
||||||
# if __cpp_lib_constrained_equality != 202403L
|
# if __cpp_lib_constrained_equality != 202411L
|
||||||
# error "__cpp_lib_constrained_equality should have the value 202403L in c++26"
|
# error "__cpp_lib_constrained_equality should have the value 202411L in c++26"
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# ifdef __cpp_lib_constrained_equality
|
# ifdef __cpp_lib_constrained_equality
|
||||||
|
@ -431,8 +431,11 @@ feature_test_macros = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "__cpp_lib_constrained_equality",
|
"name": "__cpp_lib_constrained_equality",
|
||||||
"values": {"c++26": 202403}, # P2944R3: Comparisons for reference_wrapper
|
"values": {
|
||||||
"headers": ["optional", "tuple", "utility", "variant"],
|
# "c++26": 202403, # P2944R3: Comparisons for reference_wrapper
|
||||||
|
"c++26": 202411, # P3379R0: Constrain std::expected equality operators
|
||||||
|
},
|
||||||
|
"headers": ["expected", "optional", "tuple", "utility", "variant"],
|
||||||
"unimplemented": True,
|
"unimplemented": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user