feature macros

vinay-deshmukh · vinay-deshmukh · commit c1b827d8ec1e · 2025-06-19T15:47:34.000-04:00
diff --git a/libcxx/docs/FeatureTestMacroTable.rst b/libcxx/docs/FeatureTestMacroTable.rst
@@ -420,12 +420,12 @@ Status
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_algorithms``                         ``202306L``
     ---------------------------------------------------------- -----------------
-    ``__cpp_lib_constexpr_map``                                ``202502L``
-    ---------------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_forward_list``                       ``202502L``
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_list``                               ``202502L``
     ---------------------------------------------------------- -----------------
+    ``__cpp_lib_constexpr_map``                                ``202502L``
+    ---------------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_new``                                ``202406L``
     ---------------------------------------------------------- -----------------
     ``__cpp_lib_constexpr_queue``                              ``202502L``
diff --git a/libcxx/include/version b/libcxx/include/version
@@ -548,6 +548,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_constexpr_algorithms                 202306L
 # define __cpp_lib_constexpr_forward_list               202502L
 # define __cpp_lib_constexpr_list                       202502L
+# define __cpp_lib_constexpr_map                        202502L
 # if !defined(_LIBCPP_ABI_VCRUNTIME)
 #   define __cpp_lib_constexpr_new                      202406L
 # endif
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
@@ -373,14 +373,14 @@ def add_version_header(tc):
             "headers": ["iterator"],
         },
         {
-            "name": "__cpp_lib_constexpr_map",
+            "name": "__cpp_lib_constexpr_list",
             "values": {"c++26": 202502},
-            "headers": ["map"],
+            "headers": ["list"],
         },
         {
-            "name": "__cpp_lib_constexpr_list",
+            "name": "__cpp_lib_constexpr_map",
             "values": {"c++26": 202502},
-            "headers": ["list"],
+            "headers": ["map"],
         },
         {
             "name": "__cpp_lib_constexpr_memory",

Original file line number	Diff line number	Diff line change
`@@ -373,14 +373,14 @@ def add_version_header(tc):`
`373`	`373`	`"headers": ["iterator"],`
`374`	`374`	`},`
`375`	`375`	`{`
`376`		`- "name": "__cpp_lib_constexpr_map",`
	`376`	`+ "name": "__cpp_lib_constexpr_list",`
`377`	`377`	`"values": {"c++26": 202502},`
`378`		`- "headers": ["map"],`
	`378`	`+ "headers": ["list"],`
`379`	`379`	`},`
`380`	`380`	`{`
`381`		`- "name": "__cpp_lib_constexpr_list",`
	`381`	`+ "name": "__cpp_lib_constexpr_map",`
`382`	`382`	`"values": {"c++26": 202502},`
`383`		`- "headers": ["list"],`
	`383`	`+ "headers": ["map"],`
`384`	`384`	`},`
`385`	`385`	`{`
`386`	`386`	`"name": "__cpp_lib_constexpr_memory",`