From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 436A2386103F for ; Wed, 25 Nov 2020 17:41:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 436A2386103F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-238-3EhmmmiEOUOiRpZKlHBXDA-1; Wed, 25 Nov 2020 12:41:30 -0500 X-MC-Unique: 3EhmmmiEOUOiRpZKlHBXDA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 789F1107ACE3; Wed, 25 Nov 2020 17:41:28 +0000 (UTC) Received: from localhost (unknown [10.33.37.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 276BF60855; Wed, 25 Nov 2020 17:41:27 +0000 (UTC) Date: Wed, 25 Nov 2020 17:41:27 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test failure on AIX Message-ID: <20201125174127.GA2017149@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2020 17:41:34 -0000 --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This fixes a failure on AIX 7.2: FAIL: 17_intro/names.cc (test for excess errors) Excess errors: /home/jwakely/src/gcc/libstdc++-v3/testsuite/17_intro/names.cc:99: error: expected identifier before '(' token /usr/include/sys/var.h:187: error: expected unqualified-id before '{' token /usr/include/sys/var.h:187: error: expected ')' before '{' token /usr/include/sys/var.h:337: error: expected unqualified-id before ';' token /usr/include/sys/var.h:337: error: expected ')' before ';' token libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Do not test 'v' on AIX. Tested powerpc64le-linux and powerpc-aix. Committed to trunk. --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 1a8d1f54de371de88b2604d8c0e4e01306be8870 Author: Jonathan Wakely Date: Wed Nov 25 16:58:05 2020 libstdc++: Fix test failure on AIX This fixes a failure on AIX 7.2: FAIL: 17_intro/names.cc (test for excess errors) Excess errors: /home/jwakely/src/gcc/libstdc++-v3/testsuite/17_intro/names.cc:99: error: expected identifier before '(' token /usr/include/sys/var.h:187: error: expected unqualified-id before '{' token /usr/include/sys/var.h:187: error: expected ')' before '{' token /usr/include/sys/var.h:337: error: expected unqualified-id before ';' token /usr/include/sys/var.h:337: error: expected ')' before ';' token libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Do not test 'v' on AIX. diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 5a61c97e9899..2c8bfff26e1c 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -193,6 +193,8 @@ #undef r #undef x #undef y +// defines vario::v +#undef v #endif #ifdef __hpux__ --h31gzZEtNLTqOjlF--