From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 3 Jul 2023 15:21:08 +0000 (-0400)
Subject: Revert "compiler.h: Introduce caa_unqual_scalar_typeof"
X-Git-Tag: v0.14.1~19
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=de217ade9f82fcb2ddf39aeb23629af2ee3236f3;p=userspace-rcu.git

Revert "compiler.h: Introduce caa_unqual_scalar_typeof"

This reverts commit 67988e204d2c471b24cae61f3f8fedb4f9375034.

_Generic requires C11, but liburcu supports C99.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I3b7c7a629cb9b7417caea4ff30b4844ff3d081e9
---

diff --git a/include/urcu/compiler.h b/include/urcu/compiler.h
index 09953f2..0de713a 100644
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -140,30 +140,4 @@
 				+ __GNUC_PATCHLEVEL__)
 #endif
 
-#ifdef __cplusplus
-#define caa_unqual_scalar_typeof(x)					\
-	std::remove_cv<std::remove_reference<decltype(x)>::type>::type
-#else
-#define caa_scalar_type_to_expr(type)					\
-	unsigned type: (unsigned type)0,				\
-	signed type: (signed type)0
-
-/*
- * Use C11 _Generic to express unqualified type from expression. This removes
- * volatile qualifier from expression type.
- */
-#define caa_unqual_scalar_typeof(x)					\
-	__typeof__(							\
-		_Generic((x),						\
-			char: (char)0,					\
-			caa_scalar_type_to_expr(char),			\
-			caa_scalar_type_to_expr(short),		\
-			caa_scalar_type_to_expr(int),			\
-			caa_scalar_type_to_expr(long),			\
-			caa_scalar_type_to_expr(long long),		\
-			default: (x)					\
-		)							\
-	)
-#endif
-
 #endif /* _URCU_COMPILER_H */