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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 6a32377fb41c914a639d6e2be8cc1606ae879993..42368c0e512aeee8ec2c52ec8e73e1a69fa373fa 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -654,13 +654,19 @@ wxStringList::wxStringList (const wxChar *first, ...)
   {
       Add(s);
 
   {
       Add(s);
 

+      // 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 *);
       s = va_arg(ap, const wxChar *);

-      //    if (s == NULL)
-#ifdef __WXMSW__
-      if ((int)(long) s == 0)
-#else
-      if ((long) s == 0)
+
+#ifdef __INTELC__
+    #pragma warning(pop)

 #endif
 #endif

+
+      if ( !s )

           break;
   }
 
           break;
   }
 

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index cdf3108be843f3fb0b55a230c83f512aa2b2b979..4afd332148bdf150522813524c4ed1e875e25a91 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -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 )
         {
             // NULL terminates the list
         if ( !ext )
         {
             // NULL terminates the list