summaryrefslogtreecommitdiff
path: root/cpp/demo/book/lifecycle/Scanner.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-07-29 20:22:22 +0200
committerJose <jose@zeroc.com>2013-07-29 20:22:22 +0200
commit2edd4e7b1bbbc0c14e25dfef3958a1442fba5878 (patch)
treed253a1b455ddaed5a09d93dc95cf6cf9d4cb2687 /cpp/demo/book/lifecycle/Scanner.cpp
parentFixed ICE-5393 - Java / C# load properties doesn't correctly parse Ice.Config... (diff)
downloadice-2edd4e7b1bbbc0c14e25dfef3958a1442fba5878.tar.bz2
ice-2edd4e7b1bbbc0c14e25dfef3958a1442fba5878.tar.xz
ice-2edd4e7b1bbbc0c14e25dfef3958a1442fba5878.zip
Regenerate bison & flex files with rhel6
Diffstat (limited to 'cpp/demo/book/lifecycle/Scanner.cpp')
-rw-r--r--cpp/demo/book/lifecycle/Scanner.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/demo/book/lifecycle/Scanner.cpp b/cpp/demo/book/lifecycle/Scanner.cpp
index bd8b4dbb917..3e5e0e41358 100644
--- a/cpp/demo/book/lifecycle/Scanner.cpp
+++ b/cpp/demo/book/lifecycle/Scanner.cpp
@@ -624,7 +624,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( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -635,7 +635,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( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \