re PR c++/26266 (Trouble with static const data members in template classes)

	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.

From-SVN: r111230

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 137938c5f7f16241c2a365b95310060155c48edd..b8ea9f07caec20c0877333d23e1a8869f5dbee4b 100644 (file)
--- 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 b5ffbd7bd39fecc240f79f6760fd6b83ddd4b7a9..aededf23e7b72043720c50a5c6e307538b6d3dda 100644 (file)
--- 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" }
 };