diff --git a/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h b/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h
index 42b2a9915..aab02c3ec 100644
--- a/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h
+++ b/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h
@@ -49,11 +49,20 @@
 #include "common/memory.h"
 #include "google_breakpad/common/minidump_format.h"
 
+#if __cplusplus > 199711L
+#include <type_traits>
+#endif
+
 namespace google_breakpad {
 
 #if defined(__i386) || defined(__x86_64)
+//typedef typeof(((struct user*) 0)->u_debugreg[0]) debugreg_t;
+#if __cplusplus > 199711L
+typedef std::remove_reference< decltype(((struct user*) 0)->u_debugreg[0]) >::type debugreg_t;
+#else
 typedef typeof(((struct user*) 0)->u_debugreg[0]) debugreg_t;
 #endif
+#endif
 
 // Typedef for our parsing of the auxv variables in /proc/pid/auxv.
 #if defined(__i386) || defined(__ARM_EABI__)