From 79c74e1999d2b29bc918f6d42079c34174bb137d Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Sat, 28 Mar 2020 18:59:00 +0100 Subject: shiboken: Update sbkstring to use PyUnicode_GetLength rev. 2 Minor edits. Augments d77a90d4ef30d311dea39a7f4c3399e4363cc1b7 Task-number: PYSIDE-813 Change-Id: I3a24b1f49a22f4681d2c4e2457cda7110bd7b4f1 Reviewed-by: Friedemann Kleint --- sources/shiboken2/libshiboken/pep384impl.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sources/shiboken2/libshiboken/pep384impl.h b/sources/shiboken2/libshiboken/pep384impl.h index c18f00804..676e6c82d 100644 --- a/sources/shiboken2/libshiboken/pep384impl.h +++ b/sources/shiboken2/libshiboken/pep384impl.h @@ -214,7 +214,6 @@ LIBSHIBOKEN_API int Pep_GetVerboseFlag(void); // Meanwhile, the unicode objects have changed their layout very much, // and the former cheap macro call has become a real function call // that converts objects and needs PyMemory. -// PyUnicode_GET_SIZE was retained for compatibility reasons. // // That is not only inefficient, but also requires the GIL! // This problem was visible by debug Python and qdatastream_test.py . @@ -223,9 +222,6 @@ LIBSHIBOKEN_API int Pep_GetVerboseFlag(void); // // PyUnicode_GetSize is deprecated in favor of PyUnicode_GetLength. -// We undefine the PyUnicode_GET_SIZE macro, to be sure that it is not used -// by accident. Only PepUnicode_GetLength should be used. -#undef PyUnicode_GET_SIZE #if PY_VERSION_HEX < 0x03000000 #define PepUnicode_GetLength(op) PyUnicode_GetSize((PyObject *)(op)) #else -- cgit v1.2.3