PR c++/19439

[pf3gnuchains/gcc-fork.git] / gcc / testsuite / g++.dg / template / memfriend6.C

diff --git a/gcc/testsuite/g++.dg/template/memfriend6.C b/gcc/testsuite/g++.dg/template/memfriend6.C
index 21d7996..5f82339 100644 (file)
--- a/gcc/testsuite/g++.dg/template/memfriend6.C
+++ b/gcc/testsuite/g++.dg/template/memfriend6.C
@@ -8,8 +8,8 @@
 
 template <class T> struct A {
   template <class U> void f(U);                // { dg-error "candidate" }
-  void g();                            // { dg-error "candidate" }
-  void h();                            // { dg-error "candidate" }
+  void g();                            // { dg-error "candidate|with" }
+  void h();                            // { dg-error "candidate|with" }
   void i(int);                         // { dg-error "candidate" }
 };
 
@@ -17,7 +17,7 @@ class C {
   int ii;
   template <class U> friend void A<U>::f(U);   // { dg-error "not match" }
   template <class U> template <class V>
-    friend void A<U>::g();                     // { dg-error "not match" }
-  template <class U> friend int A<U>::h();     // { dg-error "not match" }
+    friend void A<U>::g();                     // { dg-error "not match|cannot be overloaded" }
+  template <class U> friend int A<U>::h();     // { dg-error "not match|cannot be overloaded" }
   template <class U> friend void A<U>::i(char);        // { dg-error "not match" }
 };