From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id A40F13858413; Mon, 25 Oct 2021 12:01:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A40F13858413 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=none smtp.mailfrom=cebitec.uni-bielefeld.de Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 6B5A5B03C6; Mon, 25 Oct 2021 14:01:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y_nqaw8xi0od; Mon, 25 Oct 2021 14:01:46 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p50855d38.dip0.t-ipconnect.de [80.133.93.56]) (Authenticated sender: ro) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 777F4B00E7; Mon, 25 Oct 2021 14:01:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=CeBiTec.Uni-Bielefeld.DE; s=20200306; t=1635163306; bh=J38FOTs5bqrM5KP8ELTdo3wG/wfV9LOS/bkIaXOq9lA=; h=From:To:Cc:Subject:Date:From; b=ZCT/inGKKu8zFgIaYYBubhgwLwlAPtMyUM6nvqUCycfdvGJw4aBnr5WTXH/JYr2Cl SAKVuOab1SaIeAGMy48e2i849JUwZWLrr79PxvP5KBgl+Xlym6QU2QoAj48AfONNZ9 aCG6oFH986n0Otwc/uCPQ2KcXW7A4e4prpxhh4PpuUuhnka/e/y6gkHvg7n/qthf0E mk/l3kBOPGMVkZJJXaW01Y9y4SkDpGP+j8KJCKnOmCiSz4EnZzg1zdUOvZRbbrNdIC CwlzkNvToBTQRcqx6DhIRrjkLwWuusfepEyyHRhtv3lYFcY+4p0KahdSHPNJAcOWNs hQvBF72EPMCfg== From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org Subject: [PATCH] libstdc++: Fix 28_regex/basic_regex/84110.cc on Solaris Date: Mon, 25 Oct 2021 14:01:45 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1.90 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Status: No, score=-3795.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, 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: Mon, 25 Oct 2021 12:01:50 -0000 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 28_regex/basic_regex/84110.cc currently FAILs on Solaris: FAIL: 28_regex/basic_regex/84110.cc (test for excess errors) UNRESOLVED: 28_regex/basic_regex/84110.cc compilation failed to produce exe= cutable Excess errors: /vol/gcc/src/hg/master/local/libstdc++-v3/testsuite/28_regex/basic_regex/84= 110.cc:14: error: reference to 'extended' is ambiguous The issue is seen in the full output: /vol/gcc/src/hg/master/local/libstdc++-v3/testsuite/28_regex/basic_regex/84= 110.cc: In function =E2=80=98void test01()=E2=80=99: /vol/gcc/src/hg/master/local/libstdc++-v3/testsuite/28_regex/basic_regex/84= 110.cc:14: error: reference to =E2=80=98extended=E2=80=99 is ambiguous In file included from /var/gcc/regression/master/11.4-gcc-gas/build/gcc/inc= lude-fixed/math.h:391, from /var/gcc/regression/master/11.4-gcc-gas/build/i386-pc= -solaris2.11/libstdc++-v3/include/cmath:45, from /vol/gcc/src/hg/master/local/libstdc++-v3/include/pre= compiled/stdc++.h:41: /usr/include/floatingpoint.h:73: note: candidates are: =E2=80=98typedef uns= igned int extended [3]=E2=80=99 Fixed by qualifying extended. Tested on i386-pc-solaris2.11, sparc-sun-solaris2.11, and x86_64-pc-linux-gnu. Ok for master? I'm not certain if this is the best fix, though. Rainer --=20 ---------------------------------------------------------------------------= -- Rainer Orth, Center for Biotechnology, Bielefeld University 2021-10-20 Rainer Orth libstdc++-v3: * testsuite/28_regex/basic_regex/84110.cc (test01) [__cpp_exceptions]: Disambiguate extended. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=sol2-libstdc++-84110.patch # HG changeset patch # Parent 1a71c5553268184d62ac25cc8838e7ad096199b3 libstdc++: Fix 28_regex/basic_regex/84110.cc on Solaris diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc --- a/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc @@ -11,7 +11,7 @@ void test01() #if __cpp_exceptions using namespace std::regex_constants; - for (auto syn : {basic, extended, awk, grep, egrep}) + for (auto syn : {basic, std::regex::extended, awk, grep, egrep}) { try { --=-=-=--