diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-02 11:43:36 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-02 12:40:01 +0000 |
commit | c9a33a768e5b39cc999fa3c009936721af836fab (patch) | |
tree | 17cd2b6a409cde1966a58b3414a193e707b0efab /libshiboken | |
parent | a6e0b58181984e56e34147a79c0bc457d6d09ac5 (diff) |
basewrapper.cpp: Fix definition of SbkObjectGetSetList
Fix the prototype of the getter SbkObjectGetDict and remove
the C-style cast. Add missing fields to initialization
PyGetSetDef SbkObjectGetSetList[] =
Fixes warnings:
libshiboken/basewrapper.cpp:126: Warnung: missing initializer for member 'PyGetSetDef::doc' [-Wmissing-field-initializers]
libshiboken/basewrapper.cpp:126: Warnung: missing initializer for member 'PyGetSetDef::closure' [-Wmissing-field-initializers]
libshiboken/basewrapper.cpp:126: Warnung: missing initializer for member 'PyGetSetDef::get' [-Wmissing-field-initializers]
libshiboken/basewrapper.cpp:126: Warnung: missing initializer for member 'PyGetSetDef::set' [-Wmissing-field-initializers]
...
Change-Id: I42a1d5010e282e07947cdc236f7eef2ef38aecb7
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'libshiboken')
-rw-r--r-- | libshiboken/basewrapper.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libshiboken/basewrapper.cpp b/libshiboken/basewrapper.cpp index 461741785..3c22b7134 100644 --- a/libshiboken/basewrapper.cpp +++ b/libshiboken/basewrapper.cpp @@ -110,8 +110,9 @@ PyTypeObject SbkObjectType_Type = { /*tp_weaklist*/ 0 }; -static PyObject* SbkObjectGetDict(SbkObject* obj) +static PyObject *SbkObjectGetDict(PyObject* pObj, void *) { + SbkObject *obj = reinterpret_cast<SbkObject *>(pObj); if (!obj->ob_dict) obj->ob_dict = PyDict_New(); if (!obj->ob_dict) @@ -121,8 +122,8 @@ static PyObject* SbkObjectGetDict(SbkObject* obj) } static PyGetSetDef SbkObjectGetSetList[] = { - {const_cast<char*>("__dict__"), (getter)SbkObjectGetDict, 0}, - {0} // Sentinel + {const_cast<char*>("__dict__"), SbkObjectGetDict, 0, 0, 0}, + {0, 0, 0, 0, 0} // Sentinel }; static int SbkObject_traverse(PyObject* self, visitproc visit, void* arg) |