mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-31 19:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: explicit object parameter support fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2024-01-19 19:34:06 +01:00
parent 840b0bd54e
commit 3a6249fc5e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -411,7 +411,11 @@ struct quantity_spec<Self, QS, Eq, Args...> : quantity_spec<Self, QS, Args...> {
*/ */
template<detail::IntermediateDerivedQuantitySpecExpr... Expr> template<detail::IntermediateDerivedQuantitySpecExpr... Expr>
struct derived_quantity_spec : struct derived_quantity_spec :
#ifdef __cpp_explicit_this_parameter
detail::quantity_spec_interface,
#else
detail::quantity_spec_interface<derived_quantity_spec<Expr...>>, detail::quantity_spec_interface<derived_quantity_spec<Expr...>>,
#endif
detail::expr_fractions<detail::is_dimensionless, Expr...> { detail::expr_fractions<detail::is_dimensionless, Expr...> {
using _base_ = detail::expr_fractions<detail::is_dimensionless, Expr...>; using _base_ = detail::expr_fractions<detail::is_dimensionless, Expr...>;
@@ -443,9 +447,9 @@ concept QuantitySpecWithNoSpecifiers = detail::NamedQuantitySpec<T> || detail::I
} // namespace detail } // namespace detail
#ifdef __cpp_explicit_this_parameter #ifdef __cpp_explicit_this_parameter
template<detail::QuantitySpecWithNoSpecifiers auto Q> template<auto Q>
requires(get_kind(Q) == Q) requires(detail::QuantitySpecWithNoSpecifiers<std::remove_const_t<decltype(Q)>>) && (get_kind(Q) == Q)
struct kind_of_<Q> : Q { struct kind_of_<Q> : std::remove_const_t<decltype(Q)> {
static constexpr auto _quantity_spec_ = Q; static constexpr auto _quantity_spec_ = Q;
}; };
#else #else
@@ -1416,12 +1420,9 @@ template<typename Self, NamedQuantitySpec auto QS, auto... Args>
template<QuantitySpec Q> template<QuantitySpec Q>
[[nodiscard]] consteval auto remove_kind(Q q) [[nodiscard]] consteval auto remove_kind(Q q)
{ {
if constexpr (detail::QuantityKindSpec<Q>) { if constexpr (detail::QuantityKindSpec<Q>)
if constexpr (requires { Q::_parent_; }) return Q::_quantity_spec_;
return Q::_parent_; else
else
return Q::_equation_;
} else
return q; return q;
} }