summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal/gmock-internal-utils.h
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/include/gmock/internal/gmock-internal-utils.h
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/include/gmock/internal/gmock-internal-utils.h')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h2
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 319b389..37ceb54 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,