Skip to content

Commit 7ee3ea6

Browse files
committed
Put std::monostate in C++26 and above
1 parent 1f90241 commit 7ee3ea6

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

libcxx/include/utility

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ template <class T>
267267
# if _LIBCPP_STD_VER >= 17
268268
# include <__utility/as_const.h>
269269
# include <__utility/in_place.h>
270-
# include <__variant/monostate.h>
271270
# endif
272271

273272
# if _LIBCPP_STD_VER >= 20
@@ -280,6 +279,10 @@ template <class T>
280279
# include <__utility/unreachable.h>
281280
# endif
282281

282+
# if _LIBCPP_STD_VER >= 26
283+
# include <__variant/monostate.h>
284+
# endif
285+
283286
# include <version>
284287

285288
// standard-mandated includes

libcxx/test/libcxx/transitive_includes/cxx17.csv

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,6 @@ experimental/utility compare
640640
experimental/utility cstddef
641641
experimental/utility cstdint
642642
experimental/utility cstdlib
643-
experimental/utility cstring
644643
experimental/utility initializer_list
645644
experimental/utility iosfwd
646645
experimental/utility limits
@@ -2390,7 +2389,6 @@ tuple compare
23902389
tuple cstddef
23912390
tuple cstdint
23922391
tuple cstdlib
2393-
tuple cstring
23942392
tuple exception
23952393
tuple initializer_list
23962394
tuple iosfwd
@@ -2407,7 +2405,6 @@ typeindex compare
24072405
typeindex cstddef
24082406
typeindex cstdint
24092407
typeindex cstdlib
2410-
typeindex cstring
24112408
typeindex initializer_list
24122409
typeindex iosfwd
24132410
typeindex limits
@@ -2504,7 +2501,6 @@ utility compare
25042501
utility cstddef
25052502
utility cstdint
25062503
utility cstdlib
2507-
utility cstring
25082504
utility initializer_list
25092505
utility iosfwd
25102506
utility limits

libcxx/test/libcxx/transitive_includes/cxx20.csv

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ experimental/utility compare
636636
experimental/utility cstddef
637637
experimental/utility cstdint
638638
experimental/utility cstdlib
639-
experimental/utility cstring
640639
experimental/utility initializer_list
641640
experimental/utility iosfwd
642641
experimental/utility limits
@@ -2418,7 +2417,6 @@ tuple compare
24182417
tuple cstddef
24192418
tuple cstdint
24202419
tuple cstdlib
2421-
tuple cstring
24222420
tuple exception
24232421
tuple initializer_list
24242422
tuple iosfwd
@@ -2435,7 +2433,6 @@ typeindex compare
24352433
typeindex cstddef
24362434
typeindex cstdint
24372435
typeindex cstdlib
2438-
typeindex cstring
24392436
typeindex initializer_list
24402437
typeindex iosfwd
24412438
typeindex limits
@@ -2532,7 +2529,6 @@ utility compare
25322529
utility cstddef
25332530
utility cstdint
25342531
utility cstdlib
2535-
utility cstring
25362532
utility initializer_list
25372533
utility iosfwd
25382534
utility limits

libcxx/test/libcxx/transitive_includes/cxx23.csv

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ experimental/type_traits type_traits
301301
experimental/type_traits version
302302
experimental/utility compare
303303
experimental/utility cstdint
304-
experimental/utility cstring
305304
experimental/utility initializer_list
306305
experimental/utility limits
307306
experimental/utility utility
@@ -1117,7 +1116,6 @@ unordered_set tuple
11171116
unordered_set version
11181117
utility compare
11191118
utility cstdint
1120-
utility cstring
11211119
utility initializer_list
11221120
utility limits
11231121
utility version

0 commit comments

Comments
 (0)