From a627706d4e34387a8f3fa42c4bd97fbaf90fbf02 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 10 Feb 2011 16:30:29 +0000
Subject: [PATCH] 	* g++.dg/ext/vla1.C: Adjust for C++0x mode. 	*
 g++.dg/other/warning1.C: Likewise. 	* g++.old-deja/g++.bugs/900119_01.C:
 Likewise. 	* g++.old-deja/g++.gb/scope06.C: Likewise. 	*
 g++.old-deja/g++.law/cvt11.C: Likewise. 	*
 g++.old-deja/g++.law/init1.C: Likewise. 	* g++.dg/abi/mangle26.C:
 Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170010 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                         | 8 ++++++++
 gcc/testsuite/g++.dg/abi/mangle26.C             | 2 +-
 gcc/testsuite/g++.dg/ext/vla1.C                 | 2 +-
 gcc/testsuite/g++.dg/other/warning1.C           | 1 +
 gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C | 2 ++
 gcc/testsuite/g++.old-deja/g++.gb/scope06.C     | 2 ++
 gcc/testsuite/g++.old-deja/g++.law/cvt11.C      | 4 ++++
 gcc/testsuite/g++.old-deja/g++.law/init1.C      | 1 +
 8 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a43f34c..6ff8dd7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2011-02-09  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/ext/vla1.C: Adjust for C++0x mode.
+	* g++.dg/other/warning1.C: Likewise.
+	* g++.old-deja/g++.bugs/900119_01.C: Likewise.
+	* g++.old-deja/g++.gb/scope06.C: Likewise.
+	* g++.old-deja/g++.law/cvt11.C: Likewise.
+	* g++.old-deja/g++.law/init1.C: Likewise.
+	* g++.dg/abi/mangle26.C: Likewise.
+
 	* g++.dg/template/function1.C: Adjust for C++0x mode.
 	* g++.dg/cpp0x/regress/template-function1.C: Copy it.
 
diff --git a/gcc/testsuite/g++.dg/abi/mangle26.C b/gcc/testsuite/g++.dg/abi/mangle26.C
index 77b0eab..5d16095 100644
--- a/gcc/testsuite/g++.dg/abi/mangle26.C
+++ b/gcc/testsuite/g++.dg/abi/mangle26.C
@@ -5,7 +5,7 @@
 
 namespace std {
   struct A {
-    virtual void f () { }
+    A() { }
   };
 }
 
diff --git a/gcc/testsuite/g++.dg/ext/vla1.C b/gcc/testsuite/g++.dg/ext/vla1.C
index fad67ce..f372535 100644
--- a/gcc/testsuite/g++.dg/ext/vla1.C
+++ b/gcc/testsuite/g++.dg/ext/vla1.C
@@ -22,5 +22,5 @@ B::B (int i)
     int ar[1][i];  // { dg-error "array" }
   } s;
 
-  s.ar[0][0] = 0;  // { dg-error "no member" }
+  s.ar[0][0] = 0;  // { dg-prune-output "no member" }
 }
diff --git a/gcc/testsuite/g++.dg/other/warning1.C b/gcc/testsuite/g++.dg/other/warning1.C
index a5cce6c..77653a1 100644
--- a/gcc/testsuite/g++.dg/other/warning1.C
+++ b/gcc/testsuite/g++.dg/other/warning1.C
@@ -13,6 +13,7 @@ struct S
 
 int main()
 {
+  // { dg-prune-output "not a member" }
   printf("%f\n%f\n", S::inf, S::nan);
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
index 01d570f..ace4e4b 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900119_01.C
@@ -8,6 +8,8 @@
 
 // keywords: member declaration, member initialization
 
+// { dg-prune-output "non-static data member initializers" }
+
 int global_int;
 
 class class0 {
diff --git a/gcc/testsuite/g++.old-deja/g++.gb/scope06.C b/gcc/testsuite/g++.old-deja/g++.gb/scope06.C
index 39ab089..cbcc4fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.gb/scope06.C
+++ b/gcc/testsuite/g++.old-deja/g++.gb/scope06.C
@@ -1,4 +1,5 @@
 // { dg-do assemble  }
+// { dg-prune-output "non-static data member initializers" }
 // GROUPS passed gb scope
 struct C {
   struct D {
@@ -10,5 +11,6 @@ struct C {
 
 void C::D::foo ()
 {
+  // { dg-prune-output "from this location" }
   x = Ok;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt11.C b/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
index 50f719a..53dd1e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
@@ -6,6 +6,10 @@
 // Message-Id: <9211101908.AA13557@tera.com>
 // Subject: type cast of qualified const member breaks g++2.3.1
 
+// Ignore extra errors in C++0x mode.
+// { dg-prune-output "non-static data member initializers" }
+// { dg-prune-output "from this location" }
+// { dg-prune-output "uninitialized" }
 #include <stdio.h>
 
 class Thing{
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init1.C b/gcc/testsuite/g++.old-deja/g++.law/init1.C
index 82f49ae..1727e38 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init1.C
@@ -1,4 +1,5 @@
 // { dg-do assemble  }
+// { dg-prune-output "non-static data member initializers" }
 // GROUPS passed initialization
 class foo {
 public:
-- 
2.7.4