From ab80e01451ccd065d9ca9da08f36d74044534122 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Tue, 20 Nov 2018 13:06:53 +0100 Subject: [PATCH] Revert unintentional changes to rt_math.h This reverts a part of commit 7e70412090a63b63661cfdcb3cd147113217c54e. --- rtengine/rt_math.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/rtengine/rt_math.h b/rtengine/rt_math.h index b21d26564..9342f5430 100644 --- a/rtengine/rt_math.h +++ b/rtengine/rt_math.h @@ -56,13 +56,6 @@ constexpr const T& min(const T& a, const T& b) return b < a ? b : a; } -template<> -constexpr const float& min(const float& a, const float& b) -{ - // For consistency reasons we return b instead of a if a == b or a == NaN - return a < b ? a : b; -} - template constexpr const T& min(const T& a, const T& b, const ARGS&... args) { @@ -81,13 +74,6 @@ constexpr const T& max(const T& a, const T& b) return a < b ? b : a; } -template<> -constexpr const float& max(const float& a, const float& b) -{ - // For consistency reasons we return b instead of a if a == b or a == NaN - return b < a ? a : b; -} - template constexpr const T& max(const T& a, const T& b, const ARGS&... args) {