From 4b4581752338623a2d4a9ec3b00b7c253e528c1f Mon Sep 17 00:00:00 2001
From: mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 18 Feb 2006 08:37:11 +0000
Subject: [PATCH] 	PR c++/26266 	* g++.dg/template/static22.C: New
 test. 	* g++.dg/template/static23.C: New test. 	*
 g++.dg/template/static24.C: New test. 	* g++.dg/template/non-dependent13.C:
 New test. 	* g++.dg/init/member1.C: Tweak error markers.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111230 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog             | 1 +
 gcc/testsuite/g++.dg/init/member1.C | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 137938c5f7f..b8ea9f07cae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -5,6 +5,7 @@
 	* g++.dg/template/static23.C: New test.
 	* g++.dg/template/static24.C: New test.
 	* g++.dg/template/non-dependent13.C: New test.
+	* g++.dg/init/member1.C: Tweak error markers.
 
 2006-02-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
diff --git a/gcc/testsuite/g++.dg/init/member1.C b/gcc/testsuite/g++.dg/init/member1.C
index b5ffbd7bd39..aededf23e7b 100644
--- a/gcc/testsuite/g++.dg/init/member1.C
+++ b/gcc/testsuite/g++.dg/init/member1.C
@@ -11,7 +11,7 @@ template<int> struct B {};
 template<typename T> struct C
 {
   static const int i = A<T>::i;  // { dg-error "incomplete" }
-  static const int j = i; // { dg-error "constant" }
+  static const int j = i;
   B<j> b;  // { dg-error "not a valid template arg" }
 };
 
-- 
2.11.4.GIT