diff options
| author | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
| commit | 180d9189e8098d98848367f673fff723ddd1d068 (patch) | |
| tree | b052fb1b8361e962884f54aa4d6e6d8dd6f67e73 /src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h | |
| parent | 18acf933474577a4cec31560eeee22de04111e1e (diff) | |
| parent | 0f6909e8e1be93d16798d31f18c4da2b0b5a084c (diff) | |
| download | Qt-180d9189e8098d98848367f673fff723ddd1d068.zip Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.gz Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h index b23e7b0..ca0961c 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.h @@ -213,6 +213,9 @@ using WTF::fastMallocAllow; // debug-only code to make sure we don't use the system malloc via the default operator // new by accident. +// We musn't customize the global operator new and delete for the Qt port. +#if !PLATFORM(QT) + WTF_PRIVATE_INLINE void* operator new(size_t size) { return fastMalloc(size); } WTF_PRIVATE_INLINE void* operator new(size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); } WTF_PRIVATE_INLINE void operator delete(void* p) { fastFree(p); } @@ -224,4 +227,6 @@ WTF_PRIVATE_INLINE void operator delete[](void* p, const std::nothrow_t&) throw( #endif +#endif + #endif /* WTF_FastMalloc_h */ |