aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2006-02-18 08:37:11 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2006-02-18 08:37:11 +0000
commit8d08b2d786e93fffe4c6802239b6808680785bc9 (patch)
tree024da87cc46319dae15e30f4195a093967e04408
parentd174af6c5853a9adef67ed509faa51a79ad9d320 (diff)
downloadgcc-8d08b2d786e93fffe4c6802239b6808680785bc9.zip
gcc-8d08b2d786e93fffe4c6802239b6808680785bc9.tar.gz
gcc-8d08b2d786e93fffe4c6802239b6808680785bc9.tar.bz2
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
-rw-r--r--gcc/testsuite/ChangeLog1
-rw-r--r--gcc/testsuite/g++.dg/init/member1.C2
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 137938c..b8ea9f0 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 b5ffbd7..aededf2 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" }
};