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 3ba9aeca0c075b10d36e116112b5a359c59b16ff..376b5073facc82957f12ebad6a69cb2911b7c205 100644 (file)
--- a/include/urcu/compiler.h
+++ b/include/urcu/compiler.h
@@ -136,30 +136,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 */