From: Jason Merrill <jason@yorick.cygnus.com>
Date: Wed, 28 Oct 1998 01:39:54 +0000 (+0000)
Subject: * c-typeck.c (convert_for_assignment): Parenthesize.
X-Git-Tag: prereleases/libgcj-0.1~2283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b58c9a790af44c27c4bdc15106d4685f8d38f831;p=thirdparty%2Fgcc.git

* c-typeck.c (convert_for_assignment): Parenthesize.

From-SVN: r23386
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d32f11b2a7a..5d92c995b8de 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 28 00:00:35 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* c-typeck.c (convert_for_assignment): Parenthesize.
+
 1998-10-28  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
 	* reload1.c (delete_output_reload): Avoid ambigous else.
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index caf2bf53c9a6..ab3ede71f507 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -4118,7 +4118,7 @@ convert_for_assignment (type, rhs, errtype, fundecl, funname, parmnum)
 			   && TREE_CODE (ttl) == FUNCTION_TYPE)
 			  ? ((TYPE_QUALS (ttl) | TYPE_QUALS (ttr))
 			     == TYPE_QUALS (ttr))
-			  : (TYPE_QUALS (ttl) | TYPE_QUALS (ttr)
+			  : ((TYPE_QUALS (ttl) | TYPE_QUALS (ttr))
 			     == TYPE_QUALS (ttl))))
 		    break;