Skip to content

Commit ae56459

Browse files
committed
Fix Py_CLEAR/Py_SETREF macros for C++
Replace "_Py_TYPEOF(dst)*" with "_Py_TYPEOF(&(dst))". In C++, "_Py_TYPEOF(dst)*" can fail with a compiler error.
1 parent 13de0a0 commit ae56459

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Include/cpython/object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
352352
#ifdef _Py_TYPEOF
353353
#define Py_SETREF(dst, src) \
354354
do { \
355-
_Py_TYPEOF(dst)* _tmp_dst_ptr = &(dst); \
355+
_Py_TYPEOF(&(dst)) _tmp_dst_ptr = &(dst); \
356356
_Py_TYPEOF(dst) _tmp_old_dst = (*_tmp_dst_ptr); \
357357
*_tmp_dst_ptr = (src); \
358358
Py_DECREF(_tmp_old_dst); \
@@ -374,7 +374,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
374374
#ifdef _Py_TYPEOF
375375
#define Py_XSETREF(dst, src) \
376376
do { \
377-
_Py_TYPEOF(dst)* _tmp_dst_ptr = &(dst); \
377+
_Py_TYPEOF(&(dst)) _tmp_dst_ptr = &(dst); \
378378
_Py_TYPEOF(dst) _tmp_old_dst = (*_tmp_dst_ptr); \
379379
*_tmp_dst_ptr = (src); \
380380
Py_XDECREF(_tmp_old_dst); \

Include/refcount.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ static inline Py_ALWAYS_INLINE void Py_DECREF(PyObject *op)
482482
#ifdef _Py_TYPEOF
483483
#define Py_CLEAR(op) \
484484
do { \
485-
_Py_TYPEOF(op)* _tmp_op_ptr = &(op); \
485+
_Py_TYPEOF(&(op)) _tmp_op_ptr = &(op); \
486486
_Py_TYPEOF(op) _tmp_old_op = (*_tmp_op_ptr); \
487487
if (_tmp_old_op != _Py_NULL) { \
488488
*_tmp_op_ptr = _Py_NULL; \

0 commit comments

Comments
 (0)