svn commit: r355976 - head/contrib/googletest/googlemock/include/gmock/internal

[Ryan Libby]

Author: rlibby
Date: Sat Dec 21 02:44:50 2019
New Revision: 355976
URL: https://svnweb.freebsd.org/changeset/base/355976

Log:
  googletest: pick from upstream: Don't allow signed/unsigned wchar_t in gcc 9 and later
  
  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

Modified:
  head/contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h

Modified: head/contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
==============================================================================
--- head/contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h	Sat Dec 21 02:44:38 2019	(r355975)
+++ head/contrib/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h	Sat Dec 21 02:44:50 2019	(r355976)
@@ -125,8 +125,11 @@ struct LinkedPtrLessThan {
 //
 // To gcc,
 //   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__
-#if !defined(__WCHAR_UNSIGNED__)
+#if !defined(__WCHAR_UNSIGNED__) && (__GNUC__ < 9)
 // signed/unsigned wchar_t are valid types.
 # define GMOCK_HAS_SIGNED_WCHAR_T_ 1
 #endif