Skip to content

MAINT: make Py_SET_SIZE and Py_SET_TYPE macros a bit safer #16501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric-wieser merged 2 commits into from
Jun 6, 2020
Merged

MAINT: make Py_SET_SIZE and Py_SET_TYPE macros a bit safer #16501

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ad488f
MAINT: make Py_SET_SIZE and Py_SET_TYPE macros a bit safer
tacaswell Jun 4, 2020
0b2e4ef
Update to match the upstream PR
eric-wieser Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions numpy/core/include/numpy/npy_3kcompat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ static NPY_INLINE int PyInt_Check(PyObject *op) {

#if PY_VERSION_HEX < 0x030900a4
/* Introduced in https://github.com/python/cpython/commit/d2ec81a8c99796b51fb8c49b77a7fe369863226f */
#define Py_SET_TYPE(obj, typ) (Py_TYPE(obj) = typ)
#define Py_SET_TYPE(obj, type) ((Py_TYPE(obj) = (type)), (void)0)
/* Introduced in https://github.com/python/cpython/commit/b10dc3e7a11fcdb97e285882eba6da92594f90f9 */
#define Py_SET_SIZE(obj, size) (Py_SIZE(obj) = size)
#define Py_SET_SIZE(obj, size) ((Py_SIZE(obj) = (size)), (void)0)
#endif


Expand Down