Merge branch 'master' into ref_docs

JohelEGP · Nov 2, 2024 · 111f24a · 111f24a
2 parents a4502de + 80a4d6b
commit 111f24a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/core/include/mp-units/framework/quantity_concepts.h b/src/core/include/mp-units/framework/quantity_concepts.h
@@ -59,8 +59,10 @@ template<typename T, template<typename> typename Traits>
 concept QuantityLikeImpl = requires(const T& qty, const Traits<T>::rep& num) {
   { Traits<T>::to_numerical_value(qty) } -> std::same_as<typename Traits<T>::rep>;
   { Traits<T>::from_numerical_value(num) } -> std::same_as<T>;
-  { Traits<T>::explicit_import } -> std::convertible_to<bool>;
-  { Traits<T>::explicit_export } -> std::convertible_to<bool>;
+  requires std::same_as<decltype(Traits<T>::explicit_import), const bool>;
+  requires std::same_as<decltype(Traits<T>::explicit_export), const bool>;
+  typename std::bool_constant<Traits<T>::explicit_import>;
+  typename std::bool_constant<Traits<T>::explicit_export>;
 };
 
 }  // namespace detail

diff --git a/src/core/include/mp-units/framework/quantity_point.h b/src/core/include/mp-units/framework/quantity_point.h
@@ -81,9 +81,9 @@ struct point_origin_interface {
   [[nodiscard]] friend constexpr Quantity auto operator-(PO1 po1, PO2 po2)
   {
     if constexpr (is_derived_from_specialization_of_v<PO1, absolute_point_origin>) {
-      return -(po2.quantity_point - po2.quantity_point.absolute_point_origin);
+      return po1 - po2.quantity_point;
     } else if constexpr (is_derived_from_specialization_of_v<PO2, absolute_point_origin>) {
-      return po1.quantity_point - po1.quantity_point.absolute_point_origin;
+      return po1.quantity_point - po2;
     } else {
       return po1.quantity_point - po2.quantity_point;
     }