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

From-SVN: r19387

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ef0ce1884e79751b1aa96634d19eebca81587a8e..5f2a5d41e9b4c8cea9742057454b85677c8d07a6 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 865f999af425d7526c33d4a6fb9a0d9d255d87cc..d88f9fe3a3e0ced1b0efbf725a324887c4b5204e 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -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);