16 files changed, 36 insertions, 17 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d6b70d39409..c2d12e96864 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2002-02-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* g++.old-deja/g++.law/visibility13.C: Remove "instantiated from
+	here" ERROR lines.
+	* g++.old-deja/g++.oliva/partord1.C: Likewise.
+	* g++.old-deja.g++.other/defarg1.C: Likewise.
+	* g++.old-deja/g++.pt/calls2.C: Likewise.
+	* g++.old-deja/g++.pt/crash20.C: Likewise.
+	* g++.old-deja/g++.pt/crash30.C: Likewise.
+	* g++.old-deja/g++.pt/crash36.C: Likewise.
+	* g++.old-deja/g++.pt/crash6.C: Likewise.
+	* g++.old-deja/g++.pt/defarg13.C: Likewise.
+	* g++.old-deja/g++.pt/derived3.C: Likewise.
+	* g++.old-deja/g++.pt/error1.C: Likewise.
+	* g++.old-deja/g++.pt/friend21.C: Likewise.
+	* g++.old-deja/g++.pt/friend23.C: Likewise.
+	* g++.old-deja/g++.pt/infinite1.C: Likewise.
+	* g++.old-deja/g++.robertl/eb128.C: Likewise.
+	
 2002-02-27  Geoffrey Keating  <geoffk@redhat.com>
 
 	* gcc.c-torture/execute/20020225-2.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility13.C b/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
index dbde720d276..472d5a2da81 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
@@ -99,7 +99,7 @@ try_array( Array_RC<Type> &rc )
 int main()
 {
     static int ia[10] = { 12, 7, 14, 9, 128, 17, 6, 3, 27, 5 };
-    Array_RC<int> iA(ia, 10);// ERROR - instantiated from here
+    Array_RC<int> iA(ia, 10);
 
     cout << "template Array_RC class" << endl;
     try_array(iA);
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C b/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
index 7ed017ac276..077006532f7 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
@@ -23,6 +23,6 @@ template <typename T> void foo(T*) {
 int main() {
   int j = 0;
   foo(j); // calls foo<int>(int), ok
-  foo(&j); // calls foo<int>(int*) // ERROR - not a friend
+  foo(&j); // calls foo<int>(int*)
   foo<int*>(&j); // calls foo<int*>(int*), ok
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.other/defarg1.C b/gcc/testsuite/g++.old-deja/g++.other/defarg1.C
index 68b07a510cc..f1f72a555f2 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/defarg1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/defarg1.C
@@ -24,5 +24,5 @@ int j (T t)
   return 0;
 }
 
-template int j (double); // ERROR - instantiated from here
+template int j (double);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/call2.C b/gcc/testsuite/g++.old-deja/g++.pt/call2.C
index 51b246948ed..e38a29e66b4 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/call2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/call2.C
@@ -11,4 +11,4 @@ for_each(const Field& p, IsCompressed, C)
   return p.IsCompressed(); // ERROR - calling type like a method
 }
 
-template bool for_each<int>(const Field& p, IsCompressed, int); // ERROR - instantiated from here
+template bool for_each<int>(const Field& p, IsCompressed, int);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash20.C b/gcc/testsuite/g++.old-deja/g++.pt/crash20.C
index 29b4281c76e..9efff9ddd75 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash20.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash20.C
@@ -6,4 +6,4 @@ struct A { const T x; A() : x(0) { } A(T x) : x(x) { } };
 template <class B>
 void func () { B y; y = B(); } // ERROR - can't use default assignment
 
-int main (void) { func< A<> >(); } // ERROR - instantiated from here
+int main (void) { func< A<> >(); }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash30.C b/gcc/testsuite/g++.old-deja/g++.pt/crash30.C
index 13dc37af68d..3b953d42c3f 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash30.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash30.C
@@ -12,4 +12,4 @@ template <class T> struct B {
   friend void xxx<T>(T); // ERROR - does not match any template
 };
  
-template struct B<double>; // ERROR - 
+template struct B<double>;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash36.C b/gcc/testsuite/g++.old-deja/g++.pt/crash36.C
index ef507a4ec4b..f9cbed2c60e 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash36.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash36.C
@@ -32,4 +32,4 @@ struct list {
 	(list_iterator<T>(Head->next())); }
 };
 
-template class list<int>; // ERROR - instantiated from here
+template class list<int>;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash6.C b/gcc/testsuite/g++.old-deja/g++.pt/crash6.C
index 09e8df07973..8e969402dae 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash6.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash6.C
@@ -19,5 +19,5 @@ struct List
 
 void test(List<int>& vals)
 {
-  vals.length();  // ERROR - instantiated from here
+  vals.length();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/defarg13.C b/gcc/testsuite/g++.old-deja/g++.pt/defarg13.C
index 1082bf567e0..0f7e84f12ef 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/defarg13.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/defarg13.C
@@ -6,8 +6,8 @@ void f (int i)
 {
   struct S { void g (int j = i) {} }; // ERROR - default argument uses local
 
-  S s; // ERROR - instantiated here
+  S s;
 }
 
-template void f<double>(int); // ERROR - instantiated here
+template void f<double>(int);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/derived3.C b/gcc/testsuite/g++.old-deja/g++.pt/derived3.C
index 9b4bda53cef..fa807da60fa 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/derived3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/derived3.C
@@ -2,7 +2,7 @@
 // crash test -
 
 // by Paul Burchard <burchard@pobox.com>, Level Set Systems, Inc.
-// Copyright (C) 1999 Free Software Foundation
+// Copyright (C) 1999, 2002 Free Software Foundation
 
 template<class T>
 class X {
@@ -10,6 +10,6 @@ class X {
 	Y y;
 };
 int main() {
-	X<int> x; // ERROR - (instantiated from here)
+	X<int> x;
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/error1.C b/gcc/testsuite/g++.old-deja/g++.pt/error1.C
index 675a31a398d..5216a42fba7 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/error1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/error1.C
@@ -16,4 +16,4 @@ void S<T>::f ()
   U& u; // ERROR - uninitialized reference
 }
 
-template void S<int>::f<double>(); // ERROR - instantiated from here
+template void S<int>::f<double>();
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend21.C b/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
index 3f690a4404a..d30f29f7214 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
@@ -27,4 +27,4 @@ void A<T>::f()
   B<double>::i = 3; // ERROR - member `i' is private
 }
 
-template void A<int>::f(); // ERROR - instantiated from here
+template void A<int>::f();
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend23.C b/gcc/testsuite/g++.old-deja/g++.pt/friend23.C
index 21065f1cac1..4d37da32245 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend23.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend23.C
@@ -7,4 +7,4 @@ struct S
   friend class S;
 };
 
-template struct S<int>; // ERROR - instantiated from here
+template struct S<int>;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/infinite1.C b/gcc/testsuite/g++.old-deja/g++.pt/infinite1.C
index 7e7e5fe9814..88d3ac52ac3 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/infinite1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/infinite1.C
@@ -16,5 +16,5 @@ template <> void f<11>();
 
 int main()
 {
-  f<0>();			// ERROR - starting here
+  f<0>();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb128.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb128.C
index d056e39012e..f3a65fc9203 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb128.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb128.C
@@ -7,5 +7,5 @@ public:
 
 void f()
 {
-  A<int&> a; // ERROR - instantiated from here
+  A<int&> a;
 }