Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I071f33063db6bf1175b017d65ac77bc95fe518df

1 files changed, 9 insertions, 4 deletions

diff --git a/sources/shiboken2/libshiboken/sbkenum.cpp b/sources/shiboken2/libshiboken/sbkenum.cpp
index a62448aa6..c817a21de 100644
--- a/sources/shiboken2/libshiboken/sbkenum.cpp
+++ b/sources/shiboken2/libshiboken/sbkenum.cpp
@@ -492,11 +492,11 @@ bool createGlobalEnumItem(PyTypeObject* enumType, PyObject* module, const char*
     return false;
 }
 
-bool createScopedEnumItem(PyTypeObject* enumType, SbkObjectType* scope, const char* itemName, long itemValue)
+bool createScopedEnumItem(PyTypeObject *enumType, PyTypeObject *scope,
+                          const char *itemName, long itemValue)
 {
-    PyObject* enumItem = createEnumItem(enumType, itemName, itemValue);
-    if (enumItem) {
-        if (PyDict_SetItemString(scope->super.ht_type.tp_dict, itemName, enumItem) < 0)
+    if (PyObject *enumItem = createEnumItem(enumType, itemName, itemValue)) {
+        if (PyDict_SetItemString(scope->tp_dict, itemName, enumItem) < 0)
             return false;
         Py_DECREF(enumItem);
         return true;
@@ -504,6 +504,11 @@ bool createScopedEnumItem(PyTypeObject* enumType, SbkObjectType* scope, const ch
     return false;
 }
 
+bool createScopedEnumItem(PyTypeObject* enumType, SbkObjectType* scope, const char* itemName, long itemValue)
+{
+    return createScopedEnumItem(enumType, &scope->super.ht_type, itemName, itemValue);
+}
+
 PyObject* newItem(PyTypeObject* enumType, long itemValue, const char* itemName)
 {
     bool newValue = true;