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, 21 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/template/meminit2.C b/gcc/testsuite/g++.dg/template/meminit2.C
new file mode 100644
index 000000000..f6afa0151
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/meminit2.C
@@ -0,0 +1,21 @@
+// { dg-do compile }
+// Origin: Mark Anders <mark dot a dot anders at intel dot com>
+// PR c++/15503: disambiguators in base classes and mem-initializers
+
+template <typename K1> struct O {  
+  template <typename K2> struct I {}; 
+}; 
+
+template <typename T> 
+struct A : typename O<T>::template I<int> {   // { dg-error "keyword 'typename' not allowed" }
+  A() :    typename O<T>::template I<int>()   // { dg-error "keyword 'typename' not allowed" }
+  {}
+};
+
+template <typename T> 
+struct B : O<T>::template I<int> {
+  B() :    O<T>::I<int>()   // { dg-error "used as template|it is a template" "" }
+  {}
+};
+
+// { dg-bogus "end of input" "bogus token skipping in the parser" { xfail *-*-* } 17 }