summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Scanner.l
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-09-14 22:24:08 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-09-14 22:24:08 +0200
commita3fdb8974156397dd18122ada16e50ef42f58c19 (patch)
tree0df0b06a1c07425d502e54d883c09e33142edc2b /cpp/src/Slice/Scanner.l
parentFixed bug with optional return type not being marshalled (diff)
downloadice-a3fdb8974156397dd18122ada16e50ef42f58c19.tar.bz2
ice-a3fdb8974156397dd18122ada16e50ef42f58c19.tar.xz
ice-a3fdb8974156397dd18122ada16e50ef42f58c19.zip
Fixed Scanner.cpp build issue on Windows 32 bits
Diffstat (limited to 'cpp/src/Slice/Scanner.l')
-rw-r--r--cpp/src/Slice/Scanner.l7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 1d981e3e567..5e2b93df079 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -29,6 +29,13 @@
# pragma warning( 4 : 4244 )
#endif
+#if defined(_MSC_VER) && defined(ICE_32)
+//
+// '<' : signed/unsigned mismatch
+//
+# pragma warning( 4 : 4018 )
+#endif
+
#ifdef _MSC_VER
# ifdef slice_wrap
# undef slice_wrap