diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-18 12:08:45 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-18 12:09:26 +0200 |
| commit | dc404a4ea5b667009d6c5a544aa1acc70ae257da (patch) | |
| tree | b2be3c840f5330456dc418c96d6b7b68be805cc4 /sources/shiboken2/libshiboken | |
| parent | 05e7910bb53df9e31bcb1f2d44b72bdb28d0c911 (diff) | |
| parent | cc043200068f4299cc5c6f126327bc1993486135 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I2468031ecb8cc8a97bcb8ddf85e48101ec22eda9
Diffstat (limited to 'sources/shiboken2/libshiboken')
| -rw-r--r-- | sources/shiboken2/libshiboken/pep384impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/libshiboken/pep384impl.cpp b/sources/shiboken2/libshiboken/pep384impl.cpp index 18094c5c0..869d09529 100644 --- a/sources/shiboken2/libshiboken/pep384impl.cpp +++ b/sources/shiboken2/libshiboken/pep384impl.cpp @@ -130,7 +130,7 @@ check_PyTypeObject_valid(void) long probe_tp_dictoffset = PyLong_AsLong(d); PyObject *probe_tp_mro = PyObject_GetAttrString(obtype, "__mro__"); if (false - || (probe_tp_name - check->tp_name) != 0 // to avoid warning + || strcmp(probe_tp_name, check->tp_name) != 0 || probe_tp_basicsize != check->tp_basicsize || probe_tp_call != check->tp_call || probe_tp_str != check->tp_str |