Skip to content

Commit e309695

Browse files
jll63jll63
committed
2 renames and reformat
1 parent 7d5557f commit e309695

20 files changed

+88
-78
lines changed

‎include/boost/openmethod/core.hpp‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ template<class Class, class Registry>
481481
struct is_virtual<virtual_ptr<Class, Registry, void>> : std::true_type {};
482482

483483
template<class Class, class Registry>
484-
struct is_virtual<virtual_ptr<Class, Registry, void>&> : std::true_type {
485-
};
484+
struct is_virtual<virtual_ptr<Class, Registry, void>&> : std::true_type {};
486485

487486
template<class Class, class Registry>
488487
struct is_virtual<const virtual_ptr<Class, Registry, void>&> : std::true_type {
@@ -1955,32 +1954,32 @@ template<typename...>
19551954
constexpr bool false_t = false; // workaround before CWG2518/P2593R1
19561955

19571956
template<typename T, class Registry, typename = void>
1958-
struct check_method_parameter : std::true_type {};
1957+
struct validate_method_parameter : std::true_type {};
19591958

19601959
template<typename T, class Registry, typename U>
1961-
struct check_method_parameter<virtual_<T>, Registry, U> : std::false_type {
1960+
struct validate_method_parameter<virtual_<T>, Registry, U> : std::false_type {
19621961
static_assert(false_t<T>, "virtual_traits not specialized for type");
19631962
};
19641963

19651964
template<typename T, class Registry>
1966-
struct check_method_parameter<
1965+
struct validate_method_parameter<
19671966
virtual_<T>, Registry,
19681967
std::void_t<typename virtual_traits<T, Registry>::virtual_type>>
19691968
: std::bool_constant<
19701969
has_vptr_fn<virtual_type<T, Registry>, Registry> ||
19711970
Registry::rtti::template is_polymorphic<virtual_type<T, Registry>>> {
19721971
static_assert(
1973-
check_method_parameter::value,
1972+
validate_method_parameter::value,
19741973
"virtual_<> parameter is not a polymorphic class and no "
19751974
"boost_openmethod_vptr is applicable");
19761975
};
19771976

19781977
template<class Class, class Registry>
1979-
struct check_method_parameter<virtual_ptr<Class, Registry>, Registry, void>
1978+
struct validate_method_parameter<virtual_ptr<Class, Registry>, Registry, void>
19801979
: std::true_type {};
19811980

19821981
template<class Class, class Registry, class MethodRegistry>
1983-
struct check_method_parameter<
1982+
struct validate_method_parameter<
19841983
virtual_ptr<Class, Registry>, MethodRegistry, void> : std::false_type {
19851984
static_assert(
19861985
false_t<Class, Registry, MethodRegistry>, "registry mismatch");
@@ -2199,8 +2198,8 @@ class method<Id, ReturnType(Parameters...), Registry>
21992198
mp11::mp_list<Parameters...>, detail::is_virtual>::value;
22002199

22012200
// sanity checks
2202-
static_assert(
2203-
(detail::check_method_parameter<Parameters, Registry>::value && ...));
2201+
static_assert((
2202+
detail::validate_method_parameter<Parameters, Registry>::value && ...));
22042203
static_assert(Arity > 0, "method has no virtual parameters");
22052204

22062205
type_id vp_type_ids[Arity];
@@ -2623,13 +2622,13 @@ struct same_reference_category {
26232622
std::is_rvalue_reference<U>::value);
26242623
};
26252624
template<class T1, class T2, typename = void>
2626-
struct check_overrider_parameter : std::false_type {
2625+
struct validate_overrider_parameter : std::false_type {
26272626
static_assert(
26282627
false_t<T1, T2>, "non-virtual parameter types must match exactly");
26292628
};
26302629

26312630
template<class T1, class T2>
2632-
struct check_overrider_parameter<
2631+
struct validate_overrider_parameter<
26332632
T1, T2,
26342633
std::enable_if_t<
26352634
is_virtual_ptr<T1> && is_virtual_ptr<T2> &&
@@ -2639,7 +2638,7 @@ struct check_overrider_parameter<
26392638
};
26402639

26412640
template<class T1, class T2>
2642-
struct check_overrider_parameter<
2641+
struct validate_overrider_parameter<
26432642
T1, T2, std::enable_if_t<is_virtual_ptr<T1> && !is_virtual_ptr<T2>>>
26442643
: std::false_type {
26452644
static_assert(
@@ -2649,36 +2648,36 @@ struct check_overrider_parameter<
26492648
};
26502649

26512650
template<class T>
2652-
struct check_overrider_parameter<T, T, void> : std::true_type {};
2651+
struct validate_overrider_parameter<T, T, void> : std::true_type {};
26532652

26542653
template<class T1, class T2>
2655-
struct check_overrider_parameter<virtual_<T1>, T2, void> : std::true_type {};
2654+
struct validate_overrider_parameter<virtual_<T1>, T2, void> : std::true_type {};
26562655

26572656
template<class T1, class T2>
2658-
struct check_overrider_parameter<virtual_<T1>, virtual_<T2>, void>
2657+
struct validate_overrider_parameter<virtual_<T1>, virtual_<T2>, void>
26592658
: std::false_type {
26602659
static_assert(false_t<T1, T2>, "virtual_<> is not allowed in overriders");
26612660
};
26622661

26632662
template<class T, class R>
2664-
struct check_overrider_parameter<virtual_ptr<T, R>, virtual_ptr<T, R>, void>
2663+
struct validate_overrider_parameter<virtual_ptr<T, R>, virtual_ptr<T, R>, void>
26652664
: std::true_type {};
26662665

26672666
template<class T1, class R1, class T2, class R2>
2668-
struct check_overrider_parameter<virtual_ptr<T1, R1>, virtual_ptr<T2, R2>, void>
2669-
: std::is_same<R1, R2> {
2670-
static_assert(check_overrider_parameter::value, "registry mismatch");
2667+
struct validate_overrider_parameter<
2668+
virtual_ptr<T1, R1>, virtual_ptr<T2, R2>, void> : std::is_same<R1, R2> {
2669+
static_assert(validate_overrider_parameter::value, "registry mismatch");
26712670
};
26722671

26732672
template<class T1, class R1, class T2, class R2>
2674-
struct check_overrider_parameter<
2673+
struct validate_overrider_parameter<
26752674
const virtual_ptr<T1, R1>&, const virtual_ptr<T2, R2>&, void>
2676-
: check_overrider_parameter<virtual_ptr<T1, R1>, virtual_ptr<T2, R2>> {};
2675+
: validate_overrider_parameter<virtual_ptr<T1, R1>, virtual_ptr<T2, R2>> {};
26772676

26782677
template<class T1, class R1, class T2, class R2>
2679-
struct check_overrider_parameter<
2678+
struct validate_overrider_parameter<
26802679
virtual_ptr<T1, R1>&&, virtual_ptr<T2, R2>&&, void>
2681-
: check_overrider_parameter<virtual_ptr<T1, R1>, virtual_ptr<T2, R2>> {};
2680+
: validate_overrider_parameter<virtual_ptr<T1, R1>, virtual_ptr<T2, R2>> {};
26822681

26832682
} // namespace detail
26842683

@@ -2691,7 +2690,7 @@ auto method<Id, ReturnType(Parameters...), Registry>::
26912690
detail::remove_virtual_<Parameters>... arg) -> ReturnType {
26922691
using namespace detail;
26932692
static_assert(
2694-
(check_overrider_parameter<Parameters, OverriderParameters>::value &&
2693+
(validate_overrider_parameter<Parameters, OverriderParameters>::value &&
26952694
...),
26962695
"virtual_ptr category mismatch");
26972696
return Overrider(

‎include/boost/openmethod/detail/ostdstream.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ inline auto operator<<(ostdstream& os, const char* str) -> ostdstream& {
5252
return os;
5353
}
5454

55-
inline auto operator<<(ostdstream& os, const std::string_view& view)
56-
-> ostdstream& {
55+
inline auto
56+
operator<<(ostdstream& os, const std::string_view& view) -> ostdstream& {
5757
if (os.stream) {
5858
fwrite(view.data(), sizeof(*view.data()), view.length(), os.stream);
5959
}

‎include/boost/openmethod/detail/static_list.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ class static_list {
176176
return tmp;
177177
}
178178

179-
friend auto operator==(const const_iterator& a, const const_iterator& b)
180-
-> bool {
179+
friend auto
180+
operator==(const const_iterator& a, const const_iterator& b) -> bool {
181181
return a.ptr == b.ptr;
182182
};
183-
friend auto operator!=(const const_iterator& a, const const_iterator& b)
184-
-> bool {
183+
friend auto
184+
operator!=(const const_iterator& a, const const_iterator& b) -> bool {
185185
return a.ptr != b.ptr;
186186
};
187187

‎include/boost/openmethod/detail/types.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ struct final_error : openmethod_error {
168168
auto write(Stream& os) const -> void;
169169
};
170170

171-
172171
//! For future use
173172
struct static_offset_error : openmethod_error {
174173
type_id method;

‎include/boost/openmethod/inplace_vptr.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class inplace_vptr_aux<Class, Registry, true> {
7676
boost_openmethod_vptr = nullptr;
7777
}
7878

79-
friend auto boost_openmethod_vptr(const Class& obj, Registry*)
80-
-> vptr_type {
79+
friend auto
80+
boost_openmethod_vptr(const Class& obj, Registry*) -> vptr_type {
8181
if constexpr (Registry::has_indirect_vptr) {
8282
return *obj.boost_openmethod_vptr;
8383
} else {
@@ -148,13 +148,13 @@ struct inplace_vptr<Class, Base1, Base2, MoreBases...>
148148
(detail::update_vptr<MoreBases>(static_cast<Base2*>(obj)), ...);
149149
}
150150

151-
friend auto boost_openmethod_registry(Class*)
152-
-> detail::inplace_vptr_registry<Base1>;
153-
friend auto boost_openmethod_bases(Class*)
154-
-> mp11::mp_list<Base1, Base2, MoreBases...>;
151+
friend auto
152+
boost_openmethod_registry(Class*) -> detail::inplace_vptr_registry<Base1>;
153+
friend auto
154+
boost_openmethod_bases(Class*) -> mp11::mp_list<Base1, Base2, MoreBases...>;
155155
friend auto boost_openmethod_vptr(
156-
const Class& obj, detail::inplace_vptr_registry<Base1>* registry)
157-
-> vptr_type {
156+
const Class& obj,
157+
detail::inplace_vptr_registry<Base1>* registry) -> vptr_type {
158158
return boost_openmethod_vptr(static_cast<const Base1&>(obj), registry);
159159
}
160160
};

‎include/boost/openmethod/policies/default_error_handler.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ struct default_error_handler : error_handler {
3636
//! openmethod_error.
3737
using error_variant = std::variant<
3838
not_initialized_error, not_implemented_error, ambiguous_error,
39-
unknown_class_error, fast_perfect_hash_error, final_error, static_slot_error,
40-
static_stride_error>;
39+
unknown_class_error, fast_perfect_hash_error, final_error,
40+
static_slot_error, static_stride_error>;
4141

4242
//! The type of the error handler function object.
4343
using function_type = std::function<void(const error_variant& error)>;

‎include/boost/openmethod/policies/vectored_error_handler.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ namespace boost::openmethod::policies {
1616
struct default_error_handler : error_handler {
1717
using error_variant = std::variant<
1818
openmethod_error, not_implemented_error, unknown_class_error,
19-
fast_perfect_hash_error, final_error, static_slot_error, static_stride_error>;
19+
fast_perfect_hash_error, final_error, static_slot_error,
20+
static_stride_error>;
2021

2122
using function_type = std::function<void(const error_variant& error)>;
2223

@@ -70,7 +71,8 @@ struct default_error_handler : error_handler {
7071
error->type, os);
7172
os << "\n";
7273
} else if (
73-
auto error = std::get_if<fast_perfect_hash_error>(&error_v)) {
74+
auto error =
75+
std::get_if<fast_perfect_hash_error>(&error_v)) {
7476
os << "could not find hash factors after "
7577
<< error->attempts << "s using " << error->buckets
7678
<< " buckets\n";

‎include/boost/openmethod/policies/vptr_vector.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ struct vptr_vector : vptr {
6363
//! @param first The beginning of the range.
6464
//! @param last The end of the range.
6565
template<typename ForwardIterator>
66-
static auto initialize(ForwardIterator first, ForwardIterator last)
67-
-> void {
66+
static auto
67+
initialize(ForwardIterator first, ForwardIterator last) -> void {
6868
std::size_t size;
6969
if constexpr (has_type_hash) {
7070
auto [_, max_value] = type_hash::initialize(first, last);

‎include/boost/openmethod/shared_ptr.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ struct shared_ptr_cast_traits<std::shared_ptr<T>&&> {
3333
};
3434

3535
template<typename T, class Registry>
36-
struct check_method_parameter<std::shared_ptr<T>&, Registry, void>
36+
struct validate_method_parameter<std::shared_ptr<T>&, Registry, void>
3737
: std::false_type {
3838
static_assert(
3939
false_t<T>,
4040
"std::shared_ptr cannot be passed by non-const lvalue reference");
4141
};
4242

4343
template<typename T, class Registry>
44-
struct check_method_parameter<
44+
struct validate_method_parameter<
4545
virtual_ptr<std::shared_ptr<T>, Registry>&, Registry, void>
4646
: std::false_type {
4747
static_assert(

‎test/compile_fail_virtual_parameter_to_value.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
using boost::openmethod::virtual_;
99

10-
struct Cat { virtual ~Cat() {} };
10+
struct Cat {
11+
virtual ~Cat() {
12+
}
13+
};
1114

1215
BOOST_OPENMETHOD(poke, (virtual_<Cat>), void);
1316

0 commit comments

Comments
 (0)