From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 18 Nov 2021 20:08:53 +0000 (-0500)
Subject: fix: use urcu-tls compat with c++ compiler
X-Git-Tag: v0.12.3~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=385c05d4676533664dfe918842063aee8708d185;p=urcu.git

fix: use urcu-tls compat with c++ compiler

  * Initialize all fields of 'struct urcu_tls' to avoid :

    sorry, unimplemented: non-trivial designated initializers not supported

  * Cast void* to proper type pointers to avoid :

    error: invalid conversion from ‘void*’ to ...

Change-Id: I654f924324cda2eaea723f4a0759d706b2a2bf40
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/urcu/tls-compat.h b/include/urcu/tls-compat.h
index 24ef1b9..d6082fe 100644
--- a/include/urcu/tls-compat.h
+++ b/include/urcu/tls-compat.h
@@ -112,6 +112,7 @@ struct urcu_tls {
 	type *__tls_access_ ## name(void)			\
 	{							\
 		static struct urcu_tls __tls_ ## name = {	\
+			.key = 0,				\
 			.init_mutex = PTHREAD_MUTEX_INITIALIZER,\
 			.init_done = 0,				\
 		};						\
@@ -128,9 +129,9 @@ struct urcu_tls {
 			pthread_mutex_unlock(&__tls_ ## name.init_mutex); \
 		}						\
 		cmm_smp_rmb();	/* read init_done before getting key */ \
-		__tls_p = pthread_getspecific(__tls_ ## name.key); \
+		__tls_p = (__typeof__(type) *) pthread_getspecific(__tls_ ## name.key); \
 		if (caa_unlikely(__tls_p == NULL)) {		\
-			__tls_p = calloc(1, sizeof(type));	\
+			__tls_p = (__typeof__(type) *) calloc(1, sizeof(type));	\
 			do_init					\
 			(void) pthread_setspecific(__tls_ ## name.key,	\
 				__tls_p);			\