summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Scanner.l
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-11-21 16:32:10 +0000
committerBernard Normier <bernard@zeroc.com>2005-11-21 16:32:10 +0000
commitdeda1e21772f8efcaf91baab3a9e896c471b0f32 (patch)
treeaf0c168df9becd8ea00db08afb7fc04bf46dd9cd /cpp/src/Slice/Scanner.l
parentFixed dependencies (diff)
downloadice-deda1e21772f8efcaf91baab3a9e896c471b0f32.tar.bz2
ice-deda1e21772f8efcaf91baab3a9e896c471b0f32.tar.xz
ice-deda1e21772f8efcaf91baab3a9e896c471b0f32.zip
Windows x64 port
Diffstat (limited to 'cpp/src/Slice/Scanner.l')
-rw-r--r--cpp/src/Slice/Scanner.l15
1 files changed, 11 insertions, 4 deletions
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 5487e8d4601..b7541770978 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -16,10 +16,17 @@
#include <stdlib.h>
#include <math.h>
-#ifdef _MSC_VER
-// I get these warnings from some flex versions:
-// warning C4003: not enough actual parameters for macro 'yywrap'
-# pragma warning( disable : 4003 )
+#if defined(_MSC_VER) && defined(ICE_64)
+//
+// '=' : conversion from 'size_t' to 'int', possible loss of data
+// The result of fread() is a size_t and gets inserted into an int
+//
+# pragma warning( 4 : 4267 )
+//
+// 'initializing' : conversion from '__int64' to 'int', possible loss of data
+// Puts a pointer-difference into an int
+//
+# pragma warning( 4 : 4244 )
#endif
using namespace std;