X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ftestsuite%2Fg%2B%2B.old-deja%2Fg%2B%2B.bugs%2F900514_03.C;h=3826e08e009f1683b8ba2f60d6624a51a7385676;hb=7ad4a8fcd7624fa83956a5defbe1f631566de2d8;hp=a5419fb9ee95e2afbacb39820fb45f536489a19b;hpb=e448e6a4c18cb11909266527821dfa927b87b7cd;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900514_03.C b/gcc/testsuite/g++.old-deja/g++.bugs/900514_03.C
index a5419fb9ee9..3826e08e009 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900514_03.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900514_03.C
@@ -19,14 +19,14 @@ struct t_0_st_0;
 struct t_0_st_1 {
   int member;
 
-  t_0_st_1 (t_0_st_0&);// { dg-error "" } 
+  t_0_st_1 (t_0_st_0&);// { dg-message "note" } 
   t_0_st_1 ();
 };
 
 struct t_0_st_0 {
   int member;
 
-  operator t_0_st_1 ();// { dg-error "" } 
+  operator t_0_st_1 ();// { dg-message "note" } 
 };
 
 t_0_st_0 t_0_st_0_obj0;
@@ -37,13 +37,13 @@ void t_0_assignment ()
   t_0_st_1 t_0_st_1_obj1;
   t_0_st_1 t_0_st_1_obj2;
 
-  t_0_st_1_obj0 = t_0_st_0_obj0;			// { dg-error "" } caught
+  t_0_st_1_obj0 = t_0_st_0_obj0;			// { dg-error "ambiguous" } caught
   t_0_st_1_obj1 = t_0_st_1 (t_0_st_0_obj0);
 }
 
 void t_0_local_init ()
 {
-  t_0_st_1 t_0_st_1_obj0 = t_0_st_0_obj0;		// { dg-error "" } 
+  t_0_st_1 t_0_st_1_obj0 = t_0_st_0_obj0;		// { dg-error "ambiguous" } 
   t_0_st_1 t_0_st_1_obj1 = t_0_st_1 (t_0_st_0_obj0);
 }
 
@@ -52,15 +52,15 @@ struct t_1_st_0;
 struct t_1_st_1 {
   int member;
 
-  t_1_st_1 (t_1_st_0&);					// { dg-error "" } 
+  t_1_st_1 (t_1_st_0&);					// { dg-message "note" } 
   t_1_st_1 ();
-  void operator= (t_1_st_1&);				// { dg-error "" } 
+  void operator= (t_1_st_1&);				// { dg-message "note" } 
 };
 
 struct t_1_st_0 {
   int member;
 
-  operator t_1_st_1 ();					// { dg-error "" } 
+  operator t_1_st_1 ();					// { dg-message "note" } 
 };
 
 t_1_st_0 t_1_st_0_obj0;
@@ -71,13 +71,13 @@ void t_1_assignment ()
   t_1_st_1 t_1_st_1_obj1;
   t_1_st_1 t_1_st_1_obj2;
 
-  t_1_st_1_obj0 = t_1_st_0_obj0;			// { dg-error "" } 
-  t_1_st_1_obj1 = t_1_st_1 (t_1_st_0_obj0);		// { dg-error "" } 
+  t_1_st_1_obj0 = t_1_st_0_obj0;			// { dg-error "no match" } 
+  t_1_st_1_obj1 = t_1_st_1 (t_1_st_0_obj0);		// { dg-error "no match" } 
 }
 
 void t_1_local_init ()
 {
-  t_1_st_1 t_1_st_1_obj0 = t_1_st_0_obj0;		// { dg-error "" } 
+  t_1_st_1 t_1_st_1_obj0 = t_1_st_0_obj0;		// { dg-error "ambiguous" } 
   t_1_st_1 t_1_st_1_obj1 = t_1_st_1 (t_1_st_0_obj0);
 }
 
@@ -86,14 +86,14 @@ struct t_2_st_0;
 struct t_2_st_1 {
   int member;
 
-  t_2_st_1 (t_2_st_0);		// { dg-error "" } candidate
+  t_2_st_1 (t_2_st_0);		// { dg-message "note" }
   t_2_st_1 ();
 };
 
 struct t_2_st_0 {
   int member;
 
-  operator t_2_st_1 ();		// { dg-error "" } candidate
+  operator t_2_st_1 ();		// { dg-message "candidate" }
 };
 
 t_2_st_0 t_2_st_0_obj0;
@@ -104,12 +104,12 @@ void t_2_assignment ()
   t_2_st_1 t_2_st_1_obj1;
   t_2_st_1 t_2_st_1_obj2;
 
-  t_2_st_1_obj0 = t_2_st_0_obj0;			// { dg-error "" } caught
+  t_2_st_1_obj0 = t_2_st_0_obj0;			// { dg-error "ambiguous" } caught
   t_2_st_1_obj1 = t_2_st_1 (t_2_st_0_obj0);
 }
 
 void t_2_local_init ()
 {
-  t_2_st_1 t_2_st_1_obj0 = t_2_st_0_obj0;		// { dg-error "" } 
+  t_2_st_1 t_2_st_1_obj0 = t_2_st_0_obj0;		// { dg-error "ambiguous" } 
   t_2_st_1 t_2_st_1_obj1 = t_2_st_1 (t_2_st_0_obj0);
 }