c++: compiler: use remove_cv and remove_reference in rseq_unqual_scalar_typeof

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

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