diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-24 11:33:04 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-24 11:34:27 (GMT) |
| commit | 5d98d7fb3e961d32819ae9831b715780487612e0 (patch) | |
| tree | 2d1a5e135fff9bc68c7100df6a04130be7896d22 | |
| parent | 5a3a5cd17496bc49c005df8f92ec2ffb56187281 (diff) | |
| download | Qt-5d98d7fb3e961d32819ae9831b715780487612e0.zip Qt-5d98d7fb3e961d32819ae9831b715780487612e0.tar.gz Qt-5d98d7fb3e961d32819ae9831b715780487612e0.tar.bz2 | |
Add an extra operator delete() to QSharedPointer's internals.
Maybe this fixes a warning that MSVC produces. But no guarantees.
Task-number: QTBUG-8462
Reviewed-by: Trust Me
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index d85c248..bfc65bc 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -209,6 +209,7 @@ namespace QtSharedPointer { inline bool destroy() { destroyer(this); return true; } inline void operator delete(void *ptr) { ::operator delete(ptr); } + inline void operator delete(void *, void *) { } }; // sizeof(ExternalRefCountWithDestroyFn) = 16 (32-bit) / 24 (64-bit) |