From 563037e401dba9b532e8dd7d7a22a315d8d60c3a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 26 Apr 2020 09:22:25 +0100 Subject: [PATCH] Add brackets around bitmath macro definitions --- src/core/bitmath_func.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/bitmath_func.hpp b/src/core/bitmath_func.hpp index 3d0774d66e..cc259af594 100644 --- a/src/core/bitmath_func.hpp +++ b/src/core/bitmath_func.hpp @@ -401,14 +401,14 @@ static inline T ROR(const T x, const uint8 n) * (since it will use hardware swapping if available). * Even though they should return uint16 and uint32, we get * warnings if we don't cast those (why?) */ - #define BSWAP64(x) ((uint64)CFSwapInt64((uint64)x)) - #define BSWAP32(x) ((uint32)CFSwapInt32((uint32)x)) - #define BSWAP16(x) ((uint16)CFSwapInt16((uint16)x)) + #define BSWAP64(x) ((uint64)CFSwapInt64((uint64)(x))) + #define BSWAP32(x) ((uint32)CFSwapInt32((uint32)(x))) + #define BSWAP16(x) ((uint16)CFSwapInt16((uint16)(x))) #elif defined(_MSC_VER) /* MSVC has intrinsics for swapping, resulting in faster code */ - #define BSWAP64(x) ((uint64)_byteswap_uint64((uint64)x)) - #define BSWAP32(x) ((uint32)_byteswap_ulong((uint32)x)) - #define BSWAP16(x) ((uint16)_byteswap_ushort((uint16)x)) + #define BSWAP64(x) ((uint64)_byteswap_uint64((uint64)(x))) + #define BSWAP32(x) ((uint32)_byteswap_ulong((uint32)(x))) + #define BSWAP16(x) ((uint16)_byteswap_ushort((uint16)(x))) #else /** * Perform a 64 bits endianness bitswap on x.