From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 10 Sep 1997 02:53:42 +0000 (+0000)
Subject: * pt.c (unify): Just return 0 for a TYPENAME_TYPE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2ca340aed3cef22d7d9a37a2d8bf393e77bb0ea1;p=gcc.git

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

From-SVN: r15213
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c9eabf990d8..2aedab101c0 100644
--- 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 88af38bdc0e..83e50407f0b 100644
--- 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);