From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 24AC6384D183; Thu, 7 Jul 2022 23:32:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24AC6384D183 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10119] libstdc++: Fix 28_regex/basic_regex/84110.cc on Solaris X-Act-Checkin: gcc X-Git-Author: Rainer Orth X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 5df21c00aedb7878b8854901e95d7eda70266d31 X-Git-Newrev: 490685354ebf57c509383145d87c4fe3432f6055 Message-Id: <20220707233219.24AC6384D183@sourceware.org> Date: Thu, 7 Jul 2022 23:32:19 +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: Thu, 07 Jul 2022 23:32:19 -0000 https://gcc.gnu.org/g:490685354ebf57c509383145d87c4fe3432f6055 commit r11-10119-g490685354ebf57c509383145d87c4fe3432f6055 Author: Rainer Orth Date: Tue Oct 26 14:07:57 2021 +0200 libstdc++: Fix 28_regex/basic_regex/84110.cc on Solaris 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 executable Excess errors: /vol/gcc/src/hg/master/local/libstdc++-v3/testsuite/28_regex/basic_regex/84110.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/84110.cc: In function ‘void test01()’: /vol/gcc/src/hg/master/local/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc:14: error: reference to ‘extended’ is ambiguous In file included from /var/gcc/regression/master/11.4-gcc-gas/build/gcc/include-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/precompiled/stdc++.h:41: /usr/include/floatingpoint.h:73: note: candidates are: ‘typedef unsigned int extended [3]’ Fixed by disambiguating extended. Tested on i386-pc-solaris2.11, sparc-sun-solaris2.11, and x86_64-pc-linux-gnu. 2021-10-20 Rainer Orth libstdc++-v3: * testsuite/28_regex/basic_regex/84110.cc (test01) [__cpp_exceptions]: Disambiguate extended. (cherry picked from commit 931f1e377ad27af2801c1e68946010e980810539) Diff: --- libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc index b9971dcaac5..16f928b40ef 100644 --- a/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc @@ -11,6 +11,9 @@ void test01() #if __cpp_exceptions using namespace std::regex_constants; + // See https://gcc.gnu.org/pipermail/gcc-patches/2021-October/582486.html + using std::regex_constants::extended; + for (auto syn : {basic, extended, awk, grep, egrep}) { try