From 5d98d7fb3e961d32819ae9831b715780487612e0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 24 Feb 2010 12:33:04 +0100 Subject: 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 --- src/corelib/tools/qsharedpointer_impl.h | 1 + 1 file changed, 1 insertion(+) 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) -- cgit v0.12