diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-04-04 15:52:50 (GMT) |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-04-04 15:52:50 (GMT) |
| commit | db5d6dc6de58a911bffdd8936b4d0eca08d5143c (patch) | |
| tree | 5c131288e7491d2f3e943e759644b59ac1fdf4d5 | |
| parent | a8da9e0e161ecf79703ae2a29f17619580166979 (diff) | |
| download | cpython-db5d6dc6de58a911bffdd8936b4d0eca08d5143c.zip cpython-db5d6dc6de58a911bffdd8936b4d0eca08d5143c.tar.gz cpython-db5d6dc6de58a911bffdd8936b4d0eca08d5143c.tar.bz2 | |
Merged revisions 71159 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71159 | matthias.klose | 2009-04-04 17:51:23 +0200 (Sa, 04 Apr 2009) | 2 lines
- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.
........
| -rw-r--r-- | Include/object.h | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Include/object.h b/Include/object.h index b02689c..a5f769e 100644 --- a/Include/object.h +++ b/Include/object.h @@ -746,11 +746,13 @@ PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); ((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. @@ -92,6 +92,8 @@ Core and Builtins - Issue #3845: In PyRun_SimpleFileExFlags avoid invalid memory access with short file names. +- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings. + Library ------- |