From: Fred Drake <fdrake@acm.org>
Date: Thu, 31 Aug 2000 05:15:44 +0000 (+0000)
Subject: Removed compiler warning about wanting explicit grouping around &&
X-Git-Tag: v2.0b1~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=562f62aa9b87121ba6086c4dee74130f003c9422;p=thirdparty%2FPython%2Fcpython.git

Removed compiler warning about wanting explicit grouping around &&
expression next to a || expression; this is a readability-inspired
warning from GCC.
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 03049152aac7..e3492ec06f6f 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -812,10 +812,12 @@ PyNumber_InPlaceAdd(PyObject *v, PyObject *w)
 		if (PyInstance_HalfBinOp(v, w, "__iadd__", &x,
 					PyNumber_Add, 0) <= 0)
 			return x;
-	} else if (HASINPLACE(v) && (v->ob_type->tp_as_sequence != NULL &&
-		  (f = v->ob_type->tp_as_sequence->sq_inplace_concat) != NULL) ||
-		  (v->ob_type->tp_as_number != NULL &&
-		  (f = v->ob_type->tp_as_number->nb_inplace_add) != NULL))
+	}
+	else if ((HASINPLACE(v)
+		  && (v->ob_type->tp_as_sequence != NULL &&
+		      (f = v->ob_type->tp_as_sequence->sq_inplace_concat) != NULL))
+		 || (v->ob_type->tp_as_number != NULL &&
+		     (f = v->ob_type->tp_as_number->nb_inplace_add) != NULL))
 		return (*f)(v, w);
 
 	BINOP(v, w, "__add__", "__radd__", PyNumber_Add);