feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

Revert "feat: 💥 variadic template versions of get_common_XXX() removed (only 2-argument overloads used in practice)"

Browse Source 
This reverts commit ab888aaecd.
This commit is contained in:
Mateusz Pusz
2024-09-25 12:51:33 +02:00
parent 534df1bfc1
commit 8c12f95ee5
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/include/mp-units/framework/quantity_spec.h
View File

@@ -1535,6 +1535,13 @@ template<QuantitySpec Q1, QuantitySpec Q2>
// NOLINTEND(bugprone-branch-clone)
}
[[nodiscard]] consteval QuantitySpec auto get_common_quantity_spec(QuantitySpec auto q1, QuantitySpec auto q2,
QuantitySpec auto q3, QuantitySpec auto... rest)
requires requires { get_common_quantity_spec(get_common_quantity_spec(q1, q2), q3, rest...); }
{
return get_common_quantity_spec(get_common_quantity_spec(q1, q2), q3, rest...);
}
MP_UNITS_EXPORT_END
} // namespace mp_units

28
src/core/include/mp-units/framework/reference.h
View File

@@ -268,24 +268,30 @@ template<Reference R, typename Q>
// NOLINTNEXTLINE(cppcoreguidelines-missing-std-forward)
constexpr auto operator/(R, Q&& q) = delete;
[[nodiscard]] consteval AssociatedUnit auto get_common_reference(AssociatedUnit auto u1, AssociatedUnit auto u2)
[[nodiscard]] consteval AssociatedUnit auto get_common_reference(AssociatedUnit auto u1, AssociatedUnit auto u2,
AssociatedUnit auto... rest)
requires requires {
{ get_common_quantity_spec(get_quantity_spec(u1), get_quantity_spec(u2)) } -> QuantitySpec;
{ get_common_unit(u1, u2) } -> AssociatedUnit;
{
get_common_quantity_spec(get_quantity_spec(u1), get_quantity_spec(u2), get_quantity_spec(rest)...)
} -> QuantitySpec;
{ get_common_unit(u1, u2, rest...) } -> AssociatedUnit;
}
{
return get_common_unit(u1, u2);
return get_common_unit(u1, u2, rest...);
}
template<Reference R1, Reference R2>
[[nodiscard]] consteval Reference auto get_common_reference(R1 r1, R2 r2)
requires(!(AssociatedUnit<R1> && AssociatedUnit<R2>)) && requires {
{ get_common_quantity_spec(get_quantity_spec(r1), get_quantity_spec(r2)) } -> QuantitySpec;
{ get_common_unit(get_unit(r1), get_unit(r2)) } -> Unit;
template<Reference R1, Reference R2, Reference... Rest>
[[nodiscard]] consteval Reference auto get_common_reference(R1 r1, R2 r2, Rest... rest)
requires(!(AssociatedUnit<R1> && AssociatedUnit<R2> && (... && AssociatedUnit<Rest>))) && requires {
{
get_common_quantity_spec(get_quantity_spec(r1), get_quantity_spec(r2), get_quantity_spec(rest)...)
} -> QuantitySpec;
{ get_common_unit(get_unit(r1), get_unit(r2), get_unit(rest)...) } -> Unit;
}
{
return detail::reference_t<get_common_quantity_spec(get_quantity_spec(R1{}), get_quantity_spec(R2{})),
get_common_unit(get_unit(R1{}), get_unit(R2{}))>{};
return detail::reference_t<get_common_quantity_spec(get_quantity_spec(R1{}), get_quantity_spec(R2{}),
get_quantity_spec(rest)...),
get_common_unit(get_unit(R1{}), get_unit(R2{}), get_unit(rest)...)>{};
}
MP_UNITS_EXPORT_END

6
src/core/include/mp-units/framework/unit.h
View File

@@ -654,6 +654,12 @@ template<Unit U1, Unit U2>
}
}
[[nodiscard]] consteval Unit auto get_common_unit(Unit auto u1, Unit auto u2, Unit auto u3, Unit auto... rest)
requires requires { get_common_unit(get_common_unit(u1, u2), u3, rest...); }
{
return get_common_unit(get_common_unit(u1, u2), u3, rest...);
}
/**
* @brief Puts a space ' ' sign before a unit symbol