feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

Merge pull request #563 from NoahBres/master

Browse Source 
Prepend detail namespace to `external/type_name`
This commit is contained in:
Mateusz Pusz
2024-04-19 06:17:41 +09:00
committed by GitHub
parent c8b535cf4c 7705d8b746
commit ae1003b279
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/include/mp-units/bits/external/type_name.h vendored
View File

@@ -6,6 +6,8 @@
#include <string_view>
#endif
namespace mp_units::detail {
template<typename T>
[[nodiscard]] consteval std::string_view type_name()
{
@@ -40,3 +42,5 @@ template<typename T1, typename T2>
else
return v2;
}
} // namespace mp_units::detail

2
src/core/include/mp-units/bits/magnitude.h
View File

@@ -594,7 +594,7 @@ consteval bool less(MagnitudeSpec auto lhs, MagnitudeSpec auto rhs)
using rhs_base_t = decltype(get_base_value(rhs));
if constexpr (is_named_magnitude<lhs_base_t> && is_named_magnitude<rhs_base_t>)
return type_name<lhs_base_t>() < type_name<rhs_base_t>();
return detail::type_name<lhs_base_t>() < detail::type_name<rhs_base_t>();
else if constexpr (!is_named_magnitude<lhs_base_t> && !is_named_magnitude<rhs_base_t>)
return get_base_value(lhs) < get_base_value(rhs);
else

6
src/core/include/mp-units/quantity_spec.h
View File

@@ -96,7 +96,7 @@ template<auto... Args>
}
template<NamedQuantitySpec Lhs, NamedQuantitySpec Rhs>
struct quantity_spec_less : std::bool_constant<type_name<Lhs>() < type_name<Rhs>()> {};
struct quantity_spec_less : std::bool_constant<detail::type_name<Lhs>() < detail::type_name<Rhs>()> {};
template<typename T1, typename T2>
using type_list_of_quantity_spec_less = expr_less<T1, T2, quantity_spec_less>;
@@ -639,7 +639,7 @@ template<Dimension D1, Dimension D2>
else if constexpr (rhs == dimension_one)
return true;
else
return type_name<D1>() < type_name<D2>();
return detail::type_name<D1>() < detail::type_name<D2>();
}
template<QuantitySpec Lhs, QuantitySpec Rhs, bool lhs_eq = requires { Lhs::_equation_; },
@@ -649,7 +649,7 @@ struct ingredients_less :
std::bool_constant<(lhs_compl > rhs_compl) ||
(lhs_compl == rhs_compl && ingredients_dimension_less(Lhs::dimension, Rhs::dimension)) ||
(lhs_compl == rhs_compl && Lhs::dimension == Rhs::dimension &&
type_name<Lhs>() < type_name<Rhs>())> {};
detail::type_name<Lhs>() < detail::type_name<Rhs>())> {};
template<typename T1, typename T2>
using type_list_of_ingredients_less = expr_less<T1, T2, ingredients_less>;

2
src/core/include/mp-units/unit.h
View File

@@ -644,7 +644,7 @@ template<Unit U1, Unit U2>
return u2;
else
// TODO Check if there is a better choice here
return better_type_name(u1, u2);
return detail::better_type_name(u1, u2);
} else {
constexpr auto canonical_lhs = get_canonical_unit(U1{});
constexpr auto canonical_rhs = get_canonical_unit(U2{});