update

From-SVN: r25491

4 files changed, 26 insertions, 26 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900121_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900121_01.C
index 99ab8f6cbcf..ea07968c3a3 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900121_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900121_01.C
@@ -6,7 +6,7 @@
 
 // keywords: abort, incomplete types, reference types, formal parameters
 
-struct s0;
+struct s0;              // ERROR - forward declaration
 
 void function (struct s0 &arg1, struct s0 &arg2)
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900214_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900214_01.C
index 3aac764f86e..09fd184f0ab 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900214_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900214_01.C
@@ -7,7 +7,7 @@
 
 // keywords: friends, incomplete types, function members
 
-struct A;
+struct A;                       // ERROR - forward declaration
 
 struct B {
   friend void A::foo();		// ERROR - type A is incomplete
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900428_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900428_01.C
index b46fc466529..c2eb3071352 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900428_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900428_01.C
@@ -17,35 +17,35 @@ int i;
 
 void *pv;
 volatile void *pvv;
-struct s;
-extern struct s es, *ps;
-extern volatile struct s evs, *pvs;
+struct s;               // ERROR - forward declaration
+extern struct s es, *ps;  // ERROR - defined here
+extern volatile struct s evs, *pvs; // ERROR - defined here
 
 void pv_test ()
 {
-  *pv;			// ERROR - , XFAIL *-*-*
-  (i ? *pv : *pv);	// ERROR - , XFAIL *-*-*
-  *pv, *pv;		// ERROR - , XFAIL *-*-*
+  *pv;			// ERROR - invalid void
+  (i ? *pv : *pv);	// ERROR - invalid void
+  *pv, *pv;		// ERROR - invalid void
 
-  *pvv;			// ERROR - , XFAIL *-*-*
-  (i ? *pvv : *pvv);	// ERROR - , XFAIL *-*-*
-  *pvv, *pvv;		// ERROR - , XFAIL *-*-*
+  *pvv;			// ERROR - invalid void
+  (i ? *pvv : *pvv);	// ERROR - invalid void
+  *pvv, *pvv;		// ERROR - invalid void
 
-  es;			// ERROR - , XFAIL *-*-*
-  (i ? es : es);	// ERROR - , XFAIL *-*-*
-  es, es;		// ERROR - , XFAIL *-*-*
+  es;			// ERROR - incomplete
+  (i ? es : es);	// ERROR - undefined type
+  es, es;		// ERROR - incomplete
 
-  evs;			// ERROR - , XFAIL *-*-*
-  (i ? evs : evs);	// ERROR - , XFAIL *-*-*
-  evs, evs;		// ERROR - , XFAIL *-*-*
+  evs;			// ERROR - incomplete
+  (i ? evs : evs);	// ERROR - undefined type
+  evs, evs;		// ERROR - incomplete
 
-  *ps;			// ERROR - , XFAIL *-*-*
-  (i ? *ps : *ps);	// ERROR - , XFAIL *-*-*
-  *ps, *ps;		// ERROR - , XFAIL *-*-*
+  *ps;			// ERROR - undefined type
+  (i ? *ps : *ps);	// ERROR - undefined type
+  *ps, *ps;		// ERROR - undefined type
 
-  *pvs;			// ERROR - , XFAIL *-*-*
-  (i ? *pvs : *pvs);	// ERROR - , XFAIL *-*-*
-  *pvs, *pvs;		// ERROR - , XFAIL *-*-*
+  *pvs;			// ERROR - undefined type
+  (i ? *pvs : *pvs);	// ERROR - undefined type
+  *pvs, *pvs;		// ERROR - undefined type
 }
 
 int main () { return 0; }
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900519_13.C b/gcc/testsuite/g++.old-deja/g++.bugs/900519_13.C
index 8161b59b801..b4bebda6588 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900519_13.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900519_13.C
@@ -11,15 +11,15 @@
 // keywords: inheritance, ambiguity resolution, members
 
 struct base_0 {
-  enum { base_member };
+  enum { base_member }; // ERROR - candidate (26, 30)
 };
 
 struct base_1 {
-  int base_member;
+  int base_member;      // ERROR - candidate (26, 34)
 };
 
 struct base_2 {
-  int base_member ();
+  int base_member ();   // ERROR - candidate (30, 34)
 };
 
 struct derived_0 : public base_0, public base_1 {