pt.c (type_unification_real): Just accept function parms that don't use any template...

	* pt.c (type_unification_real): Just accept function parms that
	don't use any template parms.

From-SVN: r17500

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 09d9f46af71cf9e1545c3fa7bcad457faa39b851..4230426b2da21a03417b053e803cf2f7d7ae6de4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 27 01:44:02 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * pt.c (type_unification_real): Just accept function parms that
+       don't use any template parms.
+
 Sun Jan 25 03:30:00 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * decl.c (cp_finish_decl): When bailing on a comdat variable, also

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7f32c4f7903541e8ff7ef697dc8376253c22d016..753af6bae1620cfbd1062cd146b4d04487a60405 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4676,16 +4676,11 @@ type_unification_real (tparms, targs, parms, args, nsubsts, subr,
              if (comptypes (parm, type, 1))
                continue;
            }
-         else if (arg)
-           {
-             if (can_convert_arg (parm, type, arg))
-               continue;
-           }
          else
-           {
-             if (can_convert (parm, type))
-               continue;
-           }
+           /* It might work; we shouldn't check now, because we might
+              get into infinite recursion.  Overload resolution will
+              handle it.  */
+           continue;
 
          return 1;
        }