From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4309C385842B; Thu, 3 Mar 2022 22:35:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4309C385842B 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 r12-7469] libstdc++: Fix test failure on AIX X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 9805965e3551b66b5bd751d6076791d00cdeb137 X-Git-Newrev: 64cdf49962996747b4c5687a705551d5fc61fac8 Message-Id: <20220303223537.4309C385842B@sourceware.org> Date: Thu, 3 Mar 2022 22:35:37 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2022 22:35:37 -0000 https://gcc.gnu.org/g:64cdf49962996747b4c5687a705551d5fc61fac8 commit r12-7469-g64cdf49962996747b4c5687a705551d5fc61fac8 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. 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 1f7f83da8fa..ede2fe8caa7 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -203,6 +203,8 @@ #undef y // defines vario::v #undef v +// defines trb::func and cputime_tmr::func +#undef func #endif #ifdef __APPLE__