diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-01 18:10:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-01 18:10:41 +0400 |
| commit | 4bcccc24c1bb412d19d5e4ecfb3cbbbbc86321af (patch) | |
| tree | 926ed7bb60ea4cd876ba23a2434605adfe0904cb /intern/atomic/atomic_ops.h | |
| parent | f3252c261dc21ffaceab2e1b377c824d70ee9436 (diff) | |
Fix OS X compile error after enabling strict build flags for this module.
Diffstat (limited to 'intern/atomic/atomic_ops.h')
| -rw-r--r-- | intern/atomic/atomic_ops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h index 21d686a8e80..243e194102f 100644 --- a/intern/atomic/atomic_ops.h +++ b/intern/atomic/atomic_ops.h @@ -91,13 +91,13 @@ atomic_sub_uint64(uint64_t *p, uint64_t x) ATOMIC_INLINE uint64_t atomic_add_uint64(uint64_t *p, uint64_t x) { - return (OSAtomicAdd64((int64_t)x, (int64_t *)p)); + return (uint64_t)(OSAtomicAdd64((int64_t)x, (int64_t *)p)); } ATOMIC_INLINE uint64_t atomic_sub_uint64(uint64_t *p, uint64_t x) { - return (OSAtomicAdd64(-((int64_t)x), (int64_t *)p)); + return (uint64_t)(OSAtomicAdd64(-((int64_t)x), (int64_t *)p)); } # elif (defined(__amd64__) || defined(__x86_64__)) ATOMIC_INLINE uint64_t @@ -189,13 +189,13 @@ atomic_sub_uint32(uint32_t *p, uint32_t x) ATOMIC_INLINE uint32_t atomic_add_uint32(uint32_t *p, uint32_t x) { - return (OSAtomicAdd32((int32_t)x, (int32_t *)p)); + return (uint32_t)(OSAtomicAdd32((int32_t)x, (int32_t *)p)); } ATOMIC_INLINE uint32_t atomic_sub_uint32(uint32_t *p, uint32_t x) { - return (OSAtomicAdd32(-((int32_t)x), (int32_t *)p)); + return (uint32_t)(OSAtomicAdd32(-((int32_t)x), (int32_t *)p)); } #elif (defined(__i386__) || defined(__amd64__) || defined(__x86_64__)) ATOMIC_INLINE uint32_t |