diff options
author | Administrator <justin_luth@sil.org> | 2020-06-17 07:16:37 +0300 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-17 15:05:02 +0200 |
commit | e9ec91f32e3320f0d23840fdc95bafbf2255fd9a (patch) | |
tree | 92263822e028da852d7b46bba8d8500b992de36d /pyuno/source | |
parent | 7caa0003b0dc71ed676cc8fa84585c49f8ac5031 (diff) |
python 3.8--only compile: add tp_print to PyTypeObject
This is a backport of four commits to allow Ubuntu 20.04 to compile.
50ccb7e82b7053306721cbe220323be072306a29
d1786724b8e8e474e1f7e39012c1f19611841dc0
893a5249b934f92f072b89b9b558c9de593aa557
23d9966751566028c50ca95ca203d20f36c64f30
Thanks to Stephan and Noel who corrected various portions
of my initial patch.
Change-Id: I15f016024754165fd093ef95c52d7ba3f6d34397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96521
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'pyuno/source')
-rw-r--r-- | pyuno/source/module/pyuno.cxx | 10 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_callable.cxx | 10 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_iterator.cxx | 22 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 10 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_struct.cxx | 10 |
5 files changed, 60 insertions, 2 deletions
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index a6a875addc46..7246658df6ca 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -1684,6 +1684,16 @@ static PyTypeObject PyUNOType = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 656d1c84cb0e..73bec5d34b5b 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -231,6 +231,16 @@ static PyTypeObject PyUNO_callable_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx index a7862857d719..840fc977014a 100644 --- a/pyuno/source/module/pyuno_iterator.cxx +++ b/pyuno/source/module/pyuno_iterator.cxx @@ -110,7 +110,6 @@ static PyObject* PyUNO_iterator_next( PyObject *self ) return nullptr; } - static PyTypeObject PyUNO_iterator_Type = { PyVarObject_HEAD_INIT( &PyType_Type, 0 ) @@ -168,6 +167,16 @@ static PyTypeObject PyUNO_iterator_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; @@ -247,7 +256,6 @@ static PyObject* PyUNO_list_iterator_next( PyObject *self ) return nullptr; } - static PyTypeObject PyUNO_list_iterator_Type = { PyVarObject_HEAD_INIT( &PyType_Type, 0 ) @@ -305,6 +313,16 @@ static PyTypeObject PyUNO_list_iterator_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 6cee574c77f5..973c95e57184 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -126,6 +126,16 @@ static PyTypeObject RuntimeImpl_Type = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index 50b74126bee9..f420575e5e5b 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -347,6 +347,16 @@ static PyTypeObject PyUNOStructType = , nullptr #if PY_VERSION_HEX >= 0x03080000 , nullptr // vectorcallfunc tp_vectorcall +#if PY_VERSION_HEX < 0x03090000 +#if defined __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif + , nullptr // tp_print +#if defined __clang__ +#pragma clang diagnostic pop +#endif +#endif #endif #endif }; |