* pt.c (unify): Just return 0 for a TYPENAME_TYPE.

From-SVN: r15213

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c9eabf990d8645c4afe7274ef734bb77a663114e..2aedab101c01687254ebf79d5d20f937947c9808 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep  9 19:49:38 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * pt.c (unify): Just return 0 for a TYPENAME_TYPE.
+
 Tue Sep  9 17:57:25 1997  Mark Mitchell  <mmitchell@usa.net>
 
        * error.c (dump_decl): Avoid crashing when presented with a

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 88af38bdc0ea51365b7f6ee432b8085b90bbd08a..83e50407f0b84076b75006bf646c0390f4315a72 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -3141,6 +3141,12 @@ unify (tparms, targs, ntparms, parm, arg, nsubsts, strict)
 
   switch (TREE_CODE (parm))
     {
+    case TYPENAME_TYPE:
+      /* In a type which contains a nested-name-specifier, template
+        argument values cannot be deduced for template parameters used
+        within the nested-name-specifier.  */
+      return 0;
+
     case TEMPLATE_TYPE_PARM:
       (*nsubsts)++;
       idx = TEMPLATE_TYPE_IDX (parm);