Merge to HEAD at tree-cleanup-merge-20041024 .new-regalloc-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/new-regalloc-branch@95203 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 7 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p811.C b/gcc/testsuite/g++.old-deja/g++.mike/p811.C
index ba6c6292598..7d15e9ed8aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p811.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p811.C
@@ -512,25 +512,25 @@ class Y {
 public:
     Y() {}
     virtual const char *stringify() = 0;
-    virtual char *stringify2() const = 0; // { dg-error "" } 
+    virtual char *stringify2() const = 0; // { dg-error "overriding" } 
 };
 
 class X: public Y {
 public:
     X(): Y() {}
-    char *stringify();		// { dg-error "" } ok
-    const char *stringify2() const;  // { dg-error "" } ok
+    char *stringify();		// { dg-error "candidate" }
+    const char *stringify2() const;  // { dg-error "candidate|conflicting return type" }
 };
 
 char *
-X::stringify() const
-{ // { dg-error "" } ok
+X::stringify() const  // { dg-error "does not match" }
+{
     return "stringify";
 }
 
 const char *
-X::stringify2()
-{ // { dg-error "" } ok
+X::stringify2()   // { dg-error "does not match" }
+{
     return "stringify2";
 }