Fixed a merge issue

This commit is contained in:
Matthias Koefferlein 2022-11-09 23:30:08 +01:00
parent 7589efd781
commit ea2486eaed
1 changed files with 2 additions and 2 deletions

View File

@ -867,7 +867,7 @@ PythonClassClientData::py_type (const gsi::ClassBase &cls_decl, bool as_static)
}
void
PythonClassClientData::initialize (const gsi::ClassBase &cls_decl, PyTypeObject *py_type, bool as_static)
PythonClassClientData::initialize (const gsi::ClassBase &cls_decl, PyTypeObject *py_type, bool as_static, PythonModule *module)
{
PythonClassClientData *cd = dynamic_cast<PythonClassClientData *>(cls_decl.data (gsi::ClientIndex::Python));
if (cd) {
@ -877,7 +877,7 @@ PythonClassClientData::initialize (const gsi::ClassBase &cls_decl, PyTypeObject
cd->py_type_object = (PyObject *) py_type;
}
} else {
cls_decl.set_data (gsi::ClientIndex::Python, new PythonClassClientData (&cls_decl, as_static ? NULL : py_type, as_static ? py_type : NULL));
cls_decl.set_data (gsi::ClientIndex::Python, new PythonClassClientData (&cls_decl, as_static ? NULL : py_type, as_static ? py_type : NULL, module));
}
}