diff options
author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2021-10-26 14:07:57 +0200 |
---|---|---|
committer | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2021-10-26 14:07:57 +0200 |
commit | 931f1e377ad27af2801c1e68946010e980810539 (patch) | |
tree | 1868d89a491e88707884bd7103232d6416a7bc3f | |
parent | 88037d82d7646d8b04d5940f06e882b3778b7aec (diff) | |
download | gcc-931f1e377ad27af2801c1e68946010e980810539.zip gcc-931f1e377ad27af2801c1e68946010e980810539.tar.gz gcc-931f1e377ad27af2801c1e68946010e980810539.tar.bz2 |
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 <ro@CeBiTec.Uni-Bielefeld.DE>
libstdc++-v3:
* testsuite/28_regex/basic_regex/84110.cc (test01)
[__cpp_exceptions]: Disambiguate extended.
-rw-r--r-- | libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/84110.cc index b9971dc..16f928b 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 |