mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-08 23:19:40 +00:00
(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.
This commit is contained in:
parent
29f44c099a
commit
a70f2244e8
@ -225,7 +225,11 @@ static FORCEINLINE int32 ClampToI32(const int64 a)
|
|||||||
*/
|
*/
|
||||||
static FORCEINLINE uint16 ClampToU16(const uint64 a)
|
static FORCEINLINE uint16 ClampToU16(const uint64 a)
|
||||||
{
|
{
|
||||||
return (uint16)min<uint64>(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<uint64>(a, (uint64)UINT16_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user