diff options
author | Jason Merrill <jason@redhat.com> | 2008-10-07 13:35:35 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2008-10-07 13:35:35 -0400 |
commit | 008efc41a8d7449083d7c5a1856b6020b04e9bff (patch) | |
tree | 66a6f96d50996d033dc516d2a672f8105e8fb434 /libstdc++-v3 | |
parent | cf9322ca65565fafdaf789132dd79f509b86ab87 (diff) | |
download | gcc-008efc41a8d7449083d7c5a1856b6020b04e9bff.zip gcc-008efc41a8d7449083d7c5a1856b6020b04e9bff.tar.gz gcc-008efc41a8d7449083d7c5a1856b6020b04e9bff.tar.bz2 |
re PR c++/37761 (Revision 140916 caused libstdc++ failures)
PR libstdc++/37761
* testsuite/abi/demangle/abi_examples/20.cc: Adjust expected spacing.
* testsuite/abi/demangle/abi_text/02.cc: Likewise.
* testsuite/abi/demangle/regression/cw-16.cc: Likewise.
From-SVN: r140943
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/abi/demangle/abi_examples/20.cc | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/abi/demangle/abi_text/02.cc | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/abi/demangle/regression/cw-16.cc | 8 |
4 files changed, 13 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 90c4882..3b27626 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2008-10-07 Jason Merrill <jason@redhat.com> + + PR libstdc++/37761 + * testsuite/abi/demangle/abi_examples/20.cc: Adjust expected spacing. + * testsuite/abi/demangle/abi_text/02.cc: Likewise. + * testsuite/abi/demangle/regression/cw-16.cc: Likewise. + 2008-10-07 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/stl_iterator.h (operator-(const reverse_iterator<>&, diff --git a/libstdc++-v3/testsuite/abi/demangle/abi_examples/20.cc b/libstdc++-v3/testsuite/abi/demangle/abi_examples/20.cc index eaa5db0..1bef745 100644 --- a/libstdc++-v3/testsuite/abi/demangle/abi_examples/20.cc +++ b/libstdc++-v3/testsuite/abi/demangle/abi_examples/20.cc @@ -29,7 +29,7 @@ int main() using namespace __gnu_test; verify_demangle("_ZngILi42EEvN1AIXplT_Li2EEE1TE", - "void operator-<42>(A<(42) + (2)>::T)"); + "void operator-<42>(A<(42)+(2)>::T)"); return 0; } diff --git a/libstdc++-v3/testsuite/abi/demangle/abi_text/02.cc b/libstdc++-v3/testsuite/abi/demangle/abi_text/02.cc index 28a617a..9a41fe5 100644 --- a/libstdc++-v3/testsuite/abi/demangle/abi_text/02.cc +++ b/libstdc++-v3/testsuite/abi/demangle/abi_text/02.cc @@ -33,7 +33,7 @@ int main() // Equivalent, but formatting difference in void argument and parentheses. // icc, __cxa_demangle verify_demangle("_Z3fooILi2EEvRAplT_Li1E_i", - "void foo<2>(int (&) [(2) + (1)])"); + "void foo<2>(int (&) [(2)+(1)])"); // cplus-dem // verify_demangle("_Z3fooILi2EEvRAplT_Li1E_i", // "void foo<(int)2>(int (&) [((int)2)+((int)1)])"); diff --git a/libstdc++-v3/testsuite/abi/demangle/regression/cw-16.cc b/libstdc++-v3/testsuite/abi/demangle/regression/cw-16.cc index 0c8c29f..0db740e 100644 --- a/libstdc++-v3/testsuite/abi/demangle/regression/cw-16.cc +++ b/libstdc++-v3/testsuite/abi/demangle/regression/cw-16.cc @@ -32,9 +32,9 @@ verify_demangle("_Z3fooIA6_KiEvA9_KT_rVPrS4_", "void foo<int const [6]>(int const [9][6], int restrict const (* volatile restrict) [9][6])"); // 2003/11/12, libstdc++/12947 verify_demangle("_Z1fILi5E1AEvN1CIXqugtT_Li0ELi1ELi2EEE1qE", - "void f<5, A>(C<(((5) > (0))) ? (1) : (2)>::q)"); + "void f<5, A>(C<(((5)>(0)))?(1) : (2)>::q)"); verify_demangle("_Z1fILi5EEvN1AIXcvimlT_Li22EEE1qE", - "void f<5>(A<(int)((5) * (22))>::q)"); + "void f<5>(A<(int)((5)*(22))>::q)"); verify_demangle("_Z1fPFYPFiiEiE", "f(int (*(*)(int))(int))"); verify_demangle("_Z1fI1XENT_1tES2_", @@ -43,9 +43,9 @@ verify_demangle("_Z1fILi5E1AEvN1CIXstN1T1tEEXszsrS2_1tEE1qE", "void f<5, A>(C<sizeof (T::t), sizeof (T::t)>::q)"); // 2003/12/03, libstdc++/13045 verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLd4028ae147ae147aeEEE", - "void f<1, (char)120>(A<(1) + ((int)((double)[4028ae147ae147ae]))>)"); + "void f<1, (char)120>(A<(1)+((int)((double)[4028ae147ae147ae]))>)"); verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLf3f800000EEE", - "void f<1, (char)120>(A<(1) + ((int)((float)[3f800000]))>)"); + "void f<1, (char)120>(A<(1)+((int)((float)[3f800000]))>)"); verify_demangle("_Z9hairyfuncM1YKFPVPFrPA2_PM1XKFKPA3_ilEPcEiE", "hairyfunc(int (* const (X::** (* restrict (* volatile* (Y::*)(int) const)(char*)) [2])(long) const) [3])"); |