X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Fpointer.h;h=9e46a5769c92fc99142adf55989aa0d37581647c;hb=896aeceb6d19b66a0cbd40424265fa8fb9ef4228;hp=465a6101bcb12b5708ccfb90334b00969bf6b0c3;hpb=c634e78c961b17f3a3d530dea833a9865b338f00;p=userspace-rcu.git

diff --git a/include/urcu/static/pointer.h b/include/urcu/static/pointer.h
index 465a610..9e46a57 100644
--- a/include/urcu/static/pointer.h
+++ b/include/urcu/static/pointer.h
@@ -93,12 +93,15 @@ extern "C" {
 /*
  * If p is const (the pointer itself, not what it points to), using
  * __typeof__(p) would declare a const variable, leading to
- * -Wincompatible-pointer-types errors.  Using `+ 0` makes it an rvalue and
- * gets rid of the const-ness.
+ * -Wincompatible-pointer-types errors.  Using the statement expression
+ * makes it an rvalue and gets rid of the const-ness.
  */
 #ifdef __URCU_DEREFERENCE_USE_ATOMIC_CONSUME
 # define _rcu_dereference(p) __extension__ ({						\
-				__typeof__(p + 0) _________p1;				\
+				__typeof__(__extension__ ({				\
+					__typeof__(p) __attribute__((unused)) _________p0 = { 0 }; \
+					_________p0;					\
+				})) _________p1;					\
 				__atomic_load(&(p), &_________p1, __ATOMIC_CONSUME);	\
 				(_________p1);						\
 			})