commit 0183a459e5014f8c81dda27bee643da3b07554d6
author Gennadiy Civil <misterg@google.com> Fri Jun 07 13:06:50 2019 -0400
committer Gennadiy Civil <misterg@google.com> Fri Jun 07 13:06:50 2019 -0400
tree daed3e0afef073a2dcc2301e9e64a05051e3479a
parent 31200def0dec8a624c861f919e86e4444e6e6ee7
parent 711fccf8317b4fb7adc21c00fc1e20823c5d875f

Merge pull request #2270 from Peter-Levine:fix-signed-wchar

PiperOrigin-RevId: 251713108

googlemock/include/gmock/internal/gmock-internal-utils.h

diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index 093b465..01e96cf 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -115,8 +115,11 @@
 //
 // To gcc,
 //   wchar_t == signed wchar_t != unsigned wchar_t == unsigned int
+//
+// gcc-9 appears to treat signed/unsigned wchar_t as ill-formed
+// regardless of the signage of its underlying type.
 #ifdef __GNUC__
-#if !defined(__WCHAR_UNSIGNED__)
+#if !defined(__WCHAR_UNSIGNED__) && (__GNUC__ < 9)
 // signed/unsigned wchar_t are valid types.
 # define GMOCK_HAS_SIGNED_WCHAR_T_ 1
 #endif