diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-01 13:23:44 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-01 13:23:48 +0200 |
| commit | e4e72eae189e57c255193aa8ee556a3d9936d110 (patch) | |
| tree | 56c79d8d75479d71d341f5682531fdbd11f6ec95 /sources/shiboken2/tests/samplebinding/typesystem_sample.xml | |
| parent | 6383820c4b32395fe6dfead79f38ff93b7a0e686 (diff) | |
| parent | ae0aa898a3bc1701499ff7993c8d31bc86eb1675 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Change-Id: I31a0ff26bc02e6cc2ec2a816c16d170fc334f800
Diffstat (limited to 'sources/shiboken2/tests/samplebinding/typesystem_sample.xml')
| -rw-r--r-- | sources/shiboken2/tests/samplebinding/typesystem_sample.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index 3cc80860d..5f0a9206b 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -1666,7 +1666,7 @@ Tested in InjectCodeTest.testTypeNativeBeginning_TypeTargetBeginning: --> <inject-code class="target" position="beginning"> - %PYTHONTYPEOBJECT.tp_str = InjectCode_tpstr; + PepType(&%PYTHONTYPEOBJECT)->tp_str = InjectCode_tpstr; </inject-code> <!-- Tested in InjectCodeTest.testFunctionTargetBeginning_FunctionTargetEnd --> @@ -2178,7 +2178,7 @@ </add-function> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> - ByteArray b(((PyObject*)%PYSELF)->ob_type->tp_name); + ByteArray b(PepType(Py_TYPE(%PYSELF))->tp_name); PyObject* aux = Shiboken::String::fromStringAndSize(%CPPSELF.data(), %CPPSELF.size()); if (PyUnicode_CheckExact(aux)) { PyObject* tmp = PyUnicode_AsASCIIString(aux); |