diff -r 47c74d1534e1 -r ddc455616bd6 stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/driver.cpp --- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/driver.cpp Fri Apr 16 16:46:38 2010 +0300 +++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/driver.cpp Mon May 03 14:06:43 2010 +0300 @@ -44,7 +44,7 @@ // declare fileno in case it's not declared (for strict ANSI conformance) extern "C" { -_RWSTD_DLLIMPORT int (fileno)(FILE*) _LIBC_THROWS (); +IMPORT_C int (fileno)(FILE*) _LIBC_THROWS (); } // extern "C" @@ -860,10 +860,15 @@ // count the number of embedded quotes char *quote = buf; size_t nquotes = 0; + + #ifdef __ARMCC__ + #pragma diag_suppress 1293 + #endif while ((quote = strchr (quote, '"'))) { ++nquotes; ++quote; } + // no quotes found, return the original buffer if (0 == nquotes) @@ -949,8 +954,13 @@ // compute the number of newline characters in the text int nlines = 0; + + #ifdef __ARMCC__ + #pragma diag_suppress 1293 + #endif for (const char *nl = usrbuf; (nl = strchr (nl, '\n')); ++nl) ++nlines; + static const int use_color = _rw_use_color ();