From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3BB293888832; Thu, 21 Apr 2022 12:32:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3BB293888832 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 r11-9904] libstdc++: Fix test failure on AIX X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 6758d51a8fcd6d7681e25967a207d44d41d3378e X-Git-Newrev: bb5652c7285ffa32188352cd4066a37e04f866a6 Message-Id: <20220421123248.3BB293888832@sourceware.org> Date: Thu, 21 Apr 2022 12:32:48 +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: Thu, 21 Apr 2022 12:32:48 -0000 https://gcc.gnu.org/g:bb5652c7285ffa32188352cd4066a37e04f866a6 commit r11-9904-gbb5652c7285ffa32188352cd4066a37e04f866a6 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 226b2d9c24a..e72f49c1443 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -195,6 +195,8 @@ #undef y // defines vario::v #undef v +// defines trb::func and cputime_tmr::func +#undef func #endif #ifdef __APPLE__