Skip to content

Commit

Permalink
fix small merge regression
Browse files Browse the repository at this point in the history
  • Loading branch information
burnpanck committed Sep 14, 2024
1 parent afc69a6 commit 61198fe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/include/mp-units/bits/sudo_cast.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ template<QuantityPoint ToQP, typename FwdFromQP, QuantityPoint FromQP = std::rem
{
constexpr Magnitude auto c_mag = get_canonical_unit(FromQP::unit).mag / get_canonical_unit(ToQP::unit).mag;
using type_traits = conversion_type_traits<c_mag, typename FromQP::rep, typename ToQP::rep>;
using c_rep_type = type_traits::c_rep_typ;
using c_rep_type = type_traits::c_rep_type;
using multiplier_type = typename type_traits::multiplier_type;
using value_traits = conversion_value_traits<c_mag, multiplier_type>;

Expand Down
2 changes: 1 addition & 1 deletion src/core/include/mp-units/framework/quantity_point.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class quantity_point {
constexpr quantity_point(FwdQ&& q, PO2) :
quantity_point(
quantity_point<std::remove_reference_t<Q>::reference, PO2{}, typename std::remove_reference_t<Q>::rep>{
std::forward<Q>(q), PO2{}})
std::forward<FwdQ>(q), PO2{}})
{
}

Expand Down

0 comments on commit 61198fe

Please sign in to comment.