diff --git a/src/core/include/mp-units/framework/quantity_spec.h b/src/core/include/mp-units/framework/quantity_spec.h index af23ad74..8a3b4598 100644 --- a/src/core/include/mp-units/framework/quantity_spec.h +++ b/src/core/include/mp-units/framework/quantity_spec.h @@ -764,15 +764,15 @@ template template [[nodiscard]] consteval auto explode(Q, type_list, type_list) { - constexpr auto n = get_complexity(Num{}); + constexpr auto num = get_complexity(Num{}); constexpr auto den = get_complexity(Den{}); - constexpr auto max_compl = n > den ? n : den; + constexpr auto max_compl = num > den ? num : den; - if constexpr (max_compl == Complexity || ((n >= den && !requires { explode_to_equation(Num{}); }) || - (n < den && !requires { explode_to_equation(Den{}); }))) + if constexpr (max_compl == Complexity || ((num >= den && !requires { explode_to_equation(Num{}); }) || + (num < den && !requires { explode_to_equation(Den{}); }))) return explode_result{(map_power(Num{}) * ... * map_power(Nums{})) / (map_power(Den{}) * ... * map_power(Dens{}))}; else { - if constexpr (n >= den) { + if constexpr (num >= den) { constexpr auto res = explode_to_equation(Num{}); return explode((res.equation * ... * map_power(Nums{})) / (map_power(Den{}) * ... * map_power(Dens{}))) diff --git a/src/core/include/mp-units/framework/symbol_text.h b/src/core/include/mp-units/framework/symbol_text.h index d2875821..36dd4942 100644 --- a/src/core/include/mp-units/framework/symbol_text.h +++ b/src/core/include/mp-units/framework/symbol_text.h @@ -128,9 +128,9 @@ public: MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(a)); } - constexpr symbol_text(const fixed_u8string& u, const fixed_string& text) : unicode_(u), ascii_(text) + constexpr symbol_text(const fixed_u8string& unicode, const fixed_string& ascii) : unicode_(unicode), ascii_(ascii) { - MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(text.data_)); + MP_UNITS_EXPECTS(detail::is_basic_literal_character_set(ascii.data_)); } [[nodiscard]] constexpr const auto& unicode() const { return unicode_; }