[Python-checkins] r71164 - in python/branches/release26-maint: Include/object.h Misc/NEWS
benjamin.peterson
python-checkins at python.org
Sat Apr 4 18:10:42 CEST 2009
Author: benjamin.peterson
Date: Sat Apr 4 18:10:42 2009
New Revision: 71164
Log:
Merged revisions 71163 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71163 | benjamin.peterson | 2009-04-04 11:05:51 -0500 (Sat, 04 Apr 2009) | 1 line
revert r71159 since it broke the build
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Include/object.h
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Include/object.h
==============================================================================
--- python/branches/release26-maint/Include/object.h (original)
+++ python/branches/release26-maint/Include/object.h Sat Apr 4 18:10:42 2009
@@ -746,13 +746,11 @@
((PyObject*)(op))->ob_refcnt++)
#define Py_DECREF(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)
+ if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \
+ --((PyObject*)(op))->ob_refcnt != 0) \
+ _Py_CHECK_REFCNT(op) \
+ else \
+ _Py_Dealloc((PyObject *)(op))
/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear
* and tp_dealloc implementatons.
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Sat Apr 4 18:10:42 2009
@@ -92,8 +92,6 @@
- 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