From 2e96871176cd21923f96b7caf4d5ebb8ed5a8d36 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Sat, 14 Sep 2024 19:41:43 -0600
Subject: [PATCH] refactor: `is_power_of_quantity_spec` and `is_power_of_dim`
 variable templates converted to concepts

---
 .../include/mp-units/framework/dimension_concepts.h   | 10 ++++------
 .../mp-units/framework/quantity_spec_concepts.h       | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/core/include/mp-units/framework/dimension_concepts.h b/src/core/include/mp-units/framework/dimension_concepts.h
index 5f726c2b..1d289867 100644
--- a/src/core/include/mp-units/framework/dimension_concepts.h
+++ b/src/core/include/mp-units/framework/dimension_concepts.h
@@ -68,21 +68,19 @@ template<typename T>
 struct is_dimension_one : std::false_type {};
 
 template<typename T>
-constexpr bool is_power_of_dim = requires {
-  requires is_specialization_of_power<T> &&
-             (BaseDimension<typename T::factor> || is_dimension_one<typename T::factor>::value);
-};
+concept IsPowerOfDim =
+  is_specialization_of_power<T> && (BaseDimension<typename T::factor> || is_dimension_one<typename T::factor>::value);
 
 template<typename T>
 constexpr bool is_per_of_dims = false;
 
 template<typename... Ts>
 constexpr bool is_per_of_dims<per<Ts...>> =
-  (... && (BaseDimension<Ts> || is_dimension_one<Ts>::value || is_power_of_dim<Ts>));
+  (... && (BaseDimension<Ts> || is_dimension_one<Ts>::value || IsPowerOfDim<Ts>));
 
 template<typename T>
 concept DerivedDimensionExpr =
-  BaseDimension<T> || is_dimension_one<T>::value || is_power_of_dim<T> || is_per_of_dims<T>;
+  BaseDimension<T> || is_dimension_one<T>::value || IsPowerOfDim<T> || is_per_of_dims<T>;
 
 template<auto D1, auto D2>
 concept SameDimension =
diff --git a/src/core/include/mp-units/framework/quantity_spec_concepts.h b/src/core/include/mp-units/framework/quantity_spec_concepts.h
index d780558e..d7263494 100644
--- a/src/core/include/mp-units/framework/quantity_spec_concepts.h
+++ b/src/core/include/mp-units/framework/quantity_spec_concepts.h
@@ -86,21 +86,20 @@ template<typename T>
 struct is_dimensionless : std::false_type {};
 
 template<typename T>
-constexpr bool is_power_of_quantity_spec = requires {
-  requires is_specialization_of_power<T> &&
-             (NamedQuantitySpec<typename T::factor> || is_dimensionless<typename T::factor>::value);
-};
+concept IsPowerOfQuantitySpec = is_specialization_of_power<T> && (NamedQuantitySpec<typename T::factor> ||
+                                                                      is_dimensionless<typename T::factor>::value);
+
 
 template<typename T>
 constexpr bool is_per_of_quantity_specs = false;
 
 template<typename... Ts>
 constexpr bool is_per_of_quantity_specs<per<Ts...>> =
-  (... && (NamedQuantitySpec<Ts> || is_dimensionless<Ts>::value || is_power_of_quantity_spec<Ts>));
+  (... && (NamedQuantitySpec<Ts> || is_dimensionless<Ts>::value || IsPowerOfQuantitySpec<Ts>));
 
 template<typename T>
 concept DerivedQuantitySpecExpr = detail::NamedQuantitySpec<T> || detail::is_dimensionless<T>::value ||
-                                  detail::is_power_of_quantity_spec<T> || detail::is_per_of_quantity_specs<T>;
+                                  detail::IsPowerOfQuantitySpec<T> || detail::is_per_of_quantity_specs<T>;
 
 }  // namespace detail