[Python-checkins] r71229 - in python/trunk: Include/object.h Misc/NEWS

matthias.klose python-checkins at python.org
Sun Apr 5 14:43:09 CEST 2009


Author: matthias.klose
Date: Sun Apr  5 14:43:08 2009
New Revision: 71229

Log:
- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.
  (avoiding brown paper typo this time)


Modified:
   python/trunk/Include/object.h
   python/trunk/Misc/NEWS

Modified: python/trunk/Include/object.h
==============================================================================
--- python/trunk/Include/object.h	(original)
+++ python/trunk/Include/object.h	Sun Apr  5 14:43:08 2009
@@ -749,11 +749,13 @@
 	((PyObject*)(op))->ob_refcnt++)
 
 #define Py_DECREF(op)					\
-	if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA	\
-	    --((PyObject*)(op))->ob_refcnt != 0)		\
-		_Py_CHECK_REFCNT(op)			\
-	else						\
-		_Py_Dealloc((PyObject *)(op))
+	do {						\
+	    if (_Py_DEC_REFTOTAL  _Py_REF_DEBUG_COMMA	\
+		--((PyObject*)(op))->ob_refcnt != 0)	\
+		    _Py_CHECK_REFCNT(op)		\
+	    else					\
+		_Py_Dealloc((PyObject *)(op));		\
+        } while (0)
 
 /* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
  * and tp_dealloc implementatons.

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Apr  5 14:43:08 2009
@@ -207,6 +207,8 @@
 - Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with
   short file names.
 
+- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.
+
 Library
 -------
 


More information about the Python-checkins mailing list