diff options
| author | Matthias Klose <doko@ubuntu.com> | 2009-04-05 12:43:08 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2009-04-05 12:43:08 +0000 |
| commit | 0610e0808b8cd16137a0859a70bcf47a16da9aa5 (patch) | |
| tree | 14e65255d79e674435a8a679d8ebef6d0a3d40b6 | |
| parent | 6c59e72576c37d4452c47ba84c9f7d98c2681a8f (diff) | |
| download | cpython-git-0610e0808b8cd16137a0859a70bcf47a16da9aa5.tar.gz | |
- Py_DECREF: Add `do { ... } while (0)' to avoid compiler warnings.
(avoiding brown paper typo this time)
| -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 cfca64f9ab..3d898f905d 100644 --- a/Include/object.h +++ b/Include/object.h @@ -749,11 +749,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. @@ -207,6 +207,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 ------- |