From 2e925bfc0c4acda15c414f10faae640a5c4735c4 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 23 Apr 1998 17:32:02 +0000 Subject: [PATCH] * pt.c (unify): Fix typo in previous change. From-SVN: r19387 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ef0ce1884e79..5f2a5d41e9b4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 23 18:27:53 1998 Mark P. Mitchell + + * pt.c (unify): Fix typo in previous change. + Thu Apr 23 09:32:58 1998 Jason Merrill * error.c (dump_type_real): Declare canonical_name. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 865f999af425..d88f9fe3a3e0 100644 --- 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); -- 2.47.3