[Clientapps-cvs] appframeworks/common/pub hxcallbackhandler.h, 1.1.2.2, 1.1.2.3
demiurgo at helixcommunity.org demiurgo at helixcommunity.orgUpdate of /cvsroot/clientapps/appframeworks/common/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10501/common/pub
Modified Files:
Tag: hxclient_4_2_0_brizo
hxcallbackhandler.h
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with RealNetworks, and I am authorized to contribute this code under said agreement."
Modified by: EXT-Sebastien.Gros2 at nokia.com
Reviewed by:
Date: March 19 -2010
ErrorId: PAMK-83DQKU
Description: RVCT 4.0 build errors for 10.1
Using mcl.01_201002_hw79 SDK, it was compiled MCL (10.1) wk03 release candidate projects with RVCT 4.0 Build 529
Origin of the problem:
Incompatibility between the compilers versions.
Solution:
Modifying affected classes to allow compilation in both cases:
For "hxtlogutil.cpp" and "hxmmfbasectrl.cpp", the compiler complains about the "const *" that is not explicitly typed.
The argument wanted is a "GlobalID". It's a "const void*" type that has been redefined.
We cast the hexadecimal id to a "GlobalID" type
For "hxcallbackhandler.h", the compiler complains about the way the function address is passed.
We added an ampersand symbol for requesting the address of the function.
Files Modified:
\common\log\logutil\hxtlogutil.cpp
\clientapps\symbianMmf\common\hxmmfbasectrl.cpp
\clientapps\appframeworks\common\pub\hxcallbackhandler.h
New files added: NONE
Image Size and Heap Use impact: no major impact
Module Release testing (STIF) : N/A
Memory Leaks testing: ongoing
Test case(s) Added : No.
Platforms and Profiles Build Verified: helix-client-s60-50-mmf-mdf-arm/helix-client-s60-52-mmf-mdf-dsp
Platforms and Profiles Functionality verified: armv5
Branch: 420 Brizo
Index: hxcallbackhandler.h
===================================================================
RCS file: /cvsroot/clientapps/appframeworks/common/pub/hxcallbackhandler.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- hxcallbackhandler.h 23 Mar 2010 21:35:58 -0000 1.1.2.2
+++ hxcallbackhandler.h 23 Mar 2010 23:12:51 -0000 1.1.2.3
@@ -84,7 +84,7 @@
{ \
pCallbackParams->Add(0);
-#define HXCALLBACK_INIT_ASYNCH_D(ObjPtr, Func) HXCALLBACK_FUNC_PTR ptr2Func = reinterpret_cast<HXCALLBACK_FUNC_PTR>(Func); \
+#define HXCALLBACK_INIT_ASYNCH_D(ObjPtr, Func) HXCALLBACK_FUNC_PTR ptr2Func = reinterpret_cast<HXCALLBACK_FUNC_PTR>(&Func); \
CHXPtrArray* pCallbackParams = new CHXPtrArray; \
if (pCallbackParams) \
{ \