From a70f2244e8038205dee10ec7b7bebd1b444bc7c6 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 9 Dec 2009 09:28:47 +0000 Subject: (svn r18443) -Fix (r18438): MSVC thinks, in it's infinite wisdom, that int min(int, int) is a better match for min(uint64, uint) than uint64 min(uint64, uint64). As such we need to cast the UINT16_MAX to prevent MSVC from displaying it's infinite wisdom with loads of warnings. --- src/core/math_func.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/core/math_func.hpp') diff --git a/src/core/math_func.hpp b/src/core/math_func.hpp index 576db697d..48690ec58 100644 --- a/src/core/math_func.hpp +++ b/src/core/math_func.hpp @@ -225,7 +225,11 @@ static FORCEINLINE int32 ClampToI32(const int64 a) */ static FORCEINLINE uint16 ClampToU16(const uint64 a) { - return (uint16)min(a, UINT16_MAX); + /* MSVC thinks, in it's infinite wisdom, that int min(int, int) is a better + * match for min(uint64, uint) than uint64 min(uint64, uint64). As such we + * need to cast the UINT16_MAX to prevent MSVC from displaying it's + * infinite with loads of warnings. */ + return (uint16)min(a, (uint64)UINT16_MAX); } /** -- cgit v1.2.3-54-g00ecf