diff options
| author | Ollie Wild <aaw@google.com> | 2007-07-02 17:28:53 +0000 |
|---|---|---|
| committer | Ollie Wild <aaw@gcc.gnu.org> | 2007-07-02 17:28:53 +0000 |
| commit | d49343266bbe24e86d772f2cf1513012e1fae90c (patch) | |
| tree | a4f17635a40140ac6c646dfbdc65ee0e9a81d215 | |
| parent | 38bb34854d8db945714ee40d23f4c79a327cae93 (diff) | |
| download | gcc-d49343266bbe24e86d772f2cf1513012e1fae90c.zip gcc-d49343266bbe24e86d772f2cf1513012e1fae90c.tar.gz gcc-d49343266bbe24e86d772f2cf1513012e1fae90c.tar.bz2 | |
using16.C: Merge dg-errors with common line.
* g++.dg/lookup/using16.C: Merge dg-errors with common line.
* g++.dg/lookup/using17.C: Merge dg-errors with common line.
From-SVN: r126218
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/using16.C | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/using17.C | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4eec59e..40a309f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-07-02 Ollie Wild <aaw@google.com> + + * g++.dg/lookup/using16.C: Merge dg-errors with common line. + * g++.dg/lookup/using17.C: Merge dg-errors with common line. + 2007-07-02 Richard Sandiford <richard@codesourcery.com> * gcc.target/mips/save-restore-1.c: New test. diff --git a/gcc/testsuite/g++.dg/lookup/using16.C b/gcc/testsuite/g++.dg/lookup/using16.C index e373f37..ff6a80e 100644 --- a/gcc/testsuite/g++.dg/lookup/using16.C +++ b/gcc/testsuite/g++.dg/lookup/using16.C @@ -15,5 +15,4 @@ using namespace M; using namespace N; struct ::S s; // { dg-bogus "ambiguous.*ambiguous" "duplicate error" } -// { dg-error "reference to 'S' is ambiguous" "" { target *-*-* } 17 }} -// { dg-error "invalid type" "" { target *-*-* } 17 } +// { dg-error "reference to 'S' is ambiguous|invalid type" "" { target *-*-* } 17 }} diff --git a/gcc/testsuite/g++.dg/lookup/using17.C b/gcc/testsuite/g++.dg/lookup/using17.C index 5988885..b98b21a 100644 --- a/gcc/testsuite/g++.dg/lookup/using17.C +++ b/gcc/testsuite/g++.dg/lookup/using17.C @@ -11,5 +11,4 @@ struct S {}; // { dg-error "candidates are: struct S" "candidate 1" } using namespace M; -struct S s; // { dg-error "reference to 'S' is ambiguous" "" } -// { dg-error "invalid type in declaration" "" { target *-*-* } 14 } +struct S s; // { dg-error "reference to 'S' is ambiguous|invalid type in declaration" "" } |