//... => /* ... */

[wxWidgets.git] / src / common / extended.c

diff --git a/src/common/extended.c b/src/common/extended.c
index 3bba986f4b6527e43210db6c81b6d29f19abdd57..c691e6b1a56daae7a2c2b45c8286190f17715e24 100644 (file)
--- a/src/common/extended.c
+++ b/src/common/extended.c
@@ -1,3 +1,6 @@
+#if !defined(__VISAGECPP__)
+#   pragma warning(disable:4001)    /* non standard extension used: single line comment */
+#endif
 #include "wx/setup.h"
 #include <math.h>
 
@@ -82,25 +85,27 @@ void ConvertToIeeeExtended(double num, unsigned char *bytes)
                }
        }
 
-    // disable the warning about 'possible loss of data'
+    /* disable the warning about 'possible loss of data' & 'conversion between diff types' */
     #ifdef _MSC_VER
         #pragma warning(disable: 4244)
-    #endif // Visual C++
-
-       bytes[0] = expon >> 8;
-       bytes[1] = expon;
-       bytes[2] = (unsigned char) hiMant >> 24;
-       bytes[3] = (unsigned char) hiMant >> 16;
-       bytes[4] = (unsigned char) hiMant >> 8;
-       bytes[5] = (unsigned char) hiMant;
-       bytes[6] = (unsigned char) loMant >> 24;
-       bytes[7] = (unsigned char) loMant >> 16;
-       bytes[8] = (unsigned char) loMant >> 8;
-       bytes[9] = (unsigned char) loMant;
+        #pragma warning(disable: 4135)
+    #endif /* Visual C++ */
+
+       bytes[0] = (expon >> 8) & 0xff;
+       bytes[1] = expon & 0xff;
+       bytes[2] = (unsigned char) ((hiMant >> 24) & 0xff);
+       bytes[3] = (unsigned char) ((hiMant >> 16) & 0xff);
+       bytes[4] = (unsigned char) ((hiMant >> 8) & 0xff);
+       bytes[5] = (unsigned char) (hiMant & 0xff);
+       bytes[6] = (unsigned char) ((loMant >> 24) & 0xff);
+       bytes[7] = (unsigned char) ((loMant >> 16) & 0xff);
+       bytes[8] = (unsigned char) ((loMant >> 8) & 0xff);
+       bytes[9] = (unsigned char) (loMant & 0xff);
 
     #ifdef _MSC_VER
         #pragma warning(default: 4244)
-    #endif // Visual C++
+        #pragma warning(default: 4135)
+    #endif /* Visual C++ */
 }
 
 /*