diff options
| author | Victor Stinner <vstinner@python.org> | 2022-06-02 22:59:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 22:59:57 (GMT) |
| commit | 941d7054c1f73aa097bdc4e55ede819c8f123819 (patch) | |
| tree | 2ce64d3584520c268d2e71d947efba71cd4d8fdd | |
| parent | 069c96f84ccd302436be180c8628289cc0efa977 (diff) | |
| download | cpython-941d7054c1f73aa097bdc4e55ede819c8f123819.zip cpython-941d7054c1f73aa097bdc4e55ede819c8f123819.tar.gz cpython-941d7054c1f73aa097bdc4e55ede819c8f123819.tar.bz2 | |
gh-91320: Fix more old-style cast warnings in C++ (#93285)
Use _PyObject_CAST() in the public C API to fix C++ compiler
warnings: "use of old-style cast" (clang -Wold-style-cast).
| -rw-r--r-- | Include/boolobject.h | 4 | ||||
| -rw-r--r-- | Include/ceval.h | 2 | ||||
| -rw-r--r-- | Include/pyerrors.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Include/boolobject.h b/Include/boolobject.h index 28068d1..0a661ff 100644 --- a/Include/boolobject.h +++ b/Include/boolobject.h @@ -19,8 +19,8 @@ PyAPI_DATA(PyLongObject) _Py_FalseStruct; PyAPI_DATA(PyLongObject) _Py_TrueStruct; /* Use these macros */ -#define Py_False ((PyObject *) &_Py_FalseStruct) -#define Py_True ((PyObject *) &_Py_TrueStruct) +#define Py_False _PyObject_CAST(&_Py_FalseStruct) +#define Py_True _PyObject_CAST(&_Py_TrueStruct) // Test if an object is the True singleton, the same as "x is True" in Python. PyAPI_FUNC(int) Py_IsTrue(PyObject *x); diff --git a/Include/ceval.h b/Include/ceval.h index 1b57f6e..a5387bd 100644 --- a/Include/ceval.h +++ b/Include/ceval.h @@ -31,7 +31,7 @@ Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( /* Deprecated since PyEval_CallObjectWithKeywords is deprecated */ #define PyEval_CallObject(callable, arg) \ - PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL) + PyEval_CallObjectWithKeywords(callable, arg, _PyObject_CAST(_Py_NULL)) Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction( PyObject *callable, const char *format, ...); diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 34e3de3..4944fee 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -62,7 +62,7 @@ PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *); PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *); -#define PyExceptionInstance_Class(x) ((PyObject*)Py_TYPE(x)) +#define PyExceptionInstance_Class(x) _PyObject_CAST(Py_TYPE(x)) #define _PyBaseExceptionGroup_Check(x) \ PyObject_TypeCheck(x, (PyTypeObject *)PyExc_BaseExceptionGroup) |