Revert "compiler: C++: simplify rseq_unqual_scalar_typeof implementation"

This reverts commit 38f60c8d69e147b5997f850e4f163c36b2e1c91a.

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

diff --git a/include/rseq/compiler.h b/include/rseq/compiler.h
index 38c8db4fca9d427dc34a4816cc62973d56c022e3..e2afe061b77b6477a93a4176b6e20668b5ac963d 100644 (file)
--- a/include/rseq/compiler.h
+++ b/include/rseq/compiler.h
@@ -41,7 +41,7 @@
 
 #ifdef __cplusplus
 #define rseq_unqual_scalar_typeof(x)                                   \
-       std::remove_cv<__typeof__(x)>::type>
+       __typeof__(reinterpret_cast<std::remove_cv<__typeof__(x)>::type>((__typeof__(x))0))
 #else
 /*
  * Use C11 _Generic to express unqualified type from expression. This removes