diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-05 11:03:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 11:03:08 -0500 |
| commit | 915c8d051d0a717f8af6559c03e4220e3c39a24c (patch) | |
| tree | 4619144d24d9a5c381d8ccfcdec5cf5653036b5a | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| parent | 829a8c966b80237b7c517da55a383698b52c357f (diff) | |
| download | googletest-915c8d051d0a717f8af6559c03e4220e3c39a24c.tar.gz googletest-915c8d051d0a717f8af6559c03e4220e3c39a24c.tar.bz2 googletest-915c8d051d0a717f8af6559c03e4220e3c39a24c.zip | |
Merge pull request #1477 from sgraham/unsigned-wchar
Try to handle unsigned wchar_t (arm) a bit better
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-internal-utils.h | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 4 |
2 files changed, 6 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, diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index f7218391..9447c22b 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -107,7 +107,11 @@ TEST(BuiltInDefaultValueTest, IsZeroForNumericTypes) { EXPECT_EQ(0, BuiltInDefaultValue<signed wchar_t>::Get()); #endif #if GMOCK_WCHAR_T_IS_NATIVE_ +#if !defined(__WCHAR_UNSIGNED__) EXPECT_EQ(0, BuiltInDefaultValue<wchar_t>::Get()); +#else + EXPECT_EQ(0U, BuiltInDefaultValue<wchar_t>::Get()); +#endif #endif EXPECT_EQ(0U, BuiltInDefaultValue<unsigned short>::Get()); // NOLINT EXPECT_EQ(0, BuiltInDefaultValue<signed short>::Get()); // NOLINT |