From efe12d3a443f431c97af0f6e60587d1f43652789 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 7 Apr 2022 18:42:05 +0200 Subject: Wrapped min max calls to avoid macro that should be disabled --- contrib/Opcode/Ice/IceFPU.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') diff --git a/contrib/Opcode/Ice/IceFPU.h b/contrib/Opcode/Ice/IceFPU.h index c05fd44..7d36aa4 100644 --- a/contrib/Opcode/Ice/IceFPU.h +++ b/contrib/Opcode/Ice/IceFPU.h @@ -175,25 +175,25 @@ //! A global function to find MAX(a,b) using FCOMI/FCMOV inline_ float FCMax2(float a, float b) { - return std::max(a, b); + return (std::max)(a, b); } //! A global function to find MIN(a,b) using FCOMI/FCMOV inline_ float FCMin2(float a, float b) { - return std::min(a, b); + return (std::min)(a, b); } //! A global function to find MAX(a,b,c) using FCOMI/FCMOV inline_ float FCMax3(float a, float b, float c) { - return std::max(std::max(a, b), c); + return (std::max)((std::max)(a, b), c); } //! A global function to find MIN(a,b,c) using FCOMI/FCMOV inline_ float FCMin3(float a, float b, float c) { - return std::min(std::min(a, b), c); + return (std::min)((std::min)(a, b), c); } inline_ int ConvertToSortable(float f) -- cgit v1.1