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

feat: force_in(U) support added

Browse Source
This commit is contained in:
Mateusz Pusz
2023-09-13 10:18:07 +02:00
parent 2b2f62d038
commit 1c7928021d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/include/mp-units/quantity.h
View File

@@ -141,6 +141,20 @@ public:
quantity& operator=(const quantity&) = default;
quantity& operator=(quantity&&) = default;
// conversions
template<Unit U>
requires detail::QuantityConvertibleTo<quantity, quantity<quantity_spec[U{}], Rep>>
[[nodiscard]] constexpr quantity<quantity_spec[U{}], Rep> in(U) const
{
return quantity<quantity_spec[U{}], Rep>{*this};
}
template<Unit U>
requires requires(quantity q) { value_cast<U{}>(q); }
[[nodiscard]] constexpr quantity<quantity_spec[U{}], Rep> force_in(U) const
{
return value_cast<U{}>(*this);
}
// data access
#ifdef __cpp_explicit_this_parameter
template<typename Self, Unit U>
@@ -190,13 +204,6 @@ public:
return value_cast<U{}>(*this).numerical_value_in(U{});
}
template<Unit U>
requires detail::QuantityConvertibleTo<quantity, quantity<quantity_spec[U{}], Rep>>
[[nodiscard]] constexpr quantity<quantity_spec[U{}], Rep> in(U) const
{
return quantity<quantity_spec[U{}], Rep>{*this};
}
// member unary operators
[[nodiscard]] constexpr Quantity auto operator+() const
requires requires(rep v) {

4
test/unit_test/static/quantity_test.cpp
View File

@@ -900,6 +900,10 @@ static_assert(value_cast<km>(2000 * m).numerical_value_ref_in(km) == 2);
static_assert(value_cast<int>(1.23 * m).numerical_value_ref_in(m) == 1);
static_assert(value_cast<km / h>(2000.0 * m / (3600.0 * s)).numerical_value_ref_in(km / h) == 2);
static_assert((2 * km).force_in(m).numerical_value_ref_in(m) == 2000);
static_assert((2000 * m).force_in(km).numerical_value_ref_in(km) == 2);
static_assert((2000.0 * m / (3600.0 * s)).force_in(km / h).numerical_value_ref_in(km / h) == 2);
//////////////////
// quantity_cast
//////////////////