Skip to content

Commit 473760f

Browse files
cmticecmtice
committed
Fix clang format issues.
1 parent 09b144c commit 473760f

File tree

2 files changed

+28
-56
lines changed

2 files changed

+28
-56
lines changed

‎libcxx/include/__memory/allocator_traits.h‎

Lines changed: 27 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ template <class _Tp>
4747
using __pointer_member _LIBCPP_NODEBUG = typename _Tp::pointer;
4848

4949
template <class _Tp, class _Alloc>
50-
using __pointer _LIBCPP_NODEBUG =
51-
__detected_or_t<_Tp *, __pointer_member,
52-
__libcpp_remove_reference_t<_Alloc>>;
50+
using __pointer _LIBCPP_NODEBUG = __detected_or_t<_Tp *, __pointer_member, __libcpp_remove_reference_t<_Alloc>>;
5351

5452
// __const_pointer
5553
_LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_const_pointer, const_pointer);
@@ -60,8 +58,7 @@ struct __const_pointer {
6058
template <class _Tp, class _Ptr, class _Alloc>
6159
struct __const_pointer<_Tp, _Ptr, _Alloc, false> {
6260
#ifdef _LIBCPP_CXX03_LANG
63-
using type _LIBCPP_NODEBUG =
64-
typename pointer_traits<_Ptr>::template rebind<const _Tp>::other;
61+
using type _LIBCPP_NODEBUG = typename pointer_traits<_Ptr>::template rebind<const _Tp>::other;
6562
#else
6663
using type _LIBCPP_NODEBUG = typename pointer_traits<_Ptr>::template rebind<const _Tp>;
6764
#endif
@@ -102,8 +99,7 @@ template <class _Tp>
10299
using __size_type_member _LIBCPP_NODEBUG = typename _Tp::size_type;
103100

104101
template <class _Alloc, class _DiffType>
105-
using __size_type _LIBCPP_NODEBUG =
106-
__detected_or_t<__make_unsigned_t<_DiffType>, __size_type_member, _Alloc>;
102+
using __size_type _LIBCPP_NODEBUG = __detected_or_t<__make_unsigned_t<_DiffType>, __size_type_member, _Alloc>;
107103

108104
// __alloc_traits_difference_type
109105
_LIBCPP_ALLOCATOR_TRAITS_HAS_XXX(__has_alloc_traits_difference_type, difference_type);
@@ -118,41 +114,31 @@ struct __alloc_traits_difference_type<_Alloc, _Ptr, true> {
118114

119115
// __propagate_on_container_copy_assignment
120116
template <class _Tp>
121-
using __propagate_on_container_copy_assignment_member _LIBCPP_NODEBUG =
122-
typename _Tp::propagate_on_container_copy_assignment;
117+
using __propagate_on_container_copy_assignment_member _LIBCPP_NODEBUG = typename _Tp::propagate_on_container_copy_assignment;
123118

124119
template <class _Alloc>
125-
using __propagate_on_container_copy_assignment _LIBCPP_NODEBUG =
126-
__detected_or_t<false_type, __propagate_on_container_copy_assignment_member,
127-
_Alloc>;
120+
using __propagate_on_container_copy_assignment _LIBCPP_NODEBUG = __detected_or_t<false_type, __propagate_on_container_copy_assignment_member, _Alloc>;
128121

129122
// __propagate_on_container_move_assignment
130123
template <class _Tp>
131-
using __propagate_on_container_move_assignment_member _LIBCPP_NODEBUG =
132-
typename _Tp::propagate_on_container_move_assignment;
124+
using __propagate_on_container_move_assignment_member _LIBCPP_NODEBUG = typename _Tp::propagate_on_container_move_assignment;
133125

134126
template <class _Alloc>
135-
using __propagate_on_container_move_assignment _LIBCPP_NODEBUG =
136-
__detected_or_t<false_type, __propagate_on_container_move_assignment_member,
137-
_Alloc>;
127+
using __propagate_on_container_move_assignment _LIBCPP_NODEBUG = __detected_or_t<false_type, __propagate_on_container_move_assignment_member, _Alloc>;
138128

139129
// __propagate_on_container_swap
140130
template <class _Tp>
141-
using __propagate_on_container_swap_member _LIBCPP_NODEBUG =
142-
typename _Tp::propagate_on_container_swap;
131+
using __propagate_on_container_swap_member _LIBCPP_NODEBUG = typename _Tp::propagate_on_container_swap;
143132

144133
template <class _Alloc>
145-
using __propagate_on_container_swap _LIBCPP_NODEBUG =
146-
__detected_or_t<false_type, __propagate_on_container_swap_member, _Alloc>;
134+
using __propagate_on_container_swap _LIBCPP_NODEBUG = __detected_or_t<false_type, __propagate_on_container_swap_member, _Alloc>;
147135

148136
// __is_always_equal
149137
template <class _Tp>
150138
using __is_always_equal_member _LIBCPP_NODEBUG = typename _Tp::is_always_equal;
151139

152140
template <class _Alloc>
153-
using __is_always_equal _LIBCPP_NODEBUG =
154-
__detected_or_t<typename is_empty<_Alloc>::type, __is_always_equal_member,
155-
_Alloc>;
141+
using __is_always_equal _LIBCPP_NODEBUG = __detected_or_t<typename is_empty<_Alloc>::type, __is_always_equal_member, _Alloc>;
156142

157143
// __allocator_traits_rebind
158144
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
@@ -177,8 +163,7 @@ struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false> {
177163
_LIBCPP_SUPPRESS_DEPRECATED_POP
178164

179165
template <class _Alloc, class _Tp>
180-
using __allocator_traits_rebind_t _LIBCPP_NODEBUG =
181-
typename __allocator_traits_rebind<_Alloc, _Tp>::type;
166+
using __allocator_traits_rebind_t _LIBCPP_NODEBUG = typename __allocator_traits_rebind<_Alloc, _Tp>::type;
182167

183168
_LIBCPP_SUPPRESS_DEPRECATED_PUSH
184169

@@ -245,43 +230,32 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(allocation_result);
245230

246231
template <class _Alloc>
247232
struct _LIBCPP_TEMPLATE_VIS allocator_traits {
248-
using allocator_type _LIBCPP_NODEBUG = _Alloc;
249-
using value_type _LIBCPP_NODEBUG = typename allocator_type::value_type;
250-
using pointer _LIBCPP_NODEBUG = __pointer<value_type, allocator_type>;
251-
using const_pointer _LIBCPP_NODEBUG =
252-
typename __const_pointer<value_type, pointer, allocator_type>::type;
253-
using void_pointer _LIBCPP_NODEBUG =
254-
typename __void_pointer<pointer, allocator_type>::type;
255-
using const_void_pointer _LIBCPP_NODEBUG =
256-
typename __const_void_pointer<pointer, allocator_type>::type;
257-
using difference_type _LIBCPP_NODEBUG =
258-
typename __alloc_traits_difference_type<allocator_type, pointer>::type;
259-
using size_type _LIBCPP_NODEBUG =
260-
__size_type<allocator_type, difference_type>;
261-
using propagate_on_container_copy_assignment _LIBCPP_NODEBUG =
262-
__propagate_on_container_copy_assignment<allocator_type>;
263-
using propagate_on_container_move_assignment _LIBCPP_NODEBUG =
264-
__propagate_on_container_move_assignment<allocator_type>;
265-
using propagate_on_container_swap _LIBCPP_NODEBUG =
266-
__propagate_on_container_swap<allocator_type>;
267-
using is_always_equal _LIBCPP_NODEBUG = __is_always_equal<allocator_type>;
233+
using allocator_type _LIBCPP_NODEBUG = _Alloc;
234+
using value_type _LIBCPP_NODEBUG = typename allocator_type::value_type;
235+
using pointer _LIBCPP_NODEBUG = __pointer<value_type, allocator_type>;
236+
using const_pointer _LIBCPP_NODEBUG = typename __const_pointer<value_type, pointer, allocator_type>::type;
237+
using void_pointer _LIBCPP_NODEBUG = typename __void_pointer<pointer, allocator_type>::type;
238+
using const_void_pointer _LIBCPP_NODEBUG = typename __const_void_pointer<pointer, allocator_type>::type;
239+
using difference_type _LIBCPP_NODEBUG = typename __alloc_traits_difference_type<allocator_type, pointer>::type;
240+
using size_type _LIBCPP_NODEBUG = __size_type<allocator_type, difference_type>;
241+
using propagate_on_container_copy_assignment _LIBCPP_NODEBUG = __propagate_on_container_copy_assignment<allocator_type>;
242+
using propagate_on_container_move_assignment _LIBCPP_NODEBUG = __propagate_on_container_move_assignment<allocator_type>;
243+
using propagate_on_container_swap _LIBCPP_NODEBUG = __propagate_on_container_swap<allocator_type>;
244+
using is_always_equal _LIBCPP_NODEBUG = __is_always_equal<allocator_type>;
268245

269246
#ifndef _LIBCPP_CXX03_LANG
270247
template <class _Tp>
271-
using rebind_alloc _LIBCPP_NODEBUG =
272-
__allocator_traits_rebind_t<allocator_type, _Tp>;
248+
using rebind_alloc _LIBCPP_NODEBUG = __allocator_traits_rebind_t<allocator_type, _Tp>;
273249
template <class _Tp>
274250
using rebind_traits _LIBCPP_NODEBUG = allocator_traits<rebind_alloc<_Tp>>;
275251
#else // _LIBCPP_CXX03_LANG
276252
template <class _Tp>
277253
struct rebind_alloc {
278-
using other _LIBCPP_NODEBUG =
279-
__allocator_traits_rebind_t<allocator_type, _Tp>;
254+
using other _LIBCPP_NODEBUG = __allocator_traits_rebind_t<allocator_type, _Tp>;
280255
};
281256
template <class _Tp>
282257
struct rebind_traits {
283-
using other _LIBCPP_NODEBUG =
284-
allocator_traits<typename rebind_alloc<_Tp>::other>;
258+
using other _LIBCPP_NODEBUG = allocator_traits<typename rebind_alloc<_Tp>::other>;
285259
};
286260
#endif // _LIBCPP_CXX03_LANG
287261

@@ -379,8 +353,7 @@ template <class _Traits, class _Tp>
379353
using __rebind_alloc _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>;
380354
#else
381355
template <class _Traits, class _Tp>
382-
using __rebind_alloc _LIBCPP_NODEBUG =
383-
typename _Traits::template rebind_alloc<_Tp>::other;
356+
using __rebind_alloc _LIBCPP_NODEBUG = typename _Traits::template rebind_alloc<_Tp>::other;
384357
#endif
385358

386359
template <class _Alloc>

‎libcxx/include/__type_traits/detected_or.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ struct __detector<_Default, __void_t<_Op<_Args...> >, _Op, _Args...> {
2929
};
3030

3131
template <class _Default, template <class...> class _Op, class... _Args>
32-
using __detected_or_t _LIBCPP_NODEBUG =
33-
typename __detector<_Default, void, _Op, _Args...>::type;
32+
using __detected_or_t _LIBCPP_NODEBUG = typename __detector<_Default, void, _Op, _Args...>::type;
3433

3534
_LIBCPP_END_NAMESPACE_STD
3635

0 commit comments

Comments
 (0)