From 26164edeac7b732f48d1b939d7b8246bc5a70cdc Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 22 May 2023 17:53:50 +0200 Subject: [PATCH] refactor: constraints for `common_unit` improved --- src/core/include/mp_units/unit.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/include/mp_units/unit.h b/src/core/include/mp_units/unit.h index da4d324a..776191c7 100644 --- a/src/core/include/mp_units/unit.h +++ b/src/core/include/mp_units/unit.h @@ -602,10 +602,10 @@ inline constexpr struct per_mille : named_unit -[[nodiscard]] consteval auto common_unit(U1 u1, U2 u2) +[[nodiscard]] consteval Unit auto common_unit(U1 u1, U2 u2) requires(detail::have_same_canonical_reference_unit(u1, u2)) { if constexpr (U1{} == U2{}) { @@ -628,7 +628,7 @@ template } } -[[nodiscard]] consteval auto common_unit(Unit auto u1, Unit auto u2, Unit auto u3, Unit auto... rest) +[[nodiscard]] consteval Unit auto common_unit(Unit auto u1, Unit auto u2, Unit auto u3, Unit auto... rest) requires requires { common_unit(common_unit(u1, u2), u3, rest...); } { return common_unit(common_unit(u1, u2), u3, rest...);