From f40f183363560041a283d6469ca6afca262702a6 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 25 Feb 2011 06:23:00 +0000
Subject: [PATCH] 	* g++.dg/parse/constant1.C: Specify C++98 mode. 
 * g++.dg/parse/constant5.C: Likewise. 	* g++.dg/parse/error2.C: Likewise. 
 * g++.dg/parse/semicolon3.C: Likewise. 	* g++.dg/template/crash14.C:
 Likewise. 	* g++.dg/template/local4.C: Likewise. 	*
 g++.dg/template/nontype3.C: Likewise. 	* g++.dg/parse/crash31.C: Adjust
 expected errors. 	* g++.dg/template/function1.C: Likewise. 	*
 g++.dg/template/ref3.C: Likewise. 	* g++.dg/template/static9.C: Likewise.
 	* g++.old-deja/g++.pt/crash41.C: Instantiate template.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170489 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                     | 13 +++++++++++++
 gcc/testsuite/g++.dg/parse/constant1.C      |  2 ++
 gcc/testsuite/g++.dg/parse/constant5.C      |  2 ++
 gcc/testsuite/g++.dg/parse/crash31.C        |  2 +-
 gcc/testsuite/g++.dg/parse/error2.C         |  2 +-
 gcc/testsuite/g++.dg/parse/semicolon3.C     |  1 +
 gcc/testsuite/g++.dg/template/crash14.C     |  2 ++
 gcc/testsuite/g++.dg/template/function1.C   |  8 ++++----
 gcc/testsuite/g++.dg/template/local4.C      |  3 ++-
 gcc/testsuite/g++.dg/template/nontype3.C    |  1 +
 gcc/testsuite/g++.dg/template/ref3.C        |  4 ++--
 gcc/testsuite/g++.dg/template/static9.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.pt/crash41.C |  2 ++
 13 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5acd9f2..3d3d812 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,18 @@
 2011-02-24  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/parse/constant1.C: Specify C++98 mode.
+	* g++.dg/parse/constant5.C: Likewise.
+	* g++.dg/parse/error2.C: Likewise.
+	* g++.dg/parse/semicolon3.C: Likewise.
+	* g++.dg/template/crash14.C: Likewise.
+	* g++.dg/template/local4.C: Likewise.
+	* g++.dg/template/nontype3.C: Likewise.
+	* g++.dg/parse/crash31.C: Adjust expected errors.
+	* g++.dg/template/function1.C: Likewise.
+	* g++.dg/template/ref3.C: Likewise.
+	* g++.dg/template/static9.C: Likewise.
+	* g++.old-deja/g++.pt/crash41.C: Instantiate template.
+
 	* g++.dg/cpp0x/constexpr-array-tparm.C: New.
 	* g++.dg/cpp0x/regress/parse-ambig5.C: Copy from parse/ambig5.C.
 	* g++.dg/cpp0x/regress/debug-debug7.C: Copy from debug/debug7.C.
diff --git a/gcc/testsuite/g++.dg/parse/constant1.C b/gcc/testsuite/g++.dg/parse/constant1.C
index 0a88928..c8a948a 100644
--- a/gcc/testsuite/g++.dg/parse/constant1.C
+++ b/gcc/testsuite/g++.dg/parse/constant1.C
@@ -1,3 +1,5 @@
+// { dg-options -std=c++98 }
+
 void f () {
   switch (0) {
   case (3, 0): // { dg-error "" }
diff --git a/gcc/testsuite/g++.dg/parse/constant5.C b/gcc/testsuite/g++.dg/parse/constant5.C
index db11afb..f868108 100644
--- a/gcc/testsuite/g++.dg/parse/constant5.C
+++ b/gcc/testsuite/g++.dg/parse/constant5.C
@@ -1,3 +1,5 @@
+// { dg-options "-std=c++98 -pedantic-errors" }
+
 enum E { 
   a = 24.2, // { dg-error "constant" }
   b = (int)3.7, 
diff --git a/gcc/testsuite/g++.dg/parse/crash31.C b/gcc/testsuite/g++.dg/parse/crash31.C
index 0068846..b0a7e18 100644
--- a/gcc/testsuite/g++.dg/parse/crash31.C
+++ b/gcc/testsuite/g++.dg/parse/crash31.C
@@ -3,7 +3,7 @@ struct A // { dg-error "forward declaration" }
   A : A; // { dg-error "expected|incomplete" }
   A : B; // { dg-error "not declared|incomplete" }
   A : A(); // { dg-error "undefined type|incomplete" }
-  A : B(); // { dg-error "function call|incomplete" }
+  A : B(); // { dg-error "function call|incomplete|not declared" }
   A : A[]; // { dg-error "expected|array reference|incomplete" }
   A : B[]; // { dg-error "not declared|expected|array reference|incomplete" }
 };
diff --git a/gcc/testsuite/g++.dg/parse/error2.C b/gcc/testsuite/g++.dg/parse/error2.C
index 619f894..7b08df4 100644
--- a/gcc/testsuite/g++.dg/parse/error2.C
+++ b/gcc/testsuite/g++.dg/parse/error2.C
@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-fshow-column" }
+// { dg-options "-fshow-column -std=c++98" }
 // Properly print CALL_EXPRs while dumping expressions
 
 double g;
diff --git a/gcc/testsuite/g++.dg/parse/semicolon3.C b/gcc/testsuite/g++.dg/parse/semicolon3.C
index bc43b48..8a2b1ac 100644
--- a/gcc/testsuite/g++.dg/parse/semicolon3.C
+++ b/gcc/testsuite/g++.dg/parse/semicolon3.C
@@ -1,5 +1,6 @@
 // PR c++/45331
 // { dg-do compile }
+// { dg-options -std=c++98 }
 
 struct OK1
 {
diff --git a/gcc/testsuite/g++.dg/template/crash14.C b/gcc/testsuite/g++.dg/template/crash14.C
index 7b3af04..cf6fffa 100644
--- a/gcc/testsuite/g++.dg/template/crash14.C
+++ b/gcc/testsuite/g++.dg/template/crash14.C
@@ -1,3 +1,5 @@
+// { dg-options -std=c++98 }
+
 template <int T> class foo { public: foo() { } class Z { };};
 template <int I[2]> void dep7(foo<I[0]> *) { } // { dg-error "" }
 
diff --git a/gcc/testsuite/g++.dg/template/function1.C b/gcc/testsuite/g++.dg/template/function1.C
index 3f82d53..8a112c1 100644
--- a/gcc/testsuite/g++.dg/template/function1.C
+++ b/gcc/testsuite/g++.dg/template/function1.C
@@ -3,25 +3,25 @@
 
 template<const char *, int> struct A {};
 const char func[] = "abc";
-template<int N> struct A<func, N> {};	// { dg-error "cannot appear|is invalid|not a valid" }
+template<int N> struct A<func, N> {};	// { dg-error "cannot appear|is invalid|not a valid|not declared constexpr" }
 
 char a1[1];
 A<a1, 0> a;
 
 template<const char *, int> struct B {};
-template<int N> struct B<__FUNCTION__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid" }
+template<int N> struct B<__FUNCTION__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid|not declared constexpr" }
 
 char b1[1];
 B<b1, 0> b;
 
 template<const char *, int> struct C {};
-template<int N> struct C<__PRETTY_FUNCTION__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid" }
+template<int N> struct C<__PRETTY_FUNCTION__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid|not declared constexpr" }
 
 char c1[1];
 C<c1, 0> c;
 
 template<const char *, int> struct D {};
-template<int N> struct D<__func__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid|function scope" }
+template<int N> struct D<__func__, N> {};	// { dg-error "cannot appear|is invalid|is not a valid|function scope|not declared constexpr" }
 
 char d1[1];
 D<d1, 0> d;
diff --git a/gcc/testsuite/g++.dg/template/local4.C b/gcc/testsuite/g++.dg/template/local4.C
index 7ee922b..9a03c9a 100644
--- a/gcc/testsuite/g++.dg/template/local4.C
+++ b/gcc/testsuite/g++.dg/template/local4.C
@@ -1,9 +1,10 @@
 // PR c++/17413
+// { dg-options -std=c++98 }
 
 template <typename T> void foo() {} // { dg-message "note" }
 
 int main () {
   struct S {};
   foo<S> (); // { dg-error "match" } 
-  // { dg-message "candidate" "candidate note" { target *-*-* } 7 }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 8 }
 }
diff --git a/gcc/testsuite/g++.dg/template/nontype3.C b/gcc/testsuite/g++.dg/template/nontype3.C
index 5f24562..d0c6b72 100644
--- a/gcc/testsuite/g++.dg/template/nontype3.C
+++ b/gcc/testsuite/g++.dg/template/nontype3.C
@@ -1,4 +1,5 @@
 // { dg-do compile }
+// { dg-options -std=c++98 }
 // Origin: <drow at gcc dot gnu dot org>,
 //         <giovannibajo at gcc dot gnu dot org>
 // c++/13243: Template parameters of non integral or enumeration type can't be
diff --git a/gcc/testsuite/g++.dg/template/ref3.C b/gcc/testsuite/g++.dg/template/ref3.C
index 4390f71..976c093 100644
--- a/gcc/testsuite/g++.dg/template/ref3.C
+++ b/gcc/testsuite/g++.dg/template/ref3.C
@@ -4,8 +4,8 @@ template<const int&> struct A {};
 
 template<typename T> struct B
 {
-  A<(T)0> b; // { dg-error "constant" }
-  A<T(0)> a; // { dg-error "constant" }
+  A<(T)0> b; // { dg-error "constant|not a valid" }
+  A<T(0)> a; // { dg-error "constant|not a valid" }
 };
 
 B<const int&> b;
diff --git a/gcc/testsuite/g++.dg/template/static9.C b/gcc/testsuite/g++.dg/template/static9.C
index a981441..8845647 100644
--- a/gcc/testsuite/g++.dg/template/static9.C
+++ b/gcc/testsuite/g++.dg/template/static9.C
@@ -3,7 +3,7 @@
 template<typename T> struct A
 {
   static const T i = 0; // { dg-error "declared void" "void" }
-			// { dg-error "invalid" "invalid" { target *-*-* } 5 }
+			// { dg-error "invalid|non-literal" "invalid" { target *-*-* } 5 }
 };
 
 A<void> a; // { dg-message "instantiated" }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash41.C b/gcc/testsuite/g++.old-deja/g++.pt/crash41.C
index fc7f7b5..452ba91 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash41.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash41.C
@@ -9,3 +9,5 @@ template <class T>
 void f(S2 s2) {
   S1<s2.i> s1; // { dg-error "" }
 }
+
+template void f<int>(S2);
-- 
2.7.4