diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-20 10:42:36 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-01-26 10:57:42 +0100 |
| commit | 606b03d0a35e71565c3a91588ef2db45b9262e27 (patch) | |
| tree | dc9a0ed9b3905a2a04398ab6ca88be6c7ae11e74 /src | |
| parent | 92db806aa8e7c0c40b265e3cf584d4aa85fc3ba5 (diff) | |
Partially revert 813a928c7c3cf98670b6043149880ed5c955efb9
Otherwise ASAN complains about mismatched new/delete.
Change-Id: I76ddcc388309e20055c93c68b9b6fa8a11b884e1
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index eb8846249b..222aecb018 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -152,6 +152,9 @@ namespace QtSharedPointer { #endif inline void checkQObjectShared(...) { } inline void setQObjectShared(...) { } + + inline void operator delete(void *ptr) { ::operator delete(ptr); } + inline void operator delete(void *, void *) { } }; // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit) |