diff options
| author | Mark Wiebe <mwwiebe@gmail.com> | 2012-05-09 13:42:53 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-05-10 00:47:30 -0600 |
| commit | 9d63daee9d7bc050aef46f3a22efed06d9baed4b (patch) | |
| tree | 5625e1b16091430bbaa81330181989e84df92254 /numpy | |
| parent | b7cb21ac6f0d23d8c330afbf8bb900e85d27f668 (diff) | |
| download | numpy-9d63daee9d7bc050aef46f3a22efed06d9baed4b.tar.gz | |
ENH: Change NPY_AUXDATA_FREE macro based on PR feedback
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index 6c36cccdd..db5257761 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -303,10 +303,11 @@ struct NpyAuxData_tag { /* Macros to use for freeing and cloning auxiliary data */ #define NPY_AUXDATA_FREE(auxdata) \ - if ((auxdata) == NULL) \ - ; \ - else \ - ((auxdata)->free(auxdata)) + do { \ + if ((auxdata) != NULL) { \ + (auxdata)->free(auxdata); \ + } \ + } while(0) #define NPY_AUXDATA_CLONE(auxdata) \ ((auxdata)->clone(auxdata)) |