diff -r 47c74d1534e1 -r ddc455616bd6 stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inplmrg/src/stlport_inplmrg.cpp --- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inplmrg/src/stlport_inplmrg.cpp Fri Apr 16 16:46:38 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inplmrg/src/stlport_inplmrg.cpp Mon May 03 14:06:43 2010 +0300 @@ -114,6 +114,9 @@ #ifdef LIBC_OLD_BACKEND MrtInit(); #endif + #ifdef __ARMCC__ + #pragma diag_suppress 830 + #endif Cstlport_inplmrg* self = new (ELeave) Cstlport_inplmrg( aTestModuleIf ); CleanupStack::PushL( self );