diff options
| -rw-r--r-- | Include/cpython/abstract.h | 18 | ||||
| -rw-r--r-- | Include/cpython/unicodeobject.h | 6 | ||||
| -rw-r--r-- | Include/object.h | 4 | ||||
| -rw-r--r-- | Include/pyport.h | 8 | ||||
| -rw-r--r-- | Lib/test/_testcppext.cpp | 8 | ||||
| -rw-r--r-- | Lib/test/test_cppext.py | 2 |
6 files changed, 28 insertions, 18 deletions
diff --git a/Include/cpython/abstract.h b/Include/cpython/abstract.h index 77e2cfa..161e2cb 100644 --- a/Include/cpython/abstract.h +++ b/Include/cpython/abstract.h @@ -103,8 +103,8 @@ PyAPI_FUNC(PyObject *) PyObject_VectorcallMethod( static inline PyObject * PyObject_CallMethodNoArgs(PyObject *self, PyObject *name) { - return PyObject_VectorcallMethod(name, &self, - 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); + size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET; + return PyObject_VectorcallMethod(name, &self, nargsf, _Py_NULL); } static inline PyObject * @@ -113,8 +113,8 @@ PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg) PyObject *args[2] = {self, arg}; assert(arg != NULL); - return PyObject_VectorcallMethod(name, args, - 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); + size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET; + return PyObject_VectorcallMethod(name, args, nargsf, _Py_NULL); } PyAPI_FUNC(PyObject *) _PyObject_CallMethod(PyObject *obj, @@ -144,7 +144,7 @@ _PyObject_VectorcallMethodId( { PyObject *oname = _PyUnicode_FromId(name); /* borrowed */ if (!oname) { - return NULL; + return _Py_NULL; } return PyObject_VectorcallMethod(oname, args, nargsf, kwnames); } @@ -152,8 +152,8 @@ _PyObject_VectorcallMethodId( static inline PyObject * _PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name) { - return _PyObject_VectorcallMethodId(name, &self, - 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); + size_t nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET; + return _PyObject_VectorcallMethodId(name, &self, nargsf, _Py_NULL); } static inline PyObject * @@ -162,8 +162,8 @@ _PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg PyObject *args[2] = {self, arg}; assert(arg != NULL); - return _PyObject_VectorcallMethodId(name, args, - 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); + size_t nargsf = 2 | PY_VECTORCALL_ARGUMENTS_OFFSET; + return _PyObject_VectorcallMethodId(name, args, nargsf, _Py_NULL); } PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); diff --git a/Include/cpython/unicodeobject.h b/Include/cpython/unicodeobject.h index 96bfaaf..8e182d0 100644 --- a/Include/cpython/unicodeobject.h +++ b/Include/cpython/unicodeobject.h @@ -642,9 +642,9 @@ static inline Py_ssize_t PyUnicode_GET_SIZE(PyObject *op) { _Py_COMP_DIAG_PUSH _Py_COMP_DIAG_IGNORE_DEPR_DECLS - if (_PyASCIIObject_CAST(op)->wstr == NULL) { + if (_PyASCIIObject_CAST(op)->wstr == _Py_NULL) { (void)PyUnicode_AsUnicode(op); - assert(_PyASCIIObject_CAST(op)->wstr != NULL); + assert(_PyASCIIObject_CAST(op)->wstr != _Py_NULL); } return PyUnicode_WSTR_LENGTH(op); _Py_COMP_DIAG_POP @@ -674,7 +674,7 @@ Py_DEPRECATED(3.3) static inline Py_UNICODE* PyUnicode_AS_UNICODE(PyObject *op) { wchar_t *wstr = _PyASCIIObject_CAST(op)->wstr; - if (wstr != NULL) { + if (wstr != _Py_NULL) { return wstr; } diff --git a/Include/object.h b/Include/object.h index f93ecce..a0dba69 100644 --- a/Include/object.h +++ b/Include/object.h @@ -587,7 +587,7 @@ static inline void Py_DECREF(PyObject *op) /* Function to use in case the object pointer can be NULL: */ static inline void Py_XINCREF(PyObject *op) { - if (op != NULL) { + if (op != _Py_NULL) { Py_INCREF(op); } } @@ -597,7 +597,7 @@ static inline void Py_XINCREF(PyObject *op) static inline void Py_XDECREF(PyObject *op) { - if (op != NULL) { + if (op != _Py_NULL) { Py_DECREF(op); } } diff --git a/Include/pyport.h b/Include/pyport.h index f6270be..614a278 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -33,6 +33,14 @@ # define _Py_CAST(type, expr) ((type)(expr)) #endif +// Static inline functions should use _Py_NULL rather than using directly NULL +// to prevent C++ compiler warnings. In C++, _Py_NULL uses nullptr. +#ifdef __cplusplus +# define _Py_NULL nullptr +#else +# define _Py_NULL NULL +#endif + /* Defines to build Python and its standard library: * diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp index 257843b..dc40f0e 100644 --- a/Lib/test/_testcppext.cpp +++ b/Lib/test/_testcppext.cpp @@ -52,7 +52,7 @@ test_api_casts(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args)) static PyMethodDef _testcppext_methods[] = { {"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc}, - {"test_api_casts", test_api_casts, METH_NOARGS, NULL}, + {"test_api_casts", test_api_casts, METH_NOARGS, nullptr}, {nullptr, nullptr, 0, nullptr} /* sentinel */ }; @@ -68,7 +68,7 @@ _testcppext_exec(PyObject *module) static PyModuleDef_Slot _testcppext_slots[] = { {Py_mod_exec, reinterpret_cast<void*>(_testcppext_exec)}, - {0, NULL} + {0, nullptr} }; @@ -81,8 +81,8 @@ static struct PyModuleDef _testcppext_module = { 0, // m_size _testcppext_methods, // m_methods _testcppext_slots, // m_slots - NULL, // m_traverse - NULL, // m_clear + nullptr, // m_traverse + nullptr, // m_clear nullptr, // m_free }; diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py index fbb79bb..e056410 100644 --- a/Lib/test/test_cppext.py +++ b/Lib/test/test_cppext.py @@ -29,6 +29,8 @@ if not MS_WINDOWS: '-Werror', # Warn on old-style cast (C cast) like: (PyObject*)op '-Wold-style-cast', + # Warn when using NULL rather than _Py_NULL in static inline functions + '-Wzero-as-null-pointer-constant', ] else: # Don't pass any compiler flag to MSVC |