diff options
Diffstat (limited to 'intern/atomic/intern/atomic_ops_utils.h')
| -rw-r--r-- | intern/atomic/intern/atomic_ops_utils.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h index ff71d113f45..4010051607c 100644 --- a/intern/atomic/intern/atomic_ops_utils.h +++ b/intern/atomic/intern/atomic_ops_utils.h @@ -62,11 +62,11 @@ #endif #ifdef __GNUC__ -# define _ATOMIC_LIKELY(x) __builtin_expect(!!(x), 1) -# define _ATOMIC_UNLIKELY(x) __builtin_expect(!!(x), 0) +# define _ATOMIC_LIKELY(x) __builtin_expect(!!(x), 1) +# define _ATOMIC_UNLIKELY(x) __builtin_expect(!!(x), 0) #else -# define _ATOMIC_LIKELY(x) (x) -# define _ATOMIC_UNLIKELY(x) (x) +# define _ATOMIC_LIKELY(x) (x) +# define _ATOMIC_UNLIKELY(x) (x) #endif #if defined(__SIZEOF_POINTER__) @@ -77,7 +77,7 @@ # elif (UINTPTR_MAX == 0xFFFFFFFFFFFFFFFF) # define LG_SIZEOF_PTR 8 # endif -#elif defined(__WORDSIZE) /* Fallback for older glibc and cpp */ +#elif defined(__WORDSIZE) /* Fallback for older glibc and cpp */ # if (__WORDSIZE == 32) # define LG_SIZEOF_PTR 4 # elif (__WORDSIZE == 64) @@ -100,9 +100,8 @@ /* Copied from BLI_utils... */ /* C++ can't use _Static_assert, expects static_assert() but c++0x only, * Coverity also errors out. */ -#if (!defined(__cplusplus)) && \ - (!defined(__COVERITY__)) && \ - (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) /* gcc4.6+ only */ +#if (!defined(__cplusplus)) && (!defined(__COVERITY__)) && \ + (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406)) /* gcc4.6+ only */ # define ATOMIC_STATIC_ASSERT(a, msg) __extension__ _Static_assert(a, msg); #else /* Code adapted from http://www.pixelbeat.org/programming/gcc/static_assert.html */ @@ -110,17 +109,19 @@ * expand __LINE__ with one indirection before doing the actual concatenation. */ # define ATOMIC_ASSERT_CONCAT_(a, b) a##b # define ATOMIC_ASSERT_CONCAT(a, b) ATOMIC_ASSERT_CONCAT_(a, b) - /* These can't be used after statements in c89. */ -# if defined(__COUNTER__) /* MSVC */ +/* These can't be used after statements in c89. */ +# if defined(__COUNTER__) /* MSVC */ # define ATOMIC_STATIC_ASSERT(a, msg) \ - ; enum { ATOMIC_ASSERT_CONCAT(static_assert_, __COUNTER__) = 1 / (int)(!!(a)) }; -# else /* older gcc, clang... */ - /* This can't be used twice on the same line so ensure if using in headers + ; \ + enum { ATOMIC_ASSERT_CONCAT(static_assert_, __COUNTER__) = 1 / (int)(!!(a)) }; +# else /* older gcc, clang... */ +/* This can't be used twice on the same line so ensure if using in headers * that the headers are not included twice (by wrapping in #ifndef...#endif) * Note it doesn't cause an issue when used on same line of separate modules * compiled with gcc -combine -fwhole-program. */ # define ATOMIC_STATIC_ASSERT(a, msg) \ - ; enum { ATOMIC_ASSERT_CONCAT(assert_line_, __LINE__) = 1 / (int)(!!(a)) }; + ; \ + enum { ATOMIC_ASSERT_CONCAT(assert_line_, __LINE__) = 1 / (int)(!!(a)) }; # endif #endif |