added pragmas to disable icc warning when va_arg is used with a pointer type

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 23:38:54 +00:00
parent 9f542367b7
commit 2cfcf22d47
2 changed files with 22 additions and 6 deletions

View File

@@ -654,13 +654,19 @@ wxStringList::wxStringList (const wxChar *first, ...)
{ {
Add(s); Add(s);
s = va_arg(ap, const wxChar *); // icc gives this warning in its own va_arg() macro, argh
// if (s == NULL) #ifdef __INTELC__
#ifdef __WXMSW__ #pragma warning(push)
if ((int)(long) s == 0) #pragma warning(disable: 1684)
#else
if ((long) s == 0)
#endif #endif
s = va_arg(ap, const wxChar *);
#ifdef __INTELC__
#pragma warning(pop)
#endif
if ( !s )
break; break;
} }

View File

@@ -81,7 +81,17 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
for ( ;; ) for ( ;; )
{ {
// icc gives this warning in its own va_arg() macro, argh
#ifdef __INTELC__
#pragma warning(push)
#pragma warning(disable: 1684)
#endif
const wxChar *ext = va_arg(argptr, const wxChar *); const wxChar *ext = va_arg(argptr, const wxChar *);
#ifdef __INTELC__
#pragma warning(pop)
#endif
if ( !ext ) if ( !ext )
{ {
// NULL terminates the list // NULL terminates the list