d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

googletest: pick from upstream: Don't allow signed/unsigned wchar_t in gcc 9 and later

Browse Source 
Pick 711fccf8317b4fb7adc21c00fc1e20823c5d875f from upstream googletest:

    Don't allow signed/unsigned wchar_t in gcc 9 and later

Upstream pull request:	https://github.com/google/googletest/pull/2270

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Ryan Libby 2019-12-21 02:44:50 +00:00
parent 79457a8ad1
commit f157ca4696
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
View File

@ -125,8 +125,11 @@ struct LinkedPtrLessThan {
// //
// 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