diff --git a/cmake/modules/AMDiSCXXFeatures.cmake b/cmake/modules/AMDiSCXXFeatures.cmake index c6b5831f4dd093e8024b4fc8a743fd8c60c4d669..a033c651e61f5bc8909b966f9e1641bb2b1ec021 100644 --- a/cmake/modules/AMDiSCXXFeatures.cmake +++ b/cmake/modules/AMDiSCXXFeatures.cmake @@ -13,7 +13,7 @@ check_cxx_source_compiles(" { f(0,1,2,3,4,5); } -" AMDIS_HAS_CXX_FOLD_EXPRESSION +" AMDIS_HAS_CXX_FOLD_EXPRESSIONS ) check_cxx_source_compiles(" diff --git a/src/amdis/common/Math.hpp b/src/amdis/common/Math.hpp index 9897ad0c7898ec30295d730648b2ad83a7d420af..8ff382dce17387dc7b65ddf0c65f63060f2ffc24 100644 --- a/src/amdis/common/Math.hpp +++ b/src/amdis/common/Math.hpp @@ -47,7 +47,6 @@ namespace AMDiS return a < b ? a : b; } -#ifndef AMDIS_HAS_CXX_FOLD_EXPRESSIONS template <class T0> constexpr T0 min(T0 a) { @@ -59,14 +58,6 @@ namespace AMDiS { return min(a, min(ts...)); } -#else - template <class T0, class... Ts> - constexpr auto min(T0 a, Ts... ts) - { - std::common_type_t<T0,Ts...> result = a; - return (result = min(result, ts), ...); - } -#endif /// @} @@ -80,7 +71,6 @@ namespace AMDiS return a < b ? b : a; } -#ifndef AMDIS_HAS_CXX_FOLD_EXPRESSIONS template <class T0> constexpr T0 max(T0 a) { @@ -92,14 +82,6 @@ namespace AMDiS { return max(a, max(ts...)); } -#else - template <class T0, class... Ts> - constexpr auto max(T0 a, Ts... ts) - { - std::common_type_t<T0,Ts...> result = a; - return (result = max(result, ts), ...); - } -#endif /// @}