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
This commit is contained in:
Ollie Wild 2007-07-02 17:28:53 +00:00 committed by Ollie Wild
parent 38bb34854d
commit d49343266b
3 changed files with 7 additions and 4 deletions

View file

@ -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.

View file

@ -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 }}

View file

@ -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" "" }