From: Matt Austern <austern@apple.com>
Date: Thu, 20 Jan 2005 01:43:21 +0000 (+0000)
Subject: typeck.c (comptypes): Handle return code from objc_comptypes correctly.
X-Git-Tag: releases/gcc-4.0.0~1432
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3b35f14b0e4ea66542d9b60556027c6487c2641;p=thirdparty%2Fgcc.git

typeck.c (comptypes): Handle return code from objc_comptypes correctly.

	* typeck.c (comptypes): Handle return code from objc_comptypes
	correctly.

From-SVN: r93934
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5891fde0a50a..d593003e86dc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-19  Matt Austern  <austern@apple.com>
+
+	* typeck.c (comptypes): Handle return code from objc_comptypes
+	correctly.
+	
 2005-01-19  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* cp-tree.h, name-lookup.h: Remove unused prototypes.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 6ce3811bf3fa..70dae4b0ed44 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -1020,7 +1020,7 @@ comptypes (tree t1, tree t2, int strict)
       
       /* We may be dealing with Objective-C instances...  */
       if (TREE_CODE (t1) == RECORD_TYPE
-	  && (retval = objc_comptypes (t1, t2, 0) >= 0))
+	  && ((retval = objc_comptypes (t1, t2, 0)) >= 0))
          return retval;
       /* ...but fall through if we are not.  */