--- a/traceservices/tracefw/utf_trace_api/inc/e32utrace.h	Thu Aug 19 11:36:21 2010 +0300
+++ b/traceservices/tracefw/utf_trace_api/inc/e32utrace.h	Tue Aug 31 16:57:14 2010 +0300
@@ -83,14 +83,14 @@
 	+((aSchema)<<BTrace::ESubCategoryIndex*8))
 /**@internalComponent*/
 #define UTracePf0(aF1,aSchema,aContext,aPc)	\
-	((BTrace::TBTrace1)BTrace::OutX) \
-		(UTRACE_HEADER(4,(aF1),(aSchema),(aContext),(aPc)))
+    BTrace::OutX \
+        (UTRACE_HEADER(4,(aF1),(aSchema),(aContext),(aPc)),0,0,0)
 /**@internalComponent*/
 #define UTracePf1(aF1,aSchema,aContext,aPc,a1)	\
-	((BTrace::TBTrace2)BTrace::OutX)(UTRACE_HEADER(8,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1))
+    BTrace::OutX(UTRACE_HEADER(8,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1),0,0)
 /**@internalComponent*/
 #define UTracePf2(aF1,aSchema,aContext,aPc,a1,a2) \
-	((BTrace::TBTrace3)BTrace::OutX)(UTRACE_HEADER(12,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1),(TUint32)(a2))
+    BTrace::OutX(UTRACE_HEADER(12,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1),(TUint32)(a2),0)
 /**@internalComponent*/
 #define UTracePf3(aF1,aSchema,aContext,aPc,a1,a2,a3) \
 	BTrace::OutX(UTRACE_HEADER(16,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1),(TUint32)(a2),(TUint32)(a3))
@@ -99,10 +99,10 @@
 	BTrace::OutBig(UTRACE_HEADER(8,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(a1),aData,(TInt)(aDataSize))
 /**@internalComponent*/
 #define UTraceSf0(aF1,aF2,aSchema,aContext,aPc)	\
-	((BTrace::TBTrace2)BTrace::OutFilteredX)(UTRACE_HEADER(8,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(aF2))
+    BTrace::OutFilteredX(UTRACE_HEADER(8,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(aF2),0,0)
 /** @internalComponent */
 #define UTraceSf1(aF1,aF2,aSchema,aContext,aPc,a1) \
-	((BTrace::TBTrace3)BTrace::OutFilteredX)(UTRACE_HEADER(12,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(aF2),(TUint32)(a1))
+    BTrace::OutFilteredX(UTRACE_HEADER(12,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(aF2),(TUint32)(a1),0)
 /** @internalComponent */
 #define UTraceSf2(aF1,aF2,aSchema,aContext,aPc,a1,a2) \
 	BTrace::OutFilteredX(UTRACE_HEADER(16,(aF1),(aSchema),(aContext),(aPc)),(TUint32)(aF2),(TUint32)(a1),(TUint32)(a2))