From c598201d113fb3ae7ca133980fa1701e8157dc2d Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Fri, 22 Apr 2022 13:07:01 +0200
Subject: [PATCH] fix: `ranged_representation` refactored to work with older
 compilers

---
 example/glide_computer/include/geographic.h |  5 +++--
 example/include/ranged_representation.h     | 22 +++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/example/glide_computer/include/geographic.h b/example/glide_computer/include/geographic.h
index e8a56714..9c72b1e0 100644
--- a/example/glide_computer/include/geographic.h
+++ b/example/glide_computer/include/geographic.h
@@ -28,6 +28,7 @@
 #include <units/isq/si/length.h>
 #include <units/quantity_kind.h>
 #include <limits>
+#include <numbers>
 #include <ostream>
 
 // IWYU pragma: begin_exports
@@ -38,10 +39,10 @@ namespace geographic {
 
 // TODO Change to `angle` dimension in degree unit when the work on magnitudes is done
 template<typename T = double>
-using latitude = units::dimensionless<units::one, ranged_representation<T, T(-90), T(90)>>;
+using latitude = units::dimensionless<units::one, ranged_representation<T, -90, 90>>;
 
 template<typename T = double>
-using longitude = units::dimensionless<units::one, ranged_representation<T, T(-180), T(180)>>;
+using longitude = units::dimensionless<units::one, ranged_representation<T, -180, 180>>;
 
 template<class CharT, class Traits, typename T>
 std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& os, const latitude<T>& lat)
diff --git a/example/include/ranged_representation.h b/example/include/ranged_representation.h
index 8d5ec234..b620729e 100644
--- a/example/include/ranged_representation.h
+++ b/example/include/ranged_representation.h
@@ -26,27 +26,23 @@
 #include <algorithm>
 #include <type_traits>
 
-template<auto Min, auto Max>
-inline constexpr auto is_in_range = [](const auto& v) { return std::clamp(v, Min, Max) == v; };
+template<typename T, auto Min, auto Max>
+inline constexpr auto is_in_range = [](const auto& v) { return std::clamp(v, T{Min}, T{Max}) == v; };
 
-template<typename T, T Min, T Max>
-class ranged_representation : public validated_type<T, decltype(is_in_range<Min, Max>)> {
+template<typename T, auto Min, auto Max>
+class ranged_representation : public validated_type<T, decltype(is_in_range<T, Min, Max>)> {
 public:
-  using base = validated_type<T, decltype(is_in_range<Min, Max>)>;
+  using base = validated_type<T, decltype(is_in_range<T, Min, Max>)>;
   using base::validated_type;
   constexpr ranged_representation() : base(T{}) {}
 
   [[nodiscard]] constexpr ranged_representation operator-() const { return ranged_representation(-this->value()); }
 };
 
-template<typename T, T Min, T Max>
+template<typename T, auto Min, auto Max>
 struct std::common_type<std::intmax_t, ranged_representation<T, Min, Max>> :
-    std::type_identity<
-      ranged_representation<std::common_type_t<std::intmax_t, T>, std::common_type_t<std::intmax_t, T>{Min},
-                            std::common_type_t<std::intmax_t, T>{Max}>> {};
+    std::type_identity<ranged_representation<std::common_type_t<std::intmax_t, T>, Min, Max>> {};
 
-template<typename T, T Min, T Max>
+template<typename T, auto Min, auto Max>
 struct std::common_type<ranged_representation<T, Min, Max>, std::intmax_t> :
-    std::type_identity<
-      ranged_representation<std::common_type_t<T, std::intmax_t>, std::common_type_t<T, std::intmax_t>{Min},
-                            std::common_type_t<T, std::intmax_t>{Max}>> {};
+    std::type_identity<ranged_representation<std::common_type_t<T, std::intmax_t>, Min, Max>> {};