Merge branch 'issue/math_max_min' into 'master'

cleanup max and min in Math See merge request !192

Merge branch 'issue/math_max_min' into 'master'
cleanup max and min in Math See merge request !192
1f3895e9 · Praetorius, Simon · 47282811 · fcc6632d · 1f3895e9
Commit 1f3895e9 authored Jul 27, 2020 by Praetorius, Simon
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

amdis/common/Math.hpp amdis/common/Math.hpp +4 -4

No files found.
--- a/amdis/common/Math.hpp
+++ b/amdis/common/Math.hpp
@@ -43,8 +43,8 @@ namespace AMDiS
    template <class T0, class T1>
    constexpr auto min(T0 a, T1 b)
    {
-      using T = std::conditional_t<(sizeof(T0)>sizeof(T1)),T0,T1>;
-      return a < b ? T(a) : T(b);
+      using T = std::common_type_t<T0,T1>;
+      return T(a) < T(b) ? a : b;
    }

    template <class T0>
@@ -69,8 +69,8 @@ namespace AMDiS
    template <class T0, class T1>
    constexpr auto max(T0 a, T1 b)
    {
-      using T = std::conditional_t<(sizeof(T0)>sizeof(T1)),T0,T1>;
-      return a < b ? T(b) : T(a);
+      using T = std::common_type_t<T0,T1>;
+      return T(a) < T(b) ? b : a;
    }

    template <class T0>