From 96d67c8920f6e2c0353d7de71f3debfe6ccbb3dd Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 21 Apr 2023 10:56:25 -0400
Subject: [PATCH] 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
---
 include/rseq/compiler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/rseq/compiler.h b/include/rseq/compiler.h
index e2afe06..c1be323 100644
--- 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
-- 
2.34.1