mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-07 14:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make_quantity helper not needed with the new syntax

Browse Source
This commit is contained in:
Mateusz Pusz
2022-12-23 16:29:39 +01:00
parent 0fc05850c8
commit a62c388d05
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/include/units/quantity.h
View File

@@ -39,13 +39,6 @@ namespace units {
namespace detail {
// TODO: Replace with `v * R` pending https://github.com/BobSteagall/wg21/issues/58.
template<Reference auto R>
inline constexpr auto make_quantity = [](Representation auto&& v) {
using Rep = std::remove_cvref_t<decltype(v)>;
return quantity<R, Rep>(std::forward<decltype(v)>(v));
};
template<typename T>
concept quantity_one = quantity_of<T, dimensionless[one]>;
@@ -412,7 +405,7 @@ public:
requires(!Quantity<Value>) && invoke_result_of_<R.quantity_spec.character, std::divides<>, const Value&, rep>
[[nodiscard]] friend constexpr Quantity auto operator/(const Value& v, const quantity& q)
{
return detail::make_quantity<dimensionless[::units::one] / reference>(v / q.number());
return (dimensionless[::units::one] / reference)(v / q.number());
}
template<typename Value>
@@ -490,7 +483,7 @@ template<Quantity Q1, Quantity Q2>
typename Q2::rep>
[[nodiscard]] constexpr Quantity auto operator*(const Q1& lhs, const Q2& rhs)
{
return detail::make_quantity<Q1::reference * Q2::reference>(lhs.number() * rhs.number());
return (Q1::reference * Q2::reference)(lhs.number() * rhs.number());
}
template<Quantity Q1, Quantity Q2>
@@ -499,7 +492,7 @@ template<Quantity Q1, Quantity Q2>
[[nodiscard]] constexpr Quantity auto operator/(const Q1& lhs, const Q2& rhs)
{
gsl_ExpectsAudit(rhs.number() != quantity_values<typename Q2::rep>::zero());
return detail::make_quantity<Q1::reference / Q2::reference>(lhs.number() / rhs.number());
return (Q1::reference / Q2::reference)(lhs.number() / rhs.number());
}
template<Quantity Q1, Quantity Q2>