From 343c89cd95b1277f4f70406ec33c2b41bd2fcdfd Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 27 Jan 1998 02:30:38 +0000 Subject: [PATCH] pt.c (type_unification_real): Just accept function parms that don't use any template parms. * pt.c (type_unification_real): Just accept function parms that don't use any template parms. From-SVN: r17500 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09d9f46af71..4230426b2da 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 27 01:44:02 1998 Jason Merrill + + * 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 * 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 7f32c4f7903..753af6bae16 100644 --- 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; } -- 2.30.2