diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:53:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:53:03 +0300 |
| commit | df06f1c816efbe5f6f221110edd024489120bbfc (patch) | |
| tree | 5c6bfee01dcaabb2a9a24feaecb0c8df4779341a | |
| parent | 580b34e52b0cf231cea70891831efd4b1b1c4ee2 (diff) | |
Attempt to fix bloody MSVC atomic intrinsic mess...
| -rw-r--r-- | intern/atomic/intern/atomic_ops_msvc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/atomic/intern/atomic_ops_msvc.h b/intern/atomic/intern/atomic_ops_msvc.h index ab31b3b789a..5e83675f815 100644 --- a/intern/atomic/intern/atomic_ops_msvc.h +++ b/intern/atomic/intern/atomic_ops_msvc.h @@ -142,7 +142,7 @@ ATOMIC_INLINE int32_t atomic_sub_and_fetch_int32(int32_t *p, int32_t x) ATOMIC_INLINE int32_t atomic_cas_int32(int32_t *v, int32_t old, int32_t _new) { - return InterlockedCompareExchange(v, _new, old); + return InterlockedCompareExchange((long *)v, _new, old); } ATOMIC_INLINE int32_t atomic_fetch_and_add_int32(int32_t *p, int32_t x) @@ -152,12 +152,12 @@ ATOMIC_INLINE int32_t atomic_fetch_and_add_int32(int32_t *p, int32_t x) ATOMIC_INLINE int32_t atomic_fetch_and_or_int32(int32_t *p, int32_t x) { - return InterlockedOr(p, x); + return InterlockedOr((long *)p, x); } ATOMIC_INLINE int32_t atomic_fetch_and_and_int32(int32_t *p, int32_t x) { - return InterlockedAnd(p, x); + return InterlockedAnd((long *)p, x); } /******************************************************************************/ |