Skip to content

Commit f0eb8c8

Browse files
jll63jll63
committed
Merge branch 'clang-format-rename' into v2
2 parents ef5bae3 + ad9b00b commit f0eb8c8

14 files changed

+55
-82
lines changed

‎dev/clang-format-all

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
find include src examples tests docs.in -type f -name "*.?pp" | xargs clang-format -i
3+
find include src examples tests -type f -name "*.?pp" | xargs clang-format -i

‎include/yorel/yomm2/core.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,7 @@ method<Key, R(A...), Policy>::resolve(const ArgType&... args) const {
447447
if constexpr (arity == 1) {
448448
pf = resolve_uni<types<A...>, ArgType...>(args...);
449449
} else {
450-
pf = resolve_multi_first<0, types<A...>, ArgType...>(
451-
args...);
450+
pf = resolve_multi_first<0, types<A...>, ArgType...>(args...);
452451
}
453452

454453
return reinterpret_cast<function_pointer_type>(pf);

‎include/yorel/yomm2/detail.hpp

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ template<class Policy, typename... T>
4141
type_id* type_id_list<Policy, types<T...>>::begin = value;
4242

4343
template<class Policy, typename... T>
44-
type_id* type_id_list<Policy, types<T...>>::end =
45-
value + sizeof...(T);
44+
type_id* type_id_list<Policy, types<T...>>::end = value + sizeof...(T);
4645

4746
template<class Policy>
4847
struct type_id_list<Policy, types<>> {
@@ -136,14 +135,11 @@ template<class...>
136135
struct class_declaration_aux;
137136

138137
template<class Policy, class Class, typename... Bases>
139-
struct class_declaration_aux<Policy, types<Class, Bases...>>
140-
: class_info {
138+
struct class_declaration_aux<Policy, types<Class, Bases...>> : class_info {
141139
class_declaration_aux() {
142140
this->type = collect_static_type_id<Policy, Class>();
143-
this->first_base =
144-
type_id_list<Policy, types<Bases...>>::begin;
145-
this->last_base =
146-
type_id_list<Policy, types<Bases...>>::end;
141+
this->first_base = type_id_list<Policy, types<Bases...>>::begin;
142+
this->last_base = type_id_list<Policy, types<Bases...>>::end;
147143
Policy::classes.push_back(*this);
148144
this->is_abstract = std::is_abstract_v<Class>;
149145
this->static_vptr = &Policy::template static_vptr<Class>;
@@ -336,8 +332,7 @@ constexpr bool is_virtual_ptr = is_virtual_ptr_aux<T>::value;
336332

337333
template<class... Ts>
338334
using virtual_ptr_class = std::conditional_t<
339-
sizeof...(Ts) == 2,
340-
boost::mp11::mp_second<types<Ts..., void>>,
335+
sizeof...(Ts) == 2, boost::mp11::mp_second<types<Ts..., void>>,
341336
boost::mp11::mp_first<types<Ts...>>>;
342337

343338
template<class Policy, typename T>
@@ -498,14 +493,12 @@ inline uintptr_t get_tip(const T& arg) {
498493
template<typename... Classes>
499494
using get_policy = std::conditional_t<
500495
is_policy<boost::mp11::mp_back<types<Classes...>>>,
501-
boost::mp11::mp_back<types<Classes...>>,
502-
YOMM2_DEFAULT_POLICY>;
496+
boost::mp11::mp_back<types<Classes...>>, YOMM2_DEFAULT_POLICY>;
503497

504498
template<typename... Classes>
505499
using remove_policy = std::conditional_t<
506500
is_policy<boost::mp11::mp_back<types<Classes...>>>,
507-
boost::mp11::mp_pop_back<types<Classes...>>,
508-
types<Classes...>>;
501+
boost::mp11::mp_pop_back<types<Classes...>>, types<Classes...>>;
509502

510503
template<class... Ts>
511504
using virtual_ptr_policy = std::conditional_t<
@@ -521,14 +514,10 @@ struct thunk;
521514
template<
522515
class Policy, typename BASE_RETURN, typename... BASE_PARAM, auto SPEC,
523516
typename... SPEC_PARAM>
524-
struct thunk<
525-
Policy, BASE_RETURN(BASE_PARAM...), SPEC,
526-
types<SPEC_PARAM...>> {
517+
struct thunk<Policy, BASE_RETURN(BASE_PARAM...), SPEC, types<SPEC_PARAM...>> {
527518
static BASE_RETURN fn(remove_virtual<BASE_PARAM>... arg) {
528-
using base_type =
529-
boost::mp11::mp_first<types<BASE_PARAM...>>;
530-
using spec_type =
531-
boost::mp11::mp_first<types<SPEC_PARAM...>>;
519+
using base_type = boost::mp11::mp_first<types<BASE_PARAM...>>;
520+
using spec_type = boost::mp11::mp_first<types<SPEC_PARAM...>>;
532521
return SPEC(
533522
argument_traits<Policy, BASE_PARAM>::template cast<SPEC_PARAM>(
534523
remove_virtual<BASE_PARAM>(arg))...);
@@ -562,8 +551,7 @@ struct member_function_thunk<F, R (C::*)(Args...)> {
562551
template<typename... Cs>
563552
using inheritance_map = types<boost::mp11::mp_push_front<
564553
boost::mp11::mp_filter_q<
565-
boost::mp11::mp_bind_back<std::is_base_of, Cs>,
566-
types<Cs...>>,
554+
boost::mp11::mp_bind_back<std::is_base_of, Cs>, types<Cs...>>,
567555
Cs>...>;
568556

569557
template<class Policy, class... Classes>
@@ -575,33 +563,26 @@ struct use_classes_aux<Policy, types<Classes...>> {
575563
std::tuple,
576564
boost::mp11::mp_transform_q<
577565
boost::mp11::mp_bind_front<class_declaration_aux, Policy>,
578-
boost::mp11::mp_apply<
579-
inheritance_map, types<Classes...>>>>;
566+
boost::mp11::mp_apply<inheritance_map, types<Classes...>>>>;
580567
};
581568

582569
template<class Policy, class... Classes, class... MoreClassLists>
583-
struct use_classes_aux<
584-
Policy,
585-
types<types<Classes...>, MoreClassLists...>>
570+
struct use_classes_aux<Policy, types<types<Classes...>, MoreClassLists...>>
586571
: use_classes_aux<
587-
Policy,
588-
boost::mp11::mp_append<
589-
types<Classes...>, MoreClassLists...>>
572+
Policy, boost::mp11::mp_append<types<Classes...>, MoreClassLists...>>
590573

591574
{};
592575

593576
template<typename... Ts>
594577
using second_last = boost::mp11::mp_at_c<
595-
types<Ts...>,
596-
boost::mp11::mp_size<types<Ts...>>::value - 2>;
578+
types<Ts...>, boost::mp11::mp_size<types<Ts...>>::value - 2>;
597579

598580
template<class... Classes>
599581
using use_classes_macro = typename std::conditional_t<
600582
is_policy<second_last<Classes...>>,
601583
use_classes_aux<
602584
second_last<Classes...>,
603-
boost::mp11::mp_pop_back<
604-
boost::mp11::mp_pop_back<types<Classes...>>>>,
585+
boost::mp11::mp_pop_back<boost::mp11::mp_pop_back<types<Classes...>>>>,
605586
use_classes_aux<
606587
boost::mp11::mp_back<types<Classes...>>,
607588
boost::mp11::mp_pop_back<types<Classes...>>>>::type;

‎include/yorel/yomm2/detail/compiler.hpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,20 @@ struct aggregate_reports;
3636

3737
template<class... Reports, class Facet, class... MoreFacets>
3838
struct aggregate_reports<
39-
types<Reports...>,
40-
types<Facet, MoreFacets...>,
39+
types<Reports...>, types<Facet, MoreFacets...>,
4140
std::void_t<typename Facet::report>> {
4241
using type = typename aggregate_reports<
43-
types<Reports..., typename Facet::report>,
44-
types<MoreFacets...>>::type;
42+
types<Reports..., typename Facet::report>, types<MoreFacets...>>::type;
4543
};
4644

4745
template<class... Reports, class Facet, class... MoreFacets, typename Void>
48-
struct aggregate_reports<
49-
types<Reports...>,
50-
types<Facet, MoreFacets...>, Void> {
46+
struct aggregate_reports<types<Reports...>, types<Facet, MoreFacets...>, Void> {
5147
using type = typename aggregate_reports<
52-
types<Reports...>,
53-
types<MoreFacets...>>::type;
48+
types<Reports...>, types<MoreFacets...>>::type;
5449
};
5550

5651
template<class... Reports, typename Void>
57-
struct aggregate_reports<
58-
types<Reports...>, types<>, Void> {
52+
struct aggregate_reports<types<Reports...>, types<>, Void> {
5953
struct type : Reports... {};
6054
};
6155

@@ -241,9 +235,8 @@ struct compiler : detail::generic_compiler {
241235
using policy_type = Policy;
242236
using type_index_type = decltype(Policy::type_index(0));
243237

244-
typename detail::aggregate_reports<
245-
detail::types<update_report>, typename Policy::facets>::type
246-
report;
238+
typename aggregate_reports<
239+
types<update_report>, typename Policy::facets>::type report;
247240

248241
std::unordered_map<type_index_type, class_*> class_map;
249242

‎include/yorel/yomm2/policies/basic_error_output.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ struct yOMM2_API_gcc basic_error_output : virtual error_output {
2222
template<class Policy, typename Stream>
2323
Stream basic_error_output<Policy, Stream>::error_stream;
2424

25-
}
26-
}
27-
}
25+
} // namespace policy
26+
} // namespace yomm2
27+
} // namespace yorel
2828

2929
#endif

‎include/yorel/yomm2/policies/basic_indirect_vptr.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ template<class Policy>
2222
std::vector<std::uintptr_t const* const*>
2323
basic_indirect_vptr<Policy>::indirect_vptrs;
2424

25-
}
26-
}
27-
}
25+
} // namespace policy
26+
} // namespace yomm2
27+
} // namespace yorel
2828

2929
#endif

‎include/yorel/yomm2/policies/basic_trace_output.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ bool basic_trace_output<Policy, Stream>::trace_enabled([]() {
2828
return env && *env++ == '1' && *env++ == 0;
2929
}());
3030

31-
}
32-
}
33-
}
31+
} // namespace policy
32+
} // namespace yomm2
33+
} // namespace yorel
3434

3535
#endif

‎include/yorel/yomm2/policies/fast_perfect_hash.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ struct yOMM2_API_gcc checked_perfect_hash : virtual fast_perfect_hash<Policy>,
195195
template<class Policy>
196196
std::vector<type_id> checked_perfect_hash<Policy>::control;
197197

198-
}
199-
}
200-
}
198+
} // namespace policy
199+
} // namespace yomm2
200+
} // namespace yorel
201201

202202
#endif

‎include/yorel/yomm2/policies/minimal_rtti.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ struct minimal_rtti : virtual rtti {
2121
}
2222
};
2323

24-
}
25-
}
26-
}
24+
} // namespace policy
25+
} // namespace yomm2
26+
} // namespace yorel
2727

2828
#endif

‎include/yorel/yomm2/policies/std_rtti.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ struct std_rtti : virtual rtti {
5050
#endif
5151
};
5252

53-
}
54-
}
55-
}
53+
} // namespace policy
54+
} // namespace yomm2
55+
} // namespace yorel
5656

5757
#endif

‎include/yorel/yomm2/policies/throw_error.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ struct yOMM2_API_gcc throw_error : virtual error_handler {
1818
}
1919
};
2020

21-
}
22-
}
23-
}
21+
} // namespace policy
22+
} // namespace yomm2
23+
} // namespace yorel
2424

2525
#endif

‎include/yorel/yomm2/policies/vectored_error.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ error_handler_type vectored_error<Policy, DefaultHandlerProvider>::error =
6464
std::is_same_v<DefaultHandlerProvider, void>, vectored_error<Policy>,
6565
DefaultHandlerProvider>::default_error_handler;
6666

67-
}
68-
}
69-
}
67+
} // namespace policy
68+
} // namespace yomm2
69+
} // namespace yorel
7070

7171
#endif

‎include/yorel/yomm2/policies/vptr_map.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ struct yOMM2_API_gcc vptr_map : virtual external_vptr {
3838
template<class Policy, class Map>
3939
Map vptr_map<Policy, Map>::vptrs;
4040

41-
}
42-
}
43-
}
41+
} // namespace policy
42+
} // namespace yomm2
43+
} // namespace yorel
4444

4545
#endif

‎include/yorel/yomm2/policies/vptr_vector.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ struct yOMM2_API_gcc vptr_vector : virtual external_vptr {
7878
template<class Policy>
7979
std::vector<const std::uintptr_t*> vptr_vector<Policy>::vptrs;
8080

81-
}
82-
}
83-
}
81+
} // namespace policy
82+
} // namespace yomm2
83+
} // namespace yorel
8484

8585
#endif

0 commit comments

Comments
 (0)