From 57868c13dbb3cea8a3beb5d09bda17bdc6c638c7 Mon Sep 17 00:00:00 2001 From: Paul Fd Date: Tue, 10 Mar 2020 13:32:52 +0100 Subject: [PATCH] Use a constexpr min --- src/sfizz/MathHelpers.h | 8 ++++---- src/sfizz/Range.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sfizz/MathHelpers.h b/src/sfizz/MathHelpers.h index 2f88b2f6..bab1c0bd 100644 --- a/src/sfizz/MathHelpers.h +++ b/src/sfizz/MathHelpers.h @@ -17,25 +17,25 @@ template constexpr T max(T op1, T op2) { - return std::max(op1, op2); + return op1 > op2 ? op1 : op2; } template constexpr T max(T op1, Args... rest) { - return std::max(op1, max(rest...)); + return max(op1, max(rest...)); } template constexpr T min(T op1, T op2) { - return std::min(op1, op2); + return op1 > op2 ? op2 : op1; } template constexpr T min(T op1, Args... rest) { - return std::min(op1, min(rest...)); + return min(op1, min(rest...)); } /** diff --git a/src/sfizz/Range.h b/src/sfizz/Range.h index 35e8e1b4..b39b7c0d 100644 --- a/src/sfizz/Range.h +++ b/src/sfizz/Range.h @@ -24,7 +24,7 @@ public: constexpr Range() = default; constexpr Range(Type start, Type end) noexcept : _start(start) - , _end(std::max(start, end)) + , _end(max(start, end)) { }