diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-26 08:34:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-26 08:34:20 +0200 |
| commit | 45fa0715398f8d90573552eada0adf2e4eb5e763 (patch) | |
| tree | 82ec6ef675f8fd77204667354f92b954e2df00b4 /sources/shiboken2/tests/libsmart/smart.h | |
| parent | 54c3abd8774f479535d0b8741a3c30d1e7ee8548 (diff) | |
| parent | 4ccfd8de6462ce2ed938587eb0518038640c310f (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I5bfa45782938d3bf43e16164f1ecd69f53bfcf8e
Diffstat (limited to 'sources/shiboken2/tests/libsmart/smart.h')
| -rw-r--r-- | sources/shiboken2/tests/libsmart/smart.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/shiboken2/tests/libsmart/smart.h b/sources/shiboken2/tests/libsmart/smart.h index 2e3c96406..3347b22c1 100644 --- a/sources/shiboken2/tests/libsmart/smart.h +++ b/sources/shiboken2/tests/libsmart/smart.h @@ -81,7 +81,7 @@ public: template <class T> class SharedPtr { public: - SharedPtr() : m_refData(0) { + SharedPtr() : m_refData(nullptr) { if (shouldPrint()) std::cout << "shared_ptr default constructor " << this << "\n"; } @@ -122,7 +122,7 @@ public: { if (m_refData) return m_refData->m_heldPtr; - return 0; + return nullptr; } int useCount() const @@ -147,7 +147,7 @@ public: { if (m_refData) return m_refData->m_heldPtr; - return 0; + return nullptr; } bool operator!() const |