diff options
| author | aaw <aaw@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-02 17:28:53 +0000 |
|---|---|---|
| committer | aaw <aaw@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-07-02 17:28:53 +0000 |
| commit | 333d9b8a3effc0dfd3cfdaf1bae1939f55a6b7a0 (patch) | |
| tree | a4f17635a40140ac6c646dfbdc65ee0e9a81d215 | |
| parent | 953a5ea36c181b6812e7873490073677163c588c (diff) | |
| download | ppe42-gcc-333d9b8a3effc0dfd3cfdaf1bae1939f55a6b7a0.tar.gz ppe42-gcc-333d9b8a3effc0dfd3cfdaf1bae1939f55a6b7a0.zip | |
* g++.dg/lookup/using16.C: Merge dg-errors with common line.
* g++.dg/lookup/using17.C: Merge dg-errors with common line.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126218 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 4eec59e89d5..40a309f1858 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 e373f377897..ff6a80ee93f 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 59888852c42..b98b21a0cda 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" "" } |
