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

feat: common_reference, common_dimension, and common_units now take variadic list of arguments

Browse Source
This commit is contained in:
Mateusz Pusz committed 2022-11-30 10:11:52 +01:00
1 parent b4828d243d
commit 5cbe322c82
4 files changed
+66 -56
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/core/include/units/quantity.h
+6 -6
View File
@@ -481,7 +481,7 @@ template<Quantity Q1, Quantity Q2>
quantity_value_for_<std::plus<>, typename Q1::rep, typename Q2::rep>
[[nodiscard]] constexpr Quantity auto operator+(const Q1& lhs, const Q2& rhs)
{
constexpr auto ref = detail::common_reference(Q1::reference, Q2::reference);
constexpr auto ref = common_reference(Q1::reference, Q2::reference);
using ret = quantity<ref, decltype(lhs.number() + rhs.number())>;
return ret(ret(lhs).number() + ret(rhs).number());
}
@@ -491,7 +491,7 @@ template<Quantity Q1, Quantity Q2>
quantity_value_for_<std::minus<>, typename Q1::rep, typename Q2::rep>
[[nodiscard]] constexpr Quantity auto operator-(const Q1& lhs, const Q2& rhs)
{
constexpr auto ref = detail::common_reference(Q1::reference, Q2::reference);
constexpr auto ref = common_reference(Q1::reference, Q2::reference);
using ret = quantity<ref, decltype(lhs.number() - rhs.number())>;
return ret(ret(lhs).number() - ret(rhs).number());
}
@@ -528,7 +528,7 @@ template<Quantity Q1, Quantity Q2>
std::three_way_comparable_with<typename Q1::rep, typename Q2::rep>
[[nodiscard]] constexpr auto operator<=>(const Q1& lhs, const Q2& rhs)
{
constexpr auto ref = detail::common_reference(Q1::reference, Q2::reference);
constexpr auto ref = common_reference(Q1::reference, Q2::reference);
return quantity_cast<ref>(lhs).number() <=> quantity_cast<ref>(rhs).number();
}
@@ -537,7 +537,7 @@ template<Quantity Q1, Quantity Q2>
std::equality_comparable_with<typename Q1::rep, typename Q2::rep>
[[nodiscard]] constexpr bool operator==(const Q1& lhs, const Q2& rhs)
{
constexpr auto ref = detail::common_reference(Q1::reference, Q2::reference);
constexpr auto ref = common_reference(Q1::reference, Q2::reference);
return quantity_cast<ref>(lhs).number() == quantity_cast<ref>(rhs).number();
}
@@ -548,13 +548,13 @@ namespace std {
template<units::Quantity Q1, units::Quantity Q2>
requires requires {
{
units::detail::common_reference(Q1::reference, Q2::reference)
units::common_reference(Q1::reference, Q2::reference)
} -> units::Reference;
typename common_type_t<typename Q1::rep, typename Q2::rep>;
}
struct common_type<Q1, Q2> {
public:
using type = units::quantity<units::detail::common_reference(Q1::reference, Q2::reference),
using type = units::quantity<units::common_reference(Q1::reference, Q2::reference),
common_type_t<typename Q1::rep, typename Q2::rep>>;
};