Skip to content

Commit 9ff9e69

Browse files
committed
Enable moving monostate from C++17
1 parent 2d4b99c commit 9ff9e69

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

libcxx/include/utility

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ 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>
270271
# endif
271272

272273
# if _LIBCPP_STD_VER >= 20
@@ -279,10 +280,6 @@ template <class T>
279280
# include <__utility/unreachable.h>
280281
# endif
281282

282-
# if _LIBCPP_STD_VER >= 26
283-
# include <__variant/monostate.h>
284-
# endif
285-
286283
# include <version>
287284

288285
// standard-mandated includes

libcxx/test/libcxx/transitive_includes/cxx17.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ experimental/utility compare
640640
experimental/utility cstddef
641641
experimental/utility cstdint
642642
experimental/utility cstdlib
643+
experimental/utility cstring
643644
experimental/utility initializer_list
644645
experimental/utility iosfwd
645646
experimental/utility limits
@@ -2501,6 +2502,7 @@ utility compare
25012502
utility cstddef
25022503
utility cstdint
25032504
utility cstdlib
2505+
utility cstring
25042506
utility initializer_list
25052507
utility iosfwd
25062508
utility limits

libcxx/test/libcxx/transitive_includes/cxx20.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ experimental/utility compare
636636
experimental/utility cstddef
637637
experimental/utility cstdint
638638
experimental/utility cstdlib
639+
experimental/utility cstring
639640
experimental/utility initializer_list
640641
experimental/utility iosfwd
641642
experimental/utility limits
@@ -2529,6 +2530,7 @@ utility compare
25292530
utility cstddef
25302531
utility cstdint
25312532
utility cstdlib
2533+
utility cstring
25322534
utility initializer_list
25332535
utility iosfwd
25342536
utility limits

libcxx/test/libcxx/transitive_includes/cxx23.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ experimental/type_traits type_traits
301301
experimental/type_traits version
302302
experimental/utility compare
303303
experimental/utility cstdint
304+
experimental/utility cstring
304305
experimental/utility initializer_list
305306
experimental/utility limits
306307
experimental/utility utility
@@ -1116,6 +1117,7 @@ unordered_set tuple
11161117
unordered_set version
11171118
utility compare
11181119
utility cstdint
1120+
utility cstring
11191121
utility initializer_list
11201122
utility limits
11211123
utility version

libcxx/test/std/utilities/utility/utility.monostate.relpos/relops.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, c++23
9+
// REQUIRES: std-at-least-c++17
1010

1111
// <utility>
1212

libcxx/test/std/utilities/utility/utility.monostate/monostate.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
//===----------------------------------------------------------------------===//
99

10-
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20, c++23
10+
// REQUIRES: std-at-least-c++17
1111

1212
// <utility>
1313

0 commit comments

Comments
 (0)