X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Fuatomic.h;fp=include%2Furcu%2Fuatomic.h;h=aca9a63da3af2d5301b92daa47fa5cdbfcedfa4b;hp=5365f1fb0fdac0159edb06835f639b3045cc79eb;hb=455a8429f01ee5f98161bd8710c50ba0bdec61f2;hpb=97d13221f8a10e9ba38821dea2c2ff299d166c71

diff --git a/include/urcu/uatomic.h b/include/urcu/uatomic.h
index 5365f1f..aca9a63 100644
--- a/include/urcu/uatomic.h
+++ b/include/urcu/uatomic.h
@@ -5,9 +5,8 @@
 #ifndef _URCU_UATOMIC_H
 #define _URCU_UATOMIC_H
 
-#include <assert.h>
-
 #include <urcu/arch.h>
+#include <urcu/compiler.h>
 #include <urcu/config.h>
 
 enum cmm_memorder {
@@ -25,14 +24,12 @@ enum cmm_memorder {
 /*
  * Make sure that CMM_SEQ_CST_FENCE is not equivalent to other memory orders.
  */
-# ifdef static_assert
-static_assert(CMM_RELAXED == __ATOMIC_RELAXED, "");
-static_assert(CMM_CONSUME == __ATOMIC_CONSUME, "");
-static_assert(CMM_ACQUIRE == __ATOMIC_ACQUIRE, "");
-static_assert(CMM_RELEASE == __ATOMIC_RELEASE, "");
-static_assert(CMM_ACQ_REL == __ATOMIC_ACQ_REL, "");
-static_assert(CMM_SEQ_CST == __ATOMIC_SEQ_CST, "");
-# endif
+urcu_static_assert(CMM_RELAXED == __ATOMIC_RELAXED, "", cmm_relaxed);
+urcu_static_assert(CMM_CONSUME == __ATOMIC_CONSUME, "", cmm_consume);
+urcu_static_assert(CMM_ACQUIRE == __ATOMIC_ACQUIRE, "", cmm_acquire);
+urcu_static_assert(CMM_RELEASE == __ATOMIC_RELEASE, "", cmm_release);
+urcu_static_assert(CMM_ACQ_REL == __ATOMIC_ACQ_REL, "", cmm_acq_rel);
+urcu_static_assert(CMM_SEQ_CST == __ATOMIC_SEQ_CST, "", cmm_seq_cst);
 
 /*
  * This is not part of the public API. It it used internally to implement the