public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-9904] libstdc++: Fix test failure on AIX
Date: Thu, 21 Apr 2022 12:32:48 +0000 (GMT)	[thread overview]
Message-ID: <20220421123248.3BB293888832@sourceware.org> (raw)

https://gcc.gnu.org/g:bb5652c7285ffa32188352cd4066a37e04f866a6

commit r11-9904-gbb5652c7285ffa32188352cd4066a37e04f866a6
Author: Jonathan Wakely <jwakely@redhat.com>
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 <pthread.h>). 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
 // <sys/var.h> defines vario::v
 #undef v
+// <sys/timer.h> defines trb::func and cputime_tmr::func
+#undef func
 #endif
 
 #ifdef __APPLE__


                 reply	other threads:[~2022-04-21 12:32 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220421123248.3BB293888832@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).