diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-04-01 13:43:57 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-04-01 13:43:57 +0100 |
| commit | 5c7c365d5f3e5467de350f2e81a31407a3f52505 (patch) | |
| tree | 475f7996651558fde1e45d7f37b62bc3b9aca272 /googlemock/include/gmock/internal/gmock-internal-utils.h | |
| parent | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (diff) | |
| parent | 7888184f28509dba839e3683409443e0b5bb8948 (diff) | |
| download | googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.tar.gz googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.tar.bz2 googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-internal-utils.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h index 319b389b..37ceb549 100644 --- a/googlemock/include/gmock/internal/gmock-internal-utils.h +++ b/googlemock/include/gmock/internal/gmock-internal-utils.h @@ -117,9 +117,11 @@ struct LinkedPtrLessThan { // To gcc, // wchar_t == signed wchar_t != unsigned wchar_t == unsigned int #ifdef __GNUC__ +#if !defined(__WCHAR_UNSIGNED__) // signed/unsigned wchar_t are valid types. # define GMOCK_HAS_SIGNED_WCHAR_T_ 1 #endif +#endif // In what follows, we use the term "kind" to indicate whether a type // is bool, an integer type (excluding bool), a floating-point type, |