Avoid cast in wx_truncate_cast for intel compiler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 674b4db3e1a25d076deb4fd981ed3fd59531672b..2e933f17d07fb6e0f4557e4f1f6e1e3c4d872540 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -298,10 +298,12 @@ typedef int wxWindowID;
     inline T wx_truncate_cast_impl(X x)
     {
         #pragma warning(push)
     inline T wx_truncate_cast_impl(X x)
     {
         #pragma warning(push)

-        /* explicit conversion of a 64-bit integral type to a smaller integral type */
-        #pragma warning(disable: 1683)
+        /* implicit conversion of a 64-bit integral type to a smaller integral type */
+        #pragma warning(disable: 1682)
+        /* conversion from "X" to "T" may lose significant bits */
+        #pragma warning(disable: 810)

 
 

-        return (T)x;
+        return x;

 
         #pragma warning(pop)
     }
 
         #pragma warning(pop)
     }