Skip to content

Commit c626890

Browse files
H-G-HristovH-G-Hristov
committed
Try again
1 parent c6ed358 commit c626890

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
@@ -390,7 +390,7 @@ Status
390390
---------------------------------------------------------- -----------------
391391
``__cpp_lib_reference_from_temporary`` *unimplemented*
392392
---------------------------------------------------------- -----------------
393-
``__cpp_lib_spanstream`` *unimplemented*
393+
``__cpp_lib_spanstream`` ``202106L``
394394
---------------------------------------------------------- -----------------
395395
``__cpp_lib_stacktrace`` *unimplemented*
396396
---------------------------------------------------------- -----------------

‎libcxx/include/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ __cpp_lib_void_t 201411L <type_traits>
523523
# define __cpp_lib_ranges_to_container 202202L
524524
// # define __cpp_lib_ranges_zip 202110L
525525
// # define __cpp_lib_reference_from_temporary 202202L
526-
// # define __cpp_lib_spanstream 202106L
526+
# define __cpp_lib_spanstream 202106L
527527
// # define __cpp_lib_stacktrace 202011L
528528
# define __cpp_lib_stdatomic_h 202011L
529529
# 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
@@ -5807,17 +5807,11 @@
58075807
# error "__cpp_lib_span_initializer_list should not be defined before c++26"
58085808
# endif
58095809

5810-
# if !defined(_LIBCPP_VERSION)
5811-
# ifndef __cpp_lib_spanstream
5812-
# error "__cpp_lib_spanstream should be defined in c++23"
5813-
# endif
5814-
# if __cpp_lib_spanstream != 202106L
5815-
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
5816-
# endif
5817-
# else
5818-
# ifdef __cpp_lib_spanstream
5819-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
5820-
# endif
5810+
# ifndef __cpp_lib_spanstream
5811+
# error "__cpp_lib_spanstream should be defined in c++23"
5812+
# endif
5813+
# if __cpp_lib_spanstream != 202106L
5814+
# error "__cpp_lib_spanstream should have the value 202106L in c++23"
58215815
# endif
58225816

58235817
# ifndef __cpp_lib_ssize
@@ -7744,17 +7738,11 @@
77447738
# error "__cpp_lib_span_initializer_list should have the value 202311L in c++26"
77457739
# endif
77467740

7747-
# if !defined(_LIBCPP_VERSION)
7748-
# ifndef __cpp_lib_spanstream
7749-
# error "__cpp_lib_spanstream should be defined in c++26"
7750-
# endif
7751-
# if __cpp_lib_spanstream != 202106L
7752-
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
7753-
# endif
7754-
# else
7755-
# ifdef __cpp_lib_spanstream
7756-
# error "__cpp_lib_spanstream should not be defined because it is unimplemented in libc++!"
7757-
# endif
7741+
# ifndef __cpp_lib_spanstream
7742+
# error "__cpp_lib_spanstream should be defined in c++26"
7743+
# endif
7744+
# if __cpp_lib_spanstream != 202106L
7745+
# error "__cpp_lib_spanstream should have the value 202106L in c++26"
77587746
# endif
77597747

77607748
# 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
@@ -1270,7 +1270,6 @@ def add_version_header(tc):
12701270
"name": "__cpp_lib_spanstream",
12711271
"values": {"c++23": 202106},
12721272
"headers": ["spanstream"],
1273-
"unimplemented": True,
12741273
},
12751274
{
12761275
"name": "__cpp_lib_ssize",

0 commit comments

Comments
 (0)