[Bf-blender-cvs] [3d66ee8c978] master: Intern/atomic: Fix `const` qualifier for `atomic_load_ptr`.

YimingWu noreply at git.blender.org
Tue May 31 15:05:34 CEST 2022


Commit: 3d66ee8c97898ff676f46e866e4003ac1039b3f6
Author: YimingWu
Date:   Tue May 31 21:04:32 2022 +0800
Branches: master
https://developer.blender.org/rB3d66ee8c97898ff676f46e866e4003ac1039b3f6

Intern/atomic: Fix `const` qualifier for `atomic_load_ptr`.

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

M	intern/atomic/atomic_ops.h
M	intern/atomic/intern/atomic_ops_ext.h

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

diff --git a/intern/atomic/atomic_ops.h b/intern/atomic/atomic_ops.h
index d1d672a1c4b..65b0c8f9671 100644
--- a/intern/atomic/atomic_ops.h
+++ b/intern/atomic/atomic_ops.h
@@ -124,7 +124,7 @@ ATOMIC_INLINE unsigned int atomic_fetch_and_sub_u(unsigned int *p, unsigned int
 ATOMIC_INLINE unsigned int atomic_cas_u(unsigned int *v, unsigned int old, unsigned int _new);
 
 ATOMIC_INLINE void *atomic_cas_ptr(void **v, void *old, void *_new);
-ATOMIC_INLINE void *atomic_load_ptr(const void **v);
+ATOMIC_INLINE void *atomic_load_ptr(void *const *v);
 ATOMIC_INLINE void atomic_store_ptr(void **p, void *v);
 
 ATOMIC_INLINE float atomic_cas_float(float *v, float old, float _new);
diff --git a/intern/atomic/intern/atomic_ops_ext.h b/intern/atomic/intern/atomic_ops_ext.h
index fcf01c942ff..b5e1022fb91 100644
--- a/intern/atomic/intern/atomic_ops_ext.h
+++ b/intern/atomic/intern/atomic_ops_ext.h
@@ -205,7 +205,7 @@ ATOMIC_INLINE void *atomic_cas_ptr(void **v, void *old, void *_new)
 #endif
 }
 
-ATOMIC_INLINE void *atomic_load_ptr(const void **v)
+ATOMIC_INLINE void *atomic_load_ptr(void *const *v)
 {
 #if (LG_SIZEOF_PTR == 8)
   return (void *)atomic_load_uint64((const uint64_t *)v);



More information about the Bf-blender-cvs mailing list