Skip to content

Commit 645f94f

Browse files
H-G-HristovH-G-Hristov
committed
Try again
1 parent 066872d commit 645f94f

File tree

5 files changed

+22
-47
lines changed

5 files changed

+22
-47
lines changed

‎libcxx/docs/FeatureTestMacroTable.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Status
394394
---------------------------------------------------------- -----------------
395395
``__cpp_lib_reference_from_temporary`` *unimplemented*
396396
---------------------------------------------------------- -----------------
397-
``__cpp_lib_spanstream`` *unimplemented*
397+
``__cpp_lib_spanstream`` ``202106L``
398398
---------------------------------------------------------- -----------------
399399
``__cpp_lib_stacktrace`` *unimplemented*
400400
---------------------------------------------------------- -----------------

‎libcxx/include/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ __cpp_lib_void_t 201411L <type_traits>
530530
# define __cpp_lib_ranges_to_container 202202L
531531
// # define __cpp_lib_ranges_zip 202110L
532532
// # define __cpp_lib_reference_from_temporary 202202L
533-
// # define __cpp_lib_spanstream 202106L
533+
# define __cpp_lib_spanstream 202106L
534534
// # define __cpp_lib_stacktrace 202011L
535535
# define __cpp_lib_stdatomic_h 202011L
536536
# define __cpp_lib_string_contains 202011L

‎libcxx/test/std/language.support/support.limits/support.limits.general/spanstream.version.compile.pass.cpp

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,32 +46,20 @@
4646

4747
#elif TEST_STD_VER == 23
4848

49-
# if !defined(_LIBCPP_VERSION)
50-
# ifndef __cpp_lib_spanstream
51-
# error "__cpp_lib_spanstream should be defined in c++23"
52-
# endif
53-
# if __cpp_lib_spanstream != 202106L
54-
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
55-
# endif
56-
# else
57-
# ifdef __cpp_lib_spanstream
58-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
59-
# endif
49+
# ifndef __cpp_lib_spanstream
50+
# error "__cpp_lib_spanstream should be defined in c++23"
51+
# endif
52+
# if __cpp_lib_spanstream != 202106L
53+
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
6054
# endif
6155

6256
#elif TEST_STD_VER > 23
6357

64-
# if !defined(_LIBCPP_VERSION)
65-
# ifndef __cpp_lib_spanstream
66-
# error "__cpp_lib_spanstream should be defined in c++26"
67-
# endif
68-
# if __cpp_lib_spanstream != 202106L
69-
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
70-
# endif
71-
# else
72-
# ifdef __cpp_lib_spanstream
73-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
74-
# endif
58+
# ifndef __cpp_lib_spanstream
59+
# error "__cpp_lib_spanstream should be defined in c++26"
60+
# endif
61+
# if __cpp_lib_spanstream != 202106L
62+
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
7563
# endif
7664

7765
#endif // TEST_STD_VER > 23

‎libcxx/test/std/language.support/support.limits/support.limits.general/version.version.compile.pass.cpp

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5913,17 +5913,11 @@
59135913
# error "__cpp_lib_span_initializer_list should not be defined before c++26"
59145914
# endif
59155915

5916-
# if !defined(_LIBCPP_VERSION)
5917-
# ifndef __cpp_lib_spanstream
5918-
# error "__cpp_lib_spanstream should be defined in c++23"
5919-
# endif
5920-
# if __cpp_lib_spanstream != 202106L
5921-
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
5922-
# endif
5923-
# else
5924-
# ifdef __cpp_lib_spanstream
5925-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
5926-
# endif
5916+
# ifndef __cpp_lib_spanstream
5917+
# error "__cpp_lib_spanstream should be defined in c++23"
5918+
# endif
5919+
# if __cpp_lib_spanstream != 202106L
5920+
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
59275921
# endif
59285922

59295923
# ifndef __cpp_lib_ssize
@@ -7879,17 +7873,11 @@
78797873
# error "__cpp_lib_span_initializer_list should have the value 202311L in c++26"
78807874
# endif
78817875

7882-
# if !defined(_LIBCPP_VERSION)
7883-
# ifndef __cpp_lib_spanstream
7884-
# error "__cpp_lib_spanstream should be defined in c++26"
7885-
# endif
7886-
# if __cpp_lib_spanstream != 202106L
7887-
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
7888-
# endif
7889-
# else
7890-
# ifdef __cpp_lib_spanstream
7891-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
7892-
# endif
7876+
# ifndef __cpp_lib_spanstream
7877+
# error "__cpp_lib_spanstream should be defined in c++26"
7878+
# endif
7879+
# if __cpp_lib_spanstream != 202106L
7880+
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
78937881
# endif
78947882

78957883
# ifndef __cpp_lib_ssize

‎libcxx/utils/generate_feature_test_macro_components.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,6 @@ def add_version_header(tc):
12971297
"name": "__cpp_lib_spanstream",
12981298
"values": {"c++23": 202106},
12991299
"headers": ["spanstream"],
1300-
"unimplemented": True,
13011300
},
13021301
{
13031302
"name": "__cpp_lib_ssize",

0 commit comments

Comments
 (0)