From d63f3d51fef1ff5a034ee9841663675cc8b28d25 Mon Sep 17 00:00:00 2001 From: mread Date: Thu, 30 Sep 2010 14:49:13 +0100 Subject: 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 --- src/corelib/arch/symbian/qt_heapsetup_symbian.cpp | 8 -------- src/corelib/arch/symbian/qt_hybridheap_symbian_p.h | 2 +- 2 files changed, 1 insertion(+), 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 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 -- cgit v0.12