diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 08:24:42 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-03 13:42:12 +0200 |
| commit | 3dd32863337ea2f6308ebf2f7656795d3fd488c9 (patch) | |
| tree | 08a3b35607dee19536ccb5f21b2ede0fdc41cc79 /sources/shiboken2/tests/libsample/voidholder.h | |
| parent | 4f4f1be9f46e02e87357aeee613cfd5ea0be8220 (diff) | |
| parent | 67d635fe2cc2c89c30486a2e26dea4106a9d9c16 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'sources/shiboken2/tests/libsample/voidholder.h')
| -rw-r--r-- | sources/shiboken2/tests/libsample/voidholder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/tests/libsample/voidholder.h b/sources/shiboken2/tests/libsample/voidholder.h index 23408fad8..367e99ddf 100644 --- a/sources/shiboken2/tests/libsample/voidholder.h +++ b/sources/shiboken2/tests/libsample/voidholder.h @@ -34,7 +34,7 @@ class VoidHolder { public: - explicit VoidHolder(void* ptr = 0) : m_ptr(ptr) {} + explicit VoidHolder(void *ptr = nullptr) : m_ptr(ptr) {} ~VoidHolder() {} inline void* voidPointer() { return m_ptr; } inline static void* gimmeMeSomeVoidPointer() |