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

diff --git a/gcc/testsuite/g++.dg/template/ttp25.C b/gcc/testsuite/g++.dg/template/ttp25.C
new file mode 100644
index 000000000..861d187d4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp25.C
@@ -0,0 +1,29 @@
+// { dg-do compile }
+template<typename T, template<T> class C>
+void f1(T, C<5>);		// { dg-message "note" }
+
+template<typename T, template<T> class C>
+void f2(C<5>, T);
+
+template<typename T, template<T> class C>
+void f3(C<5>, T);		// { dg-message "note" }
+
+template<typename T> struct metafun { typedef T type; };
+
+template<> struct metafun<short> { typedef int type; };
+
+template<typename T, template<typename metafun<T>::type> class C>
+void f4(T, C<5>);		// { dg-message "note" }
+
+template<int N> struct X {};
+void g() {
+  f1(5l, X<5>()); // { dg-error "no matching" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 20 }
+  f2(X<5>(), 5);
+  f3(X<5>(), 5l); // { dg-error "no matching" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 23 }
+  f4(5, X<5>());
+  f4(5l, X<5>()); // { dg-error "no matching" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 26 }
+  f4((short)5, X<5>());
+}