diff options
| author | mread <qt-info@nokia.com> | 2010-09-30 13:49:13 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-09-30 14:48:46 (GMT) |
| commit | d63f3d51fef1ff5a034ee9841663675cc8b28d25 (patch) | |
| tree | 4e1dc7ce7755aecf99aea42dc33f04d5c73bcc1b /src | |
| parent | 2945d5f494f839eb8a65e303d3a6b2d3ac51f4f6 (diff) | |
| download | Qt-d63f3d51fef1ff5a034ee9841663675cc8b28d25.zip Qt-d63f3d51fef1ff5a034ee9841663675cc8b28d25.tar.gz Qt-d63f3d51fef1ff5a034ee9841663675cc8b28d25.tar.bz2 | |
hybrid heap improvement in the disabling of BTrace
Using an inline function for noBTrace() which can be optimised to
nothing.
Task-number: QT-3967
Reviewed-by: Shane Kearns
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/arch/symbian/qt_heapsetup_symbian.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/arch/symbian/qt_hybridheap_symbian_p.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp index b8193f1..d6b7351 100644 --- a/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp +++ b/src/corelib/arch/symbian/qt_heapsetup_symbian.cpp @@ -88,14 +88,6 @@ void Panic(TCdtPanic reason) User::Panic(KCat, reason); } -// disabling the BTrace components of heap checking macros -#ifndef ENABLE_BTRACE -int noBTrace() -{ - return 0; -} -#endif - #else /* QT_USE_NEW_SYMBIAN_ALLOCATOR */ #include <e32std.h> diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h index a59f29e..5827aca 100644 --- a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h +++ b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h @@ -96,7 +96,7 @@ // disabling the BTrace components of heap checking macros #ifndef ENABLE_BTRACE -extern int noBTrace(); +inline int noBTrace() {return 0;} #define BTraceContext12(a,b,c,d,e) noBTrace() #endif |