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 [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id 535863858C27 for ; Tue, 31 Aug 2021 13:19:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 535863858C27 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-1-hw9EdS5tNXeRPIhoInBs8Q-1; Tue, 31 Aug 2021 09:19:03 -0400 X-MC-Unique: hw9EdS5tNXeRPIhoInBs8Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E584B1084F77; Tue, 31 Aug 2021 13:19:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 788B218EF2; Tue, 31 Aug 2021 13:19:02 +0000 (UTC) Date: Tue, 31 Aug 2021 14:19:01 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix 17_intro/names.cc failures on Solaris Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="IQaOXx8OxYucamnZ" Content-Disposition: inline X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 31 Aug 2021 13:19:16 -0000 --IQaOXx8OxYucamnZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Undefine some more names used by Solaris system headers. Tested x86_64-linux and sparc-solaris2.11. Committed to trunk. --IQaOXx8OxYucamnZ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 69b09c5599b201ac039db564c303f7b20d87e0df Author: Jonathan Wakely Date: Tue Aug 31 10:25:53 2021 libstdc++: Fix 17_intro/names.cc failures on Solaris Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Undefine some more names used by Solaris system headers. diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index b945511e088..b5e926fb09f 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -243,6 +243,12 @@ #endif #ifdef __sun__ +// defines these as members of fex_numeric_t +#undef l +#undef f +#undef d +#undef q +#undef p // See https://gcc.gnu.org/ml/libstdc++/2019-05/msg00175.html #undef ptr #endif --IQaOXx8OxYucamnZ--