Skip to content

Commit 68b45cf

Browse files
ldionneAlexisPerry
ldionne
authored and
AlexisPerry
committed
[libc++][NFC] Run clang-format on libcxx/include again (llvm#95874)
As time went by, a few files have become mis-formatted w.r.t. clang-format. This was made worse by the fact that formatting was not being enforced in extensionless headers. This commit simply brings all of libcxx/include in-line with clang-format again. We might have to do this from time to time as we update our clang-format version, but frankly this is really low effort now that we've formatted everything once.
1 parent 6ddea64 commit 68b45cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+548
-522
lines changed

‎libcxx/include/__algorithm/comp_ref_type.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ struct __debug_less {
4141
}
4242

4343
template <class _LHS, class _RHS>
44-
_LIBCPP_CONSTEXPR_SINCE_CXX14 inline _LIBCPP_HIDE_FROM_ABI decltype((void)std::declval<_Compare&>()(
45-
std::declval<_LHS&>(), std::declval<_RHS&>()))
46-
__do_compare_assert(int, _LHS& __l, _RHS& __r) {
44+
_LIBCPP_CONSTEXPR_SINCE_CXX14 inline
45+
_LIBCPP_HIDE_FROM_ABI decltype((void)std::declval<_Compare&>()(std::declval<_LHS&>(), std::declval<_RHS&>()))
46+
__do_compare_assert(int, _LHS& __l, _RHS& __r) {
4747
_LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(!__comp_(__l, __r), "Comparator does not induce a strict weak ordering");
4848
(void)__l;
4949
(void)__r;

‎libcxx/include/__algorithm/make_projected.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ struct _ProjectedPred {
3636
: __pred(__pred_arg), __proj(__proj_arg) {}
3737

3838
template <class _Tp>
39-
typename __invoke_of<_Pred&, decltype(std::__invoke(std::declval<_Proj&>(), std::declval<_Tp>())) >::
40-
type _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI
39+
typename __invoke_of<_Pred&, decltype(std::__invoke(std::declval<_Proj&>(), std::declval<_Tp>()))>::type
40+
_LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI
4141
operator()(_Tp&& __v) const {
4242
return std::__invoke(__pred, std::__invoke(__proj, std::forward<_Tp>(__v)));
4343
}
4444

4545
template <class _T1, class _T2>
4646
typename __invoke_of<_Pred&,
4747
decltype(std::__invoke(std::declval<_Proj&>(), std::declval<_T1>())),
48-
decltype(std::__invoke(std::declval<_Proj&>(),
49-
std::declval<_T2>())) >::type _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI
48+
decltype(std::__invoke(std::declval<_Proj&>(), std::declval<_T2>()))>::type _LIBCPP_CONSTEXPR
49+
_LIBCPP_HIDE_FROM_ABI
5050
operator()(_T1&& __lhs, _T2&& __rhs) const {
5151
return std::__invoke(
5252
__pred, std::__invoke(__proj, std::forward<_T1>(__lhs)), std::__invoke(__proj, std::forward<_T2>(__rhs)));

‎libcxx/include/__atomic/atomic_init.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
# pragma GCC system_header
1616
#endif
1717

18-
#define ATOMIC_FLAG_INIT \
19-
{ false }
20-
#define ATOMIC_VAR_INIT(__v) \
21-
{ __v }
18+
#define ATOMIC_FLAG_INIT {false}
19+
#define ATOMIC_VAR_INIT(__v) {__v}
2220

2321
#if _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
2422
# pragma clang deprecated(ATOMIC_VAR_INIT)

‎libcxx/include/__bit_reference

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public:
9595
}
9696

9797
private:
98-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __bit_reference(
99-
__storage_pointer __s, __storage_type __m) _NOEXCEPT
98+
_LIBCPP_HIDE_FROM_ABI
99+
_LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
100100
: __seg_(__s),
101101
__mask_(__m) {}
102102
};
@@ -149,7 +149,7 @@ public:
149149
using __container = typename _Cp::__self;
150150

151151
_LIBCPP_HIDE_FROM_ABI __bit_const_reference(const __bit_const_reference&) = default;
152-
__bit_const_reference& operator=(const __bit_const_reference&) = delete;
152+
__bit_const_reference& operator=(const __bit_const_reference&) = delete;
153153

154154
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT
155155
: __seg_(__x.__seg_),
@@ -164,8 +164,8 @@ public:
164164
}
165165

166166
private:
167-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR explicit __bit_const_reference(
168-
__storage_pointer __s, __storage_type __m) _NOEXCEPT
167+
_LIBCPP_HIDE_FROM_ABI
168+
_LIBCPP_CONSTEXPR explicit __bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
169169
: __seg_(__s),
170170
__mask_(__m) {}
171171
};
@@ -939,8 +939,8 @@ public:
939939
}
940940

941941
private:
942-
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __bit_iterator(
943-
__storage_pointer __s, unsigned __ctz) _NOEXCEPT
942+
_LIBCPP_HIDE_FROM_ABI
943+
_LIBCPP_CONSTEXPR_SINCE_CXX20 explicit __bit_iterator(__storage_pointer __s, unsigned __ctz) _NOEXCEPT
944944
: __seg_(__s),
945945
__ctz_(__ctz) {}
946946

@@ -999,8 +999,8 @@ private:
999999
_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Dp, _IC>
10001000
__find_bool(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
10011001
template <bool _ToCount, class _Dp, bool _IC>
1002-
friend typename __bit_iterator<_Dp, _IC>::difference_type _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1003-
__count_bool(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
1002+
friend typename __bit_iterator<_Dp, _IC>::difference_type _LIBCPP_HIDE_FROM_ABI
1003+
_LIBCPP_CONSTEXPR_SINCE_CXX20 __count_bool(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
10041004
};
10051005

10061006
_LIBCPP_END_NAMESPACE_STD

‎libcxx/include/__chrono/duration.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ operator<=>(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Perio
391391

392392
template <class _Rep1, class _Period1, class _Rep2, class _Period2>
393393
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
394-
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
395-
operator+(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
394+
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
395+
operator+(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
396396
typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
397397
return _Cd(_Cd(__lhs).count() + _Cd(__rhs).count());
398398
}
@@ -401,8 +401,8 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
401401

402402
template <class _Rep1, class _Period1, class _Rep2, class _Period2>
403403
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
404-
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
405-
operator-(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
404+
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
405+
operator-(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
406406
typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
407407
return _Cd(_Cd(__lhs).count() - _Cd(__rhs).count());
408408
}
@@ -468,8 +468,8 @@ operator%(const duration<_Rep1, _Period>& __d, const _Rep2& __s) {
468468

469469
template <class _Rep1, class _Period1, class _Rep2, class _Period2>
470470
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR
471-
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
472-
operator%(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
471+
typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
472+
operator%(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
473473
typedef typename common_type<_Rep1, _Rep2>::type _Cr;
474474
typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
475475
return _Cd(static_cast<_Cr>(_Cd(__lhs).count()) % static_cast<_Cr>(_Cd(__rhs).count()));

‎libcxx/include/__chrono/time_point.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class _LIBCPP_TEMPLATE_VIS time_point {
7878

7979
template <class _Clock, class _Duration1, class _Duration2>
8080
struct _LIBCPP_TEMPLATE_VIS
81-
common_type<chrono::time_point<_Clock, _Duration1>, chrono::time_point<_Clock, _Duration2> > {
81+
common_type<chrono::time_point<_Clock, _Duration1>, chrono::time_point<_Clock, _Duration2> > {
8282
typedef chrono::time_point<_Clock, typename common_type<_Duration1, _Duration2>::type> type;
8383
};
8484

@@ -180,28 +180,28 @@ operator<=>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock
180180
// time_point operator+(time_point x, duration y);
181181

182182
template <class _Clock, class _Duration1, class _Rep2, class _Period2>
183-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
184-
time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
185-
operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
183+
inline _LIBCPP_HIDE_FROM_ABI
184+
_LIBCPP_CONSTEXPR_SINCE_CXX14 time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
185+
operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
186186
typedef time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type> _Tr;
187187
return _Tr(__lhs.time_since_epoch() + __rhs);
188188
}
189189

190190
// time_point operator+(duration x, time_point y);
191191

192192
template <class _Rep1, class _Period1, class _Clock, class _Duration2>
193-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
194-
time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
195-
operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs) {
193+
inline _LIBCPP_HIDE_FROM_ABI
194+
_LIBCPP_CONSTEXPR_SINCE_CXX14 time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
195+
operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs) {
196196
return __rhs + __lhs;
197197
}
198198

199199
// time_point operator-(time_point x, duration y);
200200

201201
template <class _Clock, class _Duration1, class _Rep2, class _Period2>
202-
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
203-
time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
204-
operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
202+
inline _LIBCPP_HIDE_FROM_ABI
203+
_LIBCPP_CONSTEXPR_SINCE_CXX14 time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
204+
operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
205205
typedef time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type> _Ret;
206206
return _Ret(__lhs.time_since_epoch() - __rhs);
207207
}

‎libcxx/include/__config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ typedef __char32_t char32_t;
566566
# ifndef _LIBCPP_NO_ABI_TAG
567567
# define _LIBCPP_HIDE_FROM_ABI \
568568
_LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION \
569-
__attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE))))
569+
__attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE))))
570570
# else
571571
# define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
572572
# endif
@@ -583,11 +583,11 @@ typedef __char32_t char32_t;
583583
# endif
584584

585585
// TODO: Remove this workaround once we drop support for Clang 16
586-
#if __has_warning("-Wc++23-extensions")
587-
# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED_CXX23_EXTENSION _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++23-extensions")
588-
#else
589-
# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED_CXX23_EXTENSION _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++2b-extensions")
590-
#endif
586+
# if __has_warning("-Wc++23-extensions")
587+
# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED_CXX23_EXTENSION _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++23-extensions")
588+
# else
589+
# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED_CXX23_EXTENSION _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++2b-extensions")
590+
# endif
591591

592592
// Clang modules take a significant compile time hit when pushing and popping diagnostics.
593593
// Since all the headers are marked as system headers in the modulemap, we can simply disable this

‎libcxx/include/__configuration/abi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
# define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY
9191
# define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_STRING_VIEW
9292
// Dont' add an inline namespace for `std::filesystem`
93-
# define _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
93+
# define _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
9494
#elif _LIBCPP_ABI_VERSION == 1
9595
# if !(defined(_LIBCPP_OBJECT_FORMAT_COFF) || defined(_LIBCPP_OBJECT_FORMAT_XCOFF))
9696
// Enable compiling copies of now inline methods into the dylib to support

‎libcxx/include/__exception/exception_ptr.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,16 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {
9999
void* __ex = __cxxabiv1::__cxa_allocate_exception(sizeof(_Ep));
100100
# ifdef __wasm__
101101
// In Wasm, a destructor returns its argument
102-
(void)__cxxabiv1::__cxa_init_primary_exception(__ex, const_cast<std::type_info*>(&typeid(_Ep)), [](void* __p) -> void* {
102+
(void)__cxxabiv1::__cxa_init_primary_exception(
103+
__ex, const_cast<std::type_info*>(&typeid(_Ep)), [](void* __p) -> void* {
103104
# else
104105
(void)__cxxabiv1::__cxa_init_primary_exception(__ex, const_cast<std::type_info*>(&typeid(_Ep)), [](void* __p) {
105106
# endif
106-
std::__destroy_at(static_cast<_Ep2*>(__p));
107+
std::__destroy_at(static_cast<_Ep2*>(__p));
107108
# ifdef __wasm__
108-
return __p;
109+
return __p;
109110
# endif
110-
});
111+
});
111112

112113
try {
113114
::new (__ex) _Ep2(__e);

‎libcxx/include/__format/formatter_output.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ __padding_size(size_t __size, size_t __width, __format_spec::__alignment __align
100100
///
101101
/// This uses a "mass output function" of __format::__output_buffer when possible.
102102
template <__fmt_char_type _CharT, __fmt_char_type _OutCharT = _CharT>
103-
_LIBCPP_HIDE_FROM_ABI auto __copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto __out_it)
104-
-> decltype(__out_it) {
103+
_LIBCPP_HIDE_FROM_ABI auto
104+
__copy(basic_string_view<_CharT> __str, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
105105
if constexpr (std::same_as<decltype(__out_it), std::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
106106
__out_it.__get_container()->__copy(__str);
107107
return __out_it;
@@ -116,16 +116,16 @@ _LIBCPP_HIDE_FROM_ABI auto __copy(basic_string_view<_CharT> __str, output_iterat
116116
template <contiguous_iterator _Iterator,
117117
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
118118
__fmt_char_type _OutCharT = _CharT>
119-
_LIBCPP_HIDE_FROM_ABI auto __copy(_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it)
120-
-> decltype(__out_it) {
119+
_LIBCPP_HIDE_FROM_ABI auto
120+
__copy(_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
121121
return __formatter::__copy(basic_string_view{__first, __last}, std::move(__out_it));
122122
}
123123

124124
template <contiguous_iterator _Iterator,
125125
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
126126
__fmt_char_type _OutCharT = _CharT>
127-
_LIBCPP_HIDE_FROM_ABI auto __copy(_Iterator __first, size_t __n, output_iterator<const _OutCharT&> auto __out_it)
128-
-> decltype(__out_it) {
127+
_LIBCPP_HIDE_FROM_ABI auto
128+
__copy(_Iterator __first, size_t __n, output_iterator<const _OutCharT&> auto __out_it) -> decltype(__out_it) {
129129
return __formatter::__copy(basic_string_view{std::to_address(__first), __n}, std::move(__out_it));
130130
}
131131

@@ -136,9 +136,11 @@ template <contiguous_iterator _Iterator,
136136
__fmt_char_type _CharT = typename iterator_traits<_Iterator>::value_type,
137137
__fmt_char_type _OutCharT = _CharT,
138138
class _UnaryOperation>
139-
_LIBCPP_HIDE_FROM_ABI auto __transform(
140-
_Iterator __first, _Iterator __last, output_iterator<const _OutCharT&> auto __out_it, _UnaryOperation __operation)
141-
-> decltype(__out_it) {
139+
_LIBCPP_HIDE_FROM_ABI auto
140+
__transform(_Iterator __first,
141+
_Iterator __last,
142+
output_iterator<const _OutCharT&> auto __out_it,
143+
_UnaryOperation __operation) -> decltype(__out_it) {
142144
if constexpr (std::same_as<decltype(__out_it), std::back_insert_iterator<__format::__output_buffer<_OutCharT>>>) {
143145
__out_it.__get_container()->__transform(__first, __last, std::move(__operation));
144146
return __out_it;

‎libcxx/include/__functional/bind.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ struct __mu_return2<true, _Ti, _Uj> {
105105

106106
template <class _Ti, class _Uj, __enable_if_t<0 < is_placeholder<_Ti>::value, int> = 0>
107107
inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
108-
typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
109-
__mu(_Ti&, _Uj& __uj) {
108+
typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
109+
__mu(_Ti&, _Uj& __uj) {
110110
const size_t __indx = is_placeholder<_Ti>::value - 1;
111111
return std::forward<typename tuple_element<__indx, _Uj>::type>(std::get<__indx>(__uj));
112112
}
@@ -225,8 +225,8 @@ class __bind : public __weak_result_type<__decay_t<_Fp> > {
225225

226226
template <class... _Args>
227227
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
228-
typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
229-
operator()(_Args&&... __args) const {
228+
typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
229+
operator()(_Args&&... __args) const {
230230
return std::__apply_functor(__f_, __bound_args_, __indices(), tuple<_Args&&...>(std::forward<_Args>(__args)...));
231231
}
232232
};

‎libcxx/include/__functional/bind_back.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct __bind_back_t : __perfect_forward<__bind_back_op<tuple_size_v<_BoundArgs>
5252

5353
template <class _Fn, class... _Args>
5454
requires is_constructible_v<decay_t<_Fn>, _Fn> && is_move_constructible_v<decay_t<_Fn>> &&
55-
(is_constructible_v<decay_t<_Args>, _Args> && ...) && (is_move_constructible_v<decay_t<_Args>> && ...)
55+
(is_constructible_v<decay_t<_Args>, _Args> && ...) && (is_move_constructible_v<decay_t<_Args>> && ...)
5656
_LIBCPP_HIDE_FROM_ABI constexpr auto __bind_back(_Fn&& __f, _Args&&... __args) noexcept(
5757
noexcept(__bind_back_t<decay_t<_Fn>, tuple<decay_t<_Args>...>>(
5858
std::forward<_Fn>(__f), std::forward_as_tuple(std::forward<_Args>(__args)...))))

‎libcxx/include/__functional/bind_front.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2929

3030
struct __bind_front_op {
3131
template <class... _Args>
32-
_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Args&&... __args) const
33-
noexcept(noexcept(std::invoke(std::forward<_Args>(__args)...)))
34-
-> decltype(std::invoke(std::forward<_Args>(__args)...)) {
32+
_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Args&&... __args) const noexcept(
33+
noexcept(std::invoke(std::forward<_Args>(__args)...))) -> decltype(std::invoke(std::forward<_Args>(__args)...)) {
3534
return std::invoke(std::forward<_Args>(__args)...);
3635
}
3736
};

‎libcxx/include/__functional/mem_fn.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ class __mem_fn : public __weak_result_type<_Tp> {
3838
template <class... _ArgTypes>
3939
_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
4040

41-
typename __invoke_return<type, _ArgTypes...>::type
42-
operator()(_ArgTypes&&... __args) const {
41+
typename __invoke_return<type, _ArgTypes...>::type
42+
operator()(_ArgTypes&&... __args) const {
4343
return std::__invoke(__f_, std::forward<_ArgTypes>(__args)...);
4444
}
4545
};

‎libcxx/include/__functional/mem_fun_ref.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11 const_mem_fun_t : public
8989
};
9090

9191
template <class _Sp, class _Tp, class _Ap>
92-
class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX11 const_mem_fun1_t
93-
: public __binary_function<const _Tp*, _Ap, _Sp> {
92+
class _LIBCPP_TEMPLATE_VIS
93+
_LIBCPP_DEPRECATED_IN_CXX11 const_mem_fun1_t : public __binary_function<const _Tp*, _Ap, _Sp> {
9494
_Sp (_Tp::*__p_)(_Ap) const;
9595

9696
public:

0 commit comments

Comments
 (0)