1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partially revert 813a928c7c3cf98670b6043149880ed5c955efb9

Browse Source 
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>
(cherry picked from commit 606b03d0a35e71565c3a91588ef2db45b9262e27)
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ulf Hermann 2021-01-20 10:42:36 +01:00 committed by Sona Kurazyan
parent 0518717d9c
commit c2cf144343
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/tools/qsharedpointer_impl.h
View File

@ -155,6 +155,9 @@ namespace QtSharedPointer {
#endif #endif
inline void checkQObjectShared(...) { } inline void checkQObjectShared(...) { }
inline void setQObjectShared(...) { } 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) // sizeof(ExternalRefCountData) = 12 (32-bit) / 16 (64-bit)