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

PiperOrigin-RevId: 251713108
This commit is contained in:
Gennadiy Civil 2019-06-07 13:06:50 -04:00
commit 0183a459e5

View File

@ -115,8 +115,11 @@ inline Element* GetRawPointer(Element* p) { return p; }
// //
// To gcc, // To gcc,
// wchar_t == signed wchar_t != unsigned wchar_t == unsigned int // 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__ #ifdef __GNUC__
#if !defined(__WCHAR_UNSIGNED__) #if !defined(__WCHAR_UNSIGNED__) && (__GNUC__ < 9)
// signed/unsigned wchar_t are valid types. // signed/unsigned wchar_t are valid types.
# define GMOCK_HAS_SIGNED_WCHAR_T_ 1 # define GMOCK_HAS_SIGNED_WCHAR_T_ 1
#endif #endif