summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Scanner.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-10-20 00:48:55 +0200
committerJose <jose@zeroc.com>2012-10-20 00:48:55 +0200
commit1d46af0805f6b77611001bb933707758afb30306 (patch)
tree1e5dd7c82538e34feef8dd92a7318ac3a3ea9cc2 /cpp/src/Slice/Scanner.cpp
parentIceGrid parser fixes (diff)
downloadice-1d46af0805f6b77611001bb933707758afb30306.tar.bz2
ice-1d46af0805f6b77611001bb933707758afb30306.tar.xz
ice-1d46af0805f6b77611001bb933707758afb30306.zip
regenerate Grammar & Scanner files in rhel6
Diffstat (limited to 'cpp/src/Slice/Scanner.cpp')
-rw-r--r--cpp/src/Slice/Scanner.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 9399b80a741..11941185747 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -1,4 +1,4 @@
-#include "IceUtil/ScannerConfig.h"
+#include <IceUtil/ScannerConfig.h>
#line 2 "lex.yy.c"
#line 4 "lex.yy.c"
@@ -711,7 +711,7 @@ static int input (void );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( slice_text, slice_leng, 1, slice_out )
+#define ECHO do { if (fwrite( slice_text, slice_leng, 1, slice_out )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -722,7 +722,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ unsigned n; \
for ( n = 0; n < max_size && \
(c = getc( slice_in )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \