diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:19:20 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2023-06-29 15:19:20 +0300 |
| commit | 568797c36a73aecce050fd198353f31aa986bff9 (patch) | |
| tree | e1781afe922c4b6327045134639a5c5d41b56300 /sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp | |
| parent | 643237181d15086816d38cdb17f18147c7ebcbd8 (diff) | |
| parent | c76c68a64bb4dce48017c61b4ca021dc6726f77b (diff) | |
Merge tag 'v5.15.11-lts' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Qt For Python Release 5.15.11
Change-Id: Idbf9b792238244e185e39be4058a7a2c69458ce9
Diffstat (limited to 'sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp')
| -rw-r--r-- | sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp index 996968fa1..cc25b349d 100644 --- a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp +++ b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp @@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o) str << " NPY_ARRAY_NOTSWAPPED"; if ((flags & NPY_ARRAY_WRITEABLE) != 0) str << " NPY_ARRAY_WRITEABLE"; +#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION + if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) + str << " NPY_ARRAY_WRITEBACKIFCOPY"; +#else if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) str << " NPY_ARRAY_UPDATEIFCOPY"; +#endif } else { str << '0'; } |