diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-15 09:25:52 +0000 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-15 10:43:00 +0000 |
| commit | 7a2b97fc4765ed17c494b39fe4fbc2297f0c602b (patch) | |
| tree | 107ab45063a55efb6cedb06e307b2b1fc6e753c4 | |
| parent | 8e01088b555271886424dacd14fe95b1a89bb217 (diff) | |
Revert "Fix detach on bool check of QSharedDataPointer"
This reverts commit 20bcff105019ee5700575b77565bf3d90ea8b9bc.
Reason for revert: Makes QSharedDataPointer comparisons ambiguous without overloading comparison operators
Change-Id: I5ad36f39505490812675afc6a435f6c43b2c0d0d
Fixes: QTBUG-87611
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/corelib/tools/qshareddata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index c114fa9d11..f123f8e7b9 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -124,7 +124,6 @@ public: return *this; } - inline operator bool () const noexcept { return d != nullptr; } inline bool operator!() const { return !d; } inline void swap(QSharedDataPointer &other) noexcept |