From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 06F23385780C; Tue, 26 Apr 2022 13:12:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 06F23385780C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10563] libstdc++: Fix test failure on AIX X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 486adf83b0ad75f330651000fd640c6b9d86a97f X-Git-Newrev: c51da9043b4157b43b3e401bdb85b7ec7f7b555a Message-Id: <20220426131205.06F23385780C@sourceware.org> Date: Tue, 26 Apr 2022 13:12:05 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 13:12:05 -0000 https://gcc.gnu.org/g:c51da9043b4157b43b3e401bdb85b7ec7f7b555a commit r10-10563-gc51da9043b4157b43b3e401bdb85b7ec7f7b555a Author: Jonathan Wakely Date: Thu Mar 3 22:20:32 2022 +0000 libstdc++: Fix test failure on AIX This fixes a test failure due to a non-reserved name in an AIX system header (included via ). That name clashes with one of the names we check our own headers for, so skip checking that name on AIX. libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc (func): Undef on AIX. (cherry picked from commit 64cdf49962996747b4c5687a705551d5fc61fac8) Diff: --- libstdc++-v3/testsuite/17_intro/names.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index f60c70ef561..a5642df8666 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -197,6 +197,8 @@ #undef y // defines vario::v #undef v +// defines trb::func and cputime_tmr::func +#undef func #endif #ifdef __hpux__