From owner-svn-src-all@freebsd.org Sat Dec 21 02:44:50 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9570A1EC907; Sat, 21 Dec 2019 02:44:50 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47fqhf3XyWz3GxJ; Sat, 21 Dec 2019 02:44:50 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74DFB8A76; Sat, 21 Dec 2019 02:44:50 +0000 (UTC) (envelope-from rlibby@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBL2io9m088665; Sat, 21 Dec 2019 02:44:50 GMT (envelope-from rlibby@FreeBSD.org) Received: (from rlibby@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBL2ioc8088664; Sat, 21 Dec 2019 02:44:50 GMT (envelope-from rlibby@FreeBSD.org) Message-Id: <201912210244.xBL2ioc8088664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rlibby set sender to rlibby@FreeBSD.org using -f From: Ryan Libby Date: Sat, 21 Dec 2019 02:44:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355976 - head/contrib/googletest/googlemock/include/gmock/internal X-SVN-Group: head X-SVN-Commit-Author: rlibby X-SVN-Commit-Paths: head/contrib/googletest/googlemock/include/gmock/internal X-SVN-Commit-Revision: 355976 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2019 02:44:50 -0000 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