Merge:
1) Fix for bug 3366 - [GCCE] Symbol _ZTT17MyFourthException Missing from ELF File in e32test build
2) Fix for defective fix for bug 3295, t_plugin_v2beta.cpp
--- a/kerneltest/e32test/eabi/d_second_excp2u.def Fri Jul 23 10:28:58 2010 +0100
+++ b/kerneltest/e32test/eabi/d_second_excp2u.def Fri Jul 23 15:54:16 2010 +0100
@@ -7,5 +7,5 @@
_ZN14UncaughtTesterC2ERi @ 6 NONAME
_ZN14UncaughtTesterD1Ev @ 7 NONAME
_ZN14UncaughtTesterD2Ev @ 8 NONAME
- _ZTT17MyFourthException @ 9 NONAME
+ _ZTT17MyFourthException @ 9 ABSENT
--- a/kerneltest/e32test/eabi/d_second_excpu.def Fri Jul 23 10:28:58 2010 +0100
+++ b/kerneltest/e32test/eabi/d_second_excpu.def Fri Jul 23 15:54:16 2010 +0100
@@ -7,5 +7,5 @@
_ZN14UncaughtTesterC2ERi @ 6 NONAME
_ZN14UncaughtTesterD1Ev @ 7 NONAME
_ZN14UncaughtTesterD2Ev @ 8 NONAME
- _ZTT17MyFourthException @ 9 NONAME
+ _ZTT17MyFourthException @ 9 ABSENT
--- a/kerneltest/f32test/plugins/version_2beta/t_plugin_v2beta.cpp Fri Jul 23 10:28:58 2010 +0100
+++ b/kerneltest/f32test/plugins/version_2beta/t_plugin_v2beta.cpp Fri Jul 23 15:54:16 2010 +0100
@@ -51,7 +51,7 @@
"line 9 abcdefghijklmnopqrstuvwxyz\n");
_LIT( KValueTestFailMsg, "ERROR Got %d expected %d" );
-GLDEF_C void TestIfEqual( TInt aValue, TInt aExpected, TInt aLine, char aFileName[])
+GLDEF_C void TestIfEqual( TInt aValue, TInt aExpected, TInt aLine, char const * aFileName)
{
if( aExpected != aValue )
{