[Bf-blender-cvs] [a91717d2adc] master: Cleanup: comments (long lines) in atomic

Campbell Barton noreply at git.blender.org
Wed May 1 13:45:45 CEST 2019


Commit: a91717d2adcd8088533e2d86a5ff9a23b3aea2ef
Author: Campbell Barton
Date:   Wed May 1 20:34:12 2019 +1000
Branches: master
https://developer.blender.org/rBa91717d2adcd8088533e2d86a5ff9a23b3aea2ef

Cleanup: comments (long lines) in atomic

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

M	intern/atomic/atomic_ops.h
M	intern/atomic/intern/atomic_ops_utils.h

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

diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index 9d4ec67ba97..106e19567da 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -126,15 +126,17 @@ ATOMIC_INLINE void *atomic_cas_ptr(void **v, void *old, void *_new);
 
 ATOMIC_INLINE float atomic_cas_float(float *v, float old, float _new);
 
-/* WARNING! Float 'atomics' are really faked ones, those are actually closer to some kind of spinlock-sync'ed operation,
- *          which means they are only efficient if collisions are highly unlikely (i.e. if probability of two threads
- *          working on the same pointer at the same time is very low). */
+/* WARNING! Float 'atomics' are really faked ones, those are actually closer to some kind of
+ * spinlock-sync'ed operation, which means they are only efficient if collisions are highly
+ * unlikely (i.e. if probability of two threads working on the same pointer at the same time is
+ * very low). */
 ATOMIC_INLINE float atomic_add_and_fetch_fl(float *p, const float x);
 
 /******************************************************************************/
 /* Include system-dependent implementations. */
 
-/* Note that we are using _unix flavor as fallback here (it will raise precompiler errors as needed). */
+/* Note that we are using _unix flavor as fallback here
+ * (it will raise precompiler errors as needed). */
 #if defined(_MSC_VER)
 #  include "intern/atomic_ops_msvc.h"
 #else
diff --git a/intern/atomic/intern/atomic_ops_utils.h b/intern/atomic/intern/atomic_ops_utils.h
index 4010051607c..b54e12eb49d 100644
--- a/intern/atomic/intern/atomic_ops_utils.h
+++ b/intern/atomic/intern/atomic_ops_utils.h
@@ -116,9 +116,9 @@
       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. */
+ * 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)) };



More information about the Bf-blender-cvs mailing list