[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59706] trunk/blender/intern/atomic/ atomic_ops.h: Fix OS X compile error after enabling strict build flags for this module.

[Brecht Van Lommel]

Revision: 59706
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59706
Author:   blendix
Date:     2013-09-01 14:10:41 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Fix OS X compile error after enabling strict build flags for this module.

Modified Paths:
--------------
    trunk/blender/intern/atomic/atomic_ops.h

Modified: trunk/blender/intern/atomic/atomic_ops.h
===================================================================
--- trunk/blender/intern/atomic/atomic_ops.h	2013-09-01 14:10:40 UTC (rev 59705)
+++ trunk/blender/intern/atomic/atomic_ops.h	2013-09-01 14:10:41 UTC (rev 59706)
@@ -91,13 +91,13 @@
 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_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