OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* pt.c (unify): Fix typo in previous change. 

From-SVN: r19387
This commit is contained in:
Mark Mitchell 1998-04-23 17:32:02 +00:00 committed by Mark Mitchell
parent a2538ff76a
commit 2e925bfc0c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
Thu Apr 23 18:27:53 1998 Mark P. Mitchell <mmitchell@usa.net>
* pt.c (unify): Fix typo in previous change.
Thu Apr 23 09:32:58 1998 Jason Merrill <jason@yorick.cygnus.com>
* error.c (dump_type_real): Declare canonical_name.

4
gcc/cp/pt.c
View File

@ -5652,7 +5652,7 @@ unify (tparms, targs, ntparms, parm, arg, strict, explicit_mask)
/* The PARM is not one we're trying to unify. Just check
to see if it matches ARG. */
return (TREE_CODE (arg) == TREE_CODE (parm)
&& comptypes (parm, arg, 1) == 0) ? 0 : 1;
&& comptypes (parm, arg, 1)) ? 0 : 1;
idx = TEMPLATE_TYPE_IDX (parm);
targ = TREE_VEC_ELT (targs, idx);
tparm = TREE_VALUE (TREE_VEC_ELT (tparms, idx));
@ -5761,7 +5761,7 @@ unify (tparms, targs, ntparms, parm, arg, strict, explicit_mask)
/* The PARM is not one we're trying to unify. Just check
to see if it matches ARG. */
return (TREE_CODE (arg) == TREE_CODE (parm)
&& cp_tree_equal (parm, arg) == 0) ? 0 : 1;
&& cp_tree_equal (parm, arg)) ? 0 : 1;
idx = TEMPLATE_PARM_IDX (parm);
targ = TREE_VEC_ELT (targs, idx);