Fix refcount cast (#384)

eclipse-zenoh · Mar 25, 2024 · 3e42741 · 3e42741
1 parent 2e813e7
commit 3e42741
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/include/zenoh-pico/collections/refcount.h b/include/zenoh-pico/collections/refcount.h
@@ -45,19 +45,20 @@
 #define _ZP_RC_CNT_TYPE _z_atomic(unsigned int)
 #define _ZP_RC_OP_INIT_CNT _z_atomic_store_explicit(&p.in->_cnt, (unsigned int)1, _z_memory_order_relaxed);
 #define _ZP_RC_OP_INCR_CNT _z_atomic_fetch_add_explicit(&p->in->_cnt, (unsigned int)1, _z_memory_order_relaxed);
-#define _ZP_RC_OP_DECR_AND_CMP _z_atomic_fetch_sub_explicit(&p->in->_cnt, (unsigned int)1, _z_memory_order_release) > 1
+#define _ZP_RC_OP_DECR_AND_CMP \
+    _z_atomic_fetch_sub_explicit(&p->in->_cnt, (unsigned int)1, _z_memory_order_release) > (unsigned int)1
 #define _ZP_RC_OP_SYNC atomic_thread_fence(_z_memory_order_acquire);
 
 #else  // ZENOH_C_STANDARD == 99
 #ifdef ZENOH_COMPILER_GCC
 
 // c99 gcc sync builtin variant
 #define _ZP_RC_CNT_TYPE unsigned int
-#define _ZP_RC_OP_INIT_CNT                \
-    __sync_fetch_and_and(&p.in->_cnt, 0); \
-    __sync_fetch_and_add(&p.in->_cnt, 1);
-#define _ZP_RC_OP_INCR_CNT __sync_fetch_and_add(&p->in->_cnt, 1);
-#define _ZP_RC_OP_DECR_AND_CMP __sync_fetch_and_sub(&p->in->_cnt, 1) > 1
+#define _ZP_RC_OP_INIT_CNT                              \
+    __sync_fetch_and_and(&p.in->_cnt, (unsigned int)0); \
+    __sync_fetch_and_add(&p.in->_cnt, (unsigned int)1);
+#define _ZP_RC_OP_INCR_CNT __sync_fetch_and_add(&p->in->_cnt, (unsigned int)1);
+#define _ZP_RC_OP_DECR_AND_CMP __sync_fetch_and_sub(&p->in->_cnt, (unsigned int)1) > (unsigned int)1
 #define _ZP_RC_OP_SYNC __sync_synchronize();
 
 #else  // !ZENOH_COMPILER_GCC
@@ -76,9 +77,9 @@
 
 // Single thread variant
 #define _ZP_RC_CNT_TYPE unsigned int
-#define _ZP_RC_OP_INIT_CNT p.in->_cnt = 1;
-#define _ZP_RC_OP_INCR_CNT p->in->_cnt += 1;
-#define _ZP_RC_OP_DECR_AND_CMP p->in->_cnt-- > 1
+#define _ZP_RC_OP_INIT_CNT p.in->_cnt = (unsigned int)1;
+#define _ZP_RC_OP_INCR_CNT p->in->_cnt += (unsigned int)1;
+#define _ZP_RC_OP_DECR_AND_CMP p->in->_cnt-- > (unsigned int)1
 #define _ZP_RC_OP_SYNC
 
 #endif  // Z_FEATURE_MULTI_THREAD == 1