From: Jason Merrill <jason@redhat.com>
Date: Fri, 30 Jun 2006 18:30:28 +0000 (-0400)
Subject: re PR c++/27424 (Valid template-template-parameter rejected)
X-Git-Tag: releases/gcc-4.0.4~573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1039b4437fd64e42c2c224978d34138d5c196a88;p=thirdparty%2Fgcc.git

re PR c++/27424 (Valid template-template-parameter rejected)

        PR c++/27424
        * pt.c (convert_template_argument): Pass all template arguments
        on to coerce_template_template_parms.

From-SVN: r115096
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f9b4ab372898..997bb1c1ef32 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-28  Jason Merrill  <jason@redhat.com>
+
+	PR c++/27424
+	* pt.c (convert_template_argument): Pass all template arguments 
+	on to coerce_template_template_parms.
+
 2006-06-25  Lee Millward  <lee.millward@gmail.com>
 
 	PR c++/27821
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 18c345383cec..7fe9f124e125 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3794,11 +3794,8 @@ convert_template_argument (tree parm,
                            tree in_decl)
 {
   tree val;
-  tree inner_args;
   int is_type, requires_type, is_tmpl_type, requires_tmpl_type;
   
-  inner_args = INNERMOST_TEMPLATE_ARGS (args);
-
   if (TREE_CODE (arg) == TREE_LIST 
       && TREE_CODE (TREE_VALUE (arg)) == OFFSET_REF)
     {  
@@ -3890,7 +3887,7 @@ convert_template_argument (tree parm,
 
 	      if (coerce_template_template_parms (parmparm, argparm,
 						  complain, in_decl,
-						  inner_args))
+						  args))
 		{
 		  val = arg;
 		  
diff --git a/gcc/testsuite/g++.dg/template/ttp20.C b/gcc/testsuite/g++.dg/template/ttp20.C
new file mode 100644
index 000000000000..0d1784c9f82c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ttp20.C
@@ -0,0 +1,11 @@
+// PR c++/27424
+// Bug: failing to substitute the 'int' into C
+
+template<typename T> struct A
+{
+    template<template<T> class> struct B {};
+    template<T> struct C;
+    B<C> b;
+};
+
+A<int> a;