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

Give up on implicit conversion

Browse Source 
I don't understand what MSVC is complaining about, and it may end up
being easier to just make the conversion explicit.
This commit is contained in:
Chip Hogg
2022-04-06 01:40:17 +00:00
parent f77a92ca04
commit b616e58216
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/include/units/magnitude.h
View File

@@ -517,16 +517,14 @@ constexpr auto numerator(magnitude<BPs...>)
constexpr auto denominator(Magnitude auto m) { return numerator(pow<-1>(m)); } constexpr auto denominator(Magnitude auto m) { return numerator(pow<-1>(m)); }
// Implementation of implicit conversion to ratio goes here, because it needs `numerator()` and `denominator()`. // Implementation of conversion to ratio goes here, because it needs `numerator()` and `denominator()`.
template<BasePower auto... BPs> constexpr ratio as_ratio(Magnitude auto m)
requires detail::is_base_power_pack_valid<BPs...>
constexpr magnitude<BPs...>::operator ratio() const
{ {
static_assert(is_rational(magnitude<BPs...>{})); static_assert(is_rational(m));
return ratio{ return ratio{
get_value<std::intmax_t>(numerator(*this)), get_value<std::intmax_t>(numerator(m)),
get_value<std::intmax_t>(denominator(*this)), get_value<std::intmax_t>(denominator(m)),
}; };
} }

4
test/unit_test/runtime/magnitude_test.cpp
View File

@@ -374,9 +374,9 @@ TEST_CASE("Constructing ratio from rational magnitude")
check_ratio_round_trip_is_identity<ratio{5, 8}>(); check_ratio_round_trip_is_identity<ratio{5, 8}>();
} }
SECTION("Rational magnitude implicitly converts to ratio") SECTION("Rational magnitude converts to ratio")
{ {
constexpr ratio r = as_magnitude<ratio{22, 7}>(); constexpr ratio r = as_ratio(as_magnitude<ratio{22, 7}>());
CHECK(r == ratio{22, 7}); CHECK(r == ratio{22, 7});
} }