summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-actions_test.cc
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2018-02-23 20:28:09 (GMT)
committerScott Graham <scottmg@chromium.org>2018-02-23 20:28:09 (GMT)
commit567b40eeb15338402a204fc15362e553549aadea (patch)
tree4db0cd5c2083817db38aff755d70b479f1eb2e3b /googlemock/test/gmock-actions_test.cc
parent3a4cf1a02ef4adc28fccb7eef2b573b14cd59009 (diff)
downloadgoogletest-567b40eeb15338402a204fc15362e553549aadea.zip
googletest-567b40eeb15338402a204fc15362e553549aadea.tar.gz
googletest-567b40eeb15338402a204fc15362e553549aadea.tar.bz2
Try to handle unsigned wchar_t (arm) a bit better
Diffstat (limited to 'googlemock/test/gmock-actions_test.cc')
-rw-r--r--googlemock/test/gmock-actions_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index f721839..9447c22 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