Skip to content

Commit eb0f121

Browse files
ldionneldionne
authored
[libc++][modules] Tweak a few includes (#107467)
Add a few missing includes, remove two unnecessary ones and use __cstddef/size_t.h instead of <cstddef> in a few places. This is a collection of miscellaneous findings that collectively unblock other modularization patches.
1 parent d4d4e77 commit eb0f121

File tree

18 files changed

+17
-32
lines changed

18 files changed

+17
-32
lines changed

‎libcxx/include/__math/copysign.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <__type_traits/enable_if.h>
1414
#include <__type_traits/is_arithmetic.h>
1515
#include <__type_traits/promote.h>
16-
#include <limits>
1716

1817
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1918
# pragma GCC system_header

‎libcxx/include/__math/remainder.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <__type_traits/is_arithmetic.h>
1515
#include <__type_traits/is_same.h>
1616
#include <__type_traits/promote.h>
17-
#include <limits>
1817

1918
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2019
# pragma GCC system_header

‎libcxx/include/__tuple/find_index.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_FIND_INDEX_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__type_traits/is_same.h>
14-
#include <cstddef>
1515

1616
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1717
# pragma GCC system_header

‎libcxx/include/__tuple/make_tuple_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__fwd/array.h>
1415
#include <__fwd/tuple.h>
1516
#include <__tuple/tuple_element.h>
@@ -19,7 +20,6 @@
1920
#include <__type_traits/copy_cvref.h>
2021
#include <__type_traits/remove_cv.h>
2122
#include <__type_traits/remove_reference.h>
22-
#include <cstddef>
2323

2424
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2525
# pragma GCC system_header

‎libcxx/include/__tuple/sfinae_helpers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#define _LIBCPP___TUPLE_SFINAE_HELPERS_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__fwd/tuple.h>
1415
#include <__tuple/make_tuple_types.h>
1516
#include <__tuple/tuple_element.h>
@@ -23,7 +24,6 @@
2324
#include <__type_traits/is_same.h>
2425
#include <__type_traits/remove_cvref.h>
2526
#include <__type_traits/remove_reference.h>
26-
#include <cstddef>
2727

2828
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2929
# pragma GCC system_header

‎libcxx/include/__tuple/tuple_element.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__tuple/tuple_indices.h>
1415
#include <__tuple/tuple_types.h>
15-
#include <cstddef>
1616

1717
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1818
# pragma GCC system_header

‎libcxx/include/__tuple/tuple_indices.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__utility/integer_sequence.h>
14-
#include <cstddef>
1515

1616
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
1717
# pragma GCC system_header

‎libcxx/include/__tuple/tuple_like_ext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
#define _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__fwd/array.h>
1415
#include <__fwd/pair.h>
1516
#include <__fwd/tuple.h>
1617
#include <__tuple/tuple_types.h>
1718
#include <__type_traits/integral_constant.h>
18-
#include <cstddef>
1919

2020
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2121
# pragma GCC system_header

‎libcxx/include/__tuple/tuple_like_no_subrange.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#define _LIBCPP___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__fwd/array.h>
1415
#include <__fwd/complex.h>
1516
#include <__fwd/pair.h>
1617
#include <__fwd/tuple.h>
1718
#include <__tuple/tuple_size.h>
1819
#include <__type_traits/remove_cvref.h>
19-
#include <cstddef>
2020

2121
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2222
# pragma GCC system_header

‎libcxx/include/__tuple/tuple_size.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#define _LIBCPP___TUPLE_TUPLE_SIZE_H
1111

1212
#include <__config>
13+
#include <__cstddef/size_t.h>
1314
#include <__fwd/tuple.h>
1415
#include <__tuple/tuple_types.h>
1516
#include <__type_traits/enable_if.h>
1617
#include <__type_traits/integral_constant.h>
1718
#include <__type_traits/is_const.h>
1819
#include <__type_traits/is_volatile.h>
19-
#include <cstddef>
2020

2121
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
2222
# pragma GCC system_header

‎libcxx/include/future

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
369369
# include <__assert>
370370
# include <__chrono/duration.h>
371371
# include <__chrono/time_point.h>
372+
# include <__condition_variable/condition_variable.h>
372373
# include <__exception/exception_ptr.h>
373374
# include <__memory/addressof.h>
374375
# include <__memory/allocator.h>

‎libcxx/include/variant

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,9 @@ namespace std {
233233
#include <__type_traits/conjunction.h>
234234
#include <__type_traits/dependent_type.h>
235235
#include <__type_traits/is_array.h>
236+
#include <__type_traits/is_assignable.h>
236237
#include <__type_traits/is_constructible.h>
238+
#include <__type_traits/is_convertible.h>
237239
#include <__type_traits/is_destructible.h>
238240
#include <__type_traits/is_nothrow_assignable.h>
239241
#include <__type_traits/is_nothrow_constructible.h>

‎libcxx/test/libcxx/transitive_includes/cxx11.csv

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,9 @@ future atomic
354354
future cerrno
355355
future chrono
356356
future cstddef
357-
future cstdint
358357
future cstdlib
359-
future cstring
358+
future ctime
360359
future exception
361-
future initializer_list
362360
future iosfwd
363361
future limits
364362
future mutex
@@ -369,7 +367,6 @@ future string
369367
future system_error
370368
future thread
371369
future type_traits
372-
future typeinfo
373370
future version
374371
initializer_list cstddef
375372
iomanip istream

‎libcxx/test/libcxx/transitive_includes/cxx14.csv

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,9 @@ future atomic
357357
future cerrno
358358
future chrono
359359
future cstddef
360-
future cstdint
361360
future cstdlib
362-
future cstring
361+
future ctime
363362
future exception
364-
future initializer_list
365363
future iosfwd
366364
future limits
367365
future mutex
@@ -372,7 +370,6 @@ future string
372370
future system_error
373371
future thread
374372
future type_traits
375-
future typeinfo
376373
future version
377374
initializer_list cstddef
378375
iomanip istream

‎libcxx/test/libcxx/transitive_includes/cxx17.csv

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,9 @@ future atomic
357357
future cerrno
358358
future chrono
359359
future cstddef
360-
future cstdint
361360
future cstdlib
362-
future cstring
361+
future ctime
363362
future exception
364-
future initializer_list
365363
future iosfwd
366364
future limits
367365
future mutex
@@ -372,7 +370,6 @@ future string
372370
future system_error
373371
future thread
374372
future type_traits
375-
future typeinfo
376373
future version
377374
initializer_list cstddef
378375
iomanip istream

‎libcxx/test/libcxx/transitive_includes/cxx20.csv

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,9 @@ functional version
364364
future atomic
365365
future cerrno
366366
future cstddef
367-
future cstdint
368367
future cstdlib
369-
future cstring
368+
future ctime
370369
future exception
371-
future initializer_list
372370
future iosfwd
373371
future limits
374372
future mutex
@@ -379,7 +377,6 @@ future string
379377
future system_error
380378
future thread
381379
future type_traits
382-
future typeinfo
383380
future version
384381
initializer_list cstddef
385382
iomanip istream

‎libcxx/test/libcxx/transitive_includes/cxx23.csv

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ functional vector
238238
functional version
239239
future cerrno
240240
future cstddef
241-
future cstdint
242241
future cstdlib
243-
future cstring
244-
future initializer_list
242+
future ctime
245243
future limits
246244
future mutex
247245
future new

‎libcxx/test/libcxx/transitive_includes/cxx26.csv

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,8 @@ functional vector
238238
functional version
239239
future cerrno
240240
future cstddef
241-
future cstdint
242241
future cstdlib
243-
future cstring
244-
future initializer_list
242+
future ctime
245243
future limits
246244
future mutex
247245
future new

0 commit comments

Comments
 (0)