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:
@@ -654,13 +654,19 @@ wxStringList::wxStringList (const wxChar *first, ...)
|
||||
{
|
||||
Add(s);
|
||||
|
||||
s = va_arg(ap, const wxChar *);
|
||||
// if (s == NULL)
|
||||
#ifdef __WXMSW__
|
||||
if ((int)(long) s == 0)
|
||||
#else
|
||||
if ((long) s == 0)
|
||||
// icc gives this warning in its own va_arg() macro, argh
|
||||
#ifdef __INTELC__
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 1684)
|
||||
#endif
|
||||
|
||||
s = va_arg(ap, const wxChar *);
|
||||
|
||||
#ifdef __INTELC__
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
if ( !s )
|
||||
break;
|
||||
}
|
||||
|
||||
|
@@ -81,7 +81,17 @@ wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
|
||||
|
||||
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 *);
|
||||
|
||||
#ifdef __INTELC__
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
if ( !ext )
|
||||
{
|
||||
// NULL terminates the list
|
||||
|
Reference in New Issue
Block a user