diff --git a/src/core/include/mp-units/framework/expression_template.h b/src/core/include/mp-units/framework/expression_template.h index 891396ab..abc897ca 100644 --- a/src/core/include/mp-units/framework/expression_template.h +++ b/src/core/include/mp-units/framework/expression_template.h @@ -117,8 +117,8 @@ constexpr bool ratio_one = true; template requires(detail::valid_ratio && detail::positive_ratio && !detail::ratio_one) struct power final { - using factor = F; - static constexpr detail::ratio exponent{Num, Den...}; + using _factor_ = F; + static constexpr detail::ratio _exponent_{Num, Den...}; }; namespace detail { @@ -146,7 +146,7 @@ template consteval auto power_or_T_impl() { if constexpr (is_specialization_of_power) { - return power_or_T_impl(); + return power_or_T_impl(); } else { if constexpr (R.den == 1) { if constexpr (R.num == 1) @@ -198,13 +198,13 @@ struct expr_consolidate_impl> { // replaces the instance of a type and a power of it with one with incremented power template struct expr_consolidate_impl, Rest...>> { - using type = expr_consolidate_impl::exponent + 1>, Rest...>>::type; + using type = expr_consolidate_impl::_exponent_ + 1>, Rest...>>::type; }; // accumulates the powers of instances of the same type (removes the element in case the accumulation result is `0`) template struct expr_consolidate_impl, power, Rest...>> { - static constexpr ratio r = power::exponent + power::exponent; + static constexpr ratio r = power::_exponent_ + power::_exponent_; using type = expr_consolidate_impl, Rest...>>::type; }; @@ -260,7 +260,7 @@ struct expr_simplify_power { template typename Pred> struct expr_simplify, NRest...>, type_list, Pred> { using impl = expr_simplify, type_list, Pred>; - using type = expr_simplify_power::exponent, ratio{1}>; + using type = expr_simplify_power::_exponent_, ratio{1}>; using num = type_list_join; using den = type_list_join; }; @@ -269,7 +269,7 @@ struct expr_simplify, NRest...>, type_list typename Pred> struct expr_simplify, type_list, DRest...>, Pred> { using impl = expr_simplify, type_list, Pred>; - using type = expr_simplify_power::exponent>; + using type = expr_simplify_power::_exponent_>; using num = type_list_join; using den = type_list_join; }; @@ -280,7 +280,7 @@ template, power>) struct expr_simplify, NRest...>, type_list, DRest...>, Pred> { using impl = expr_simplify, type_list, Pred>; - using type = expr_simplify_power::exponent, power::exponent>; + using type = expr_simplify_power::_exponent_, power::_exponent_>; using num = type_list_join; using den = type_list_join; }; diff --git a/src/core/include/mp-units/framework/quantity_spec.h b/src/core/include/mp-units/framework/quantity_spec.h index c0395069..cf752f89 100644 --- a/src/core/include/mp-units/framework/quantity_spec.h +++ b/src/core/include/mp-units/framework/quantity_spec.h @@ -703,7 +703,7 @@ template requires requires { Q::_equation_; } [[nodiscard]] consteval auto explode_to_equation(power) { - constexpr ratio exp = power::exponent; + constexpr ratio exp = power::_exponent_; return explode_to_equation_result{ pow(Q::_equation_), defines_equation(Q{}) ? specs_convertible_result::yes : specs_convertible_result::explicit_conversion}; @@ -917,13 +917,13 @@ template constexpr auto qto = map_power(To{}); if constexpr (get_kind_tree_root(qfrom) == get_kind_tree_root(qto)) { if constexpr (is_specialization_of_power && is_specialization_of_power) - return extract_results{true, typename From::factor{}, typename To::factor{}, prepend_rest::no}; + return extract_results{true, typename From::_factor_{}, typename To::_factor_{}, prepend_rest::no}; else return extract_results{true, qfrom, qto, prepend_rest::no}; } else { auto normalize = [](Q) { if constexpr (is_specialization_of_power) - return std::tuple{typename Q::factor{}, Q::exponent}; + return std::tuple{typename Q::_factor_{}, Q::_exponent_}; else return std::tuple{Q{}, ratio{1}}; };