Implementierung von convertible_units als Funktion

martinfehrs · Jan 24, 2024 · 098b44c · 098b44c
1 parent 3cee698
commit 098b44c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/zollstock/scalar.hpp b/include/zollstock/scalar.hpp
@@ -60,13 +60,13 @@ namespace zollstock
             return -this->value_;
         }
 
-        template <unit_c auto that_unit> requires convertible_units_c<unit_type, decltype(that_unit)>
+        template <unit_c auto that_unit> requires(convertible_units(this_unit, that_unit))
         [[nodiscard]] constexpr scalar<that_unit, value_type> as() const noexcept
         {
             return this->as_impl<that_unit>(make_quantity_index_sequence{});
         }
 
-        template <unit_c auto that_unit> requires convertible_units_c<unit_type, decltype(that_unit)>
+        template <unit_c auto that_unit> requires(convertible_units(this_unit, that_unit))
         [[nodiscard]] constexpr operator scalar<that_unit, value_type>() const noexcept
         {
             return this->as<that_unit>();

diff --git a/include/zollstock/unit_concept.hpp b/include/zollstock/unit_concept.hpp
@@ -34,10 +34,10 @@ namespace zollstock
         { Candidate::symbols   } -> std::same_as<const quantity_symbols  &>;
     };
 
-    template <typename Unit1, typename Unit2>
-    concept convertible_units_c = unit_c<Unit1>
-                               && unit_c<Unit2>
-                               && Unit1::exponents == Unit2::exponents;
+    [[nodiscard]] consteval bool convertible_units(unit_c auto unit_1, unit_c auto unit_2) noexcept
+    {
+        return unit_1.exponents == unit_2.exponents;
+    }
 
     template <unit_c Unit, int exponent_>
     struct unit_exponentiation