[Bf-blender-cvs] [efefae6] master: Atomics: Use _InterlockedAnd8 direction for 342bit MSVC

Sergey Sharybin noreply at git.blender.org
Wed Jan 27 14:17:26 CET 2016


Commit: efefae62de5a92a6d44b0bc759767bcdd503f199
Author: Sergey Sharybin
Date:   Wed Jan 27 14:16:02 2016 +0100
Branches: master
https://developer.blender.org/rBefefae62de5a92a6d44b0bc759767bcdd503f199

Atomics: Use _InterlockedAnd8 direction for 342bit MSVC

That's what MSDN tells you to do and that's how to solve the compilation
error problem with it.

===================================================================

M	intern/atomic/atomic_ops.h

===================================================================

diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index c7bb050..dc06a51 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -393,7 +393,11 @@ atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
 ATOMIC_INLINE uint8_t
 atomic_fetch_and_and_uint8(uint8_t *p, uint8_t b)
 {
+#if (LG_SIZEOF_PTR == 3 || LG_SIZEOF_INT == 3)
 	return InterlockedAnd8((char *)p, (char)b);
+#else
+	return _InterlockedAnd8((char *)p, (char)b);
+#endif
 }
 #else
 #  error "Missing implementation for 8-bit atomic operations"




More information about the Bf-blender-cvs mailing list