[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.48,2.49

Fred L. Drake python-dev@python.org
Wed, 30 Aug 2000 22:15:47 -0700


Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv9615/Objects

Modified Files:
	abstract.c 
Log Message:

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


Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** abstract.c	2000/08/24 20:08:19	2.48
--- abstract.c	2000/08/31 05:15:44	2.49
***************
*** 813,820 ****
  					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))
  		return (*f)(v, w);
  
--- 813,822 ----
  					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))
  		return (*f)(v, w);