Bug 2961 - GCC compilation issues with debug macro string expansion fixed GCC_SURGE
authorSebastian Brannstrom <sebastianb@symbian.org>
Tue, 15 Jun 2010 14:56:44 +0100
branchGCC_SURGE
changeset 39 82988ef59a49
parent 36 d4ed4f2ebb90
child 40 e84fb4c9218b
Bug 2961 - GCC compilation issues with debug macro string expansion fixed
usbengines/usbotgwatcher/inc/debug.h
usbengines/usbwatcher/inc/debug.h
--- a/usbengines/usbotgwatcher/inc/debug.h	Fri Jun 11 16:27:05 2010 +0100
+++ b/usbengines/usbotgwatcher/inc/debug.h	Tue Jun 15 14:56:44 2010 +0100
@@ -102,11 +102,11 @@
 // Paramters same as above.
 #define LOG( str ) { RDebug::Printf( "["MODULE_NAME"] %s", str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] "##s , v ); }
+#define LOG1( s, v ) { RDebug::Printf( "["MODULE_NAME"] " s , v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] "##s , v1, v2 ); }
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "["MODULE_NAME"] " s , v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] "##s , \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "["MODULE_NAME"] " s , \
         v1, v2, v3); }
 
 class TFuncLogger
--- a/usbengines/usbwatcher/inc/debug.h	Fri Jun 11 16:27:05 2010 +0100
+++ b/usbengines/usbwatcher/inc/debug.h	Tue Jun 15 14:56:44 2010 +0100
@@ -109,13 +109,13 @@
 #define LOG( str ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] %s",\
         TUint(RThread().Id()), str  ); }
 
-#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s ,\
+#define LOG1( s, v ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s ,\
         TUint(RThread().Id()), v ); }
 
-#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s , \
+#define LOG2( s, v1,v2 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s , \
         TUint(RThread().Id()), v1, v2 ); }
 
-#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] "##s, \
+#define LOG3( s, v1, v2, v3 ) { RDebug::Printf( "[%08x] ["MODULE_NAME"] " s, \
         TUint(RThread().Id()), v1, v2, v3); }
 
 class TFuncLogger