From dc85dd84b99fbd0b63d2277ef6fda3ade505987d Mon Sep 17 00:00:00 2001
From: Jan Sende <44576417+jansende@users.noreply.github.com>
Date: Mon, 30 Sep 2019 00:07:16 +0200
Subject: [PATCH] Made quantity_cast more versatile

- One can now change the unit type without changing the representation type.
- One can now change the representation type without changing the unit type.
- Had to implement std::common_type<my_value, my_value> to still compile
  integration tests. (It implicitly converted to another representation
  before.)
---
 src/include/units/quantity.h     | 12 +++++++++++-
 test/unit_test/test_quantity.cpp |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/include/units/quantity.h b/src/include/units/quantity.h
index ad7b08ee..ff547d47 100644
--- a/src/include/units/quantity.h
+++ b/src/include/units/quantity.h
@@ -135,11 +135,21 @@ namespace units {
     return cast::cast(q);
   }
 
-  template<Unit ToU, Scalar ToRep = double, typename U, typename Rep>
+  template<Unit ToU, Scalar ToRep, typename U, typename Rep>
   constexpr quantity<ToU, ToRep> quantity_cast(const quantity<U, Rep>& q)
   {
     return quantity_cast<quantity<ToU, ToRep>>(q);
   }
+  template<Unit ToU, typename U, typename Rep>
+  constexpr quantity<ToU, Rep> quantity_cast(const quantity<U, Rep>& q)
+  {
+    return quantity_cast<quantity<ToU, Rep>>(q);
+  }
+  template<Scalar ToRep, typename U, typename Rep>
+  constexpr quantity<U, ToRep> quantity_cast(const quantity<U, Rep>& q)
+  {
+    return quantity_cast<quantity<U, ToRep>>(q);
+  }
 
 
   // quantity_values
diff --git a/test/unit_test/test_quantity.cpp b/test/unit_test/test_quantity.cpp
index e7bd28d7..fb8e88a5 100644
--- a/test/unit_test/test_quantity.cpp
+++ b/test/unit_test/test_quantity.cpp
@@ -62,6 +62,10 @@ namespace units {
 
 namespace std {
 
+  template<typename T, typename U>
+  struct common_type<my_value<T>, my_value<U>> : common_type<T, U> {
+  };
+
   template<typename T, typename U>
   struct common_type<my_value<T>, U> : common_type<T, U> {
   };