From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 747183858C39; Tue, 12 Oct 2021 19:41:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 747183858C39 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-9135] libstdc++: Fix 17_intro/names.cc failures on Solaris X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: a1dc688940ffade63452c8f9d80fd4b3204e5f40 X-Git-Newrev: f8e37478914884d88c800cf23cf882521f587c04 Message-Id: <20211012194107.747183858C39@sourceware.org> Date: Tue, 12 Oct 2021 19:41:07 +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: Tue, 12 Oct 2021 19:41:07 -0000 https://gcc.gnu.org/g:f8e37478914884d88c800cf23cf882521f587c04 commit r11-9135-gf8e37478914884d88c800cf23cf882521f587c04 Author: Jonathan Wakely Date: Tue Aug 31 10:25:53 2021 +0100 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. (cherry picked from commit 69b09c5599b201ac039db564c303f7b20d87e0df) Diff: --- libstdc++-v3/testsuite/17_intro/names.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 624e3ed9ccf..226b2d9c24a 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -217,6 +217,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