obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 40 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/parse/constant4.C b/gcc/testsuite/g++.dg/parse/constant4.C
new file mode 100644
index 000000000..a1be5dd02
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/constant4.C
@@ -0,0 +1,40 @@
+// { dg-do compile }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 31 Jul 2003 <nathan@codesourcery.com>
+
+// PR c++/11525 incorrect error about non-constant initalizer
+
+template<typename> class X;
+template<unsigned> class Y {};
+
+
+template<typename T>
+void Foo ()
+{
+  static const unsigned I = X<T>::I;
+  
+  Y<I> i;
+  
+  static const unsigned J = X<T>::J; // { dg-message "not initialized with a constant expression" }
+  
+  Y<J> j; // { dg-error "constant|template argument" "" }
+}
+
+struct A 
+{
+  operator unsigned () const;
+};
+
+template <typename> struct X 
+{
+  enum {I};
+  static A const J;
+};
+
+void Baz ()
+{
+  Foo<int> (); // { dg-message "instantiated" "" }
+}
+
+