diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-01-27 02:30:38 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-01-26 21:30:38 -0500 |
| commit | 343c89cd95b1277f4f70406ec33c2b41bd2fcdfd (patch) | |
| tree | 57546a02a015ccc92c58dec35cdc737a0e6fb491 /gcc | |
| parent | 69145bccaabdc7bf70091e7ac72c126c7cc872ea (diff) | |
| download | gcc-343c89cd95b1277f4f70406ec33c2b41bd2fcdfd.zip gcc-343c89cd95b1277f4f70406ec33c2b41bd2fcdfd.tar.gz gcc-343c89cd95b1277f4f70406ec33c2b41bd2fcdfd.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09d9f46..4230426 100644 --- 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 7f32c4f..753af6b 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; } |