diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-13 11:45:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-13 11:45:54 +0100 |
| commit | d2deced6471f7314ca8d4e64531054047f7515dc (patch) | |
| tree | 244a7780923e56a5ec92b1f15222eb15badcd575 /sources/shiboken2/libshiboken | |
| parent | f78cc32299aa34069c64ae8f48163ac4eda560d5 (diff) | |
| parent | fa1c97fc2a7f25fe178b0c180b56f78ac00bc4c9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ib0f638130d21a5619f239a9fb8beb7d92ad8d0e8
Diffstat (limited to 'sources/shiboken2/libshiboken')
| -rw-r--r-- | sources/shiboken2/libshiboken/voidptr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/libshiboken/voidptr.cpp b/sources/shiboken2/libshiboken/voidptr.cpp index ad2a57358..7997839e4 100644 --- a/sources/shiboken2/libshiboken/voidptr.cpp +++ b/sources/shiboken2/libshiboken/voidptr.cpp @@ -87,7 +87,7 @@ int SbkVoidPtrObject_init(PyObject *self, PyObject *args, PyObject *kwds) SbkVoidPtrObject *sbkOther = reinterpret_cast<SbkVoidPtrObject *>(addressObject); sbkSelf->cptr = sbkOther->cptr; sbkSelf->size = sbkOther->size; - sbkSelf->isWritable = sbkOther->isWritable > 0 ? true : false; + sbkSelf->isWritable = sbkOther->isWritable; } // Shiboken::Object wrapper. else if (Shiboken::Object::checkType(addressObject)) { |