diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2008-06-02 14:23:22 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2008-06-02 14:23:22 +0000 |
| commit | ee62eb72138433b96f29ad9ce56d83e8c851f820 (patch) | |
| tree | e03fcba654573b814ee49cb05b415cee3dcedfa2 | |
| parent | 41c6ed56d50e8f53a2b6cd095bdbbdd559a93ad7 (diff) | |
| download | ATCD-ee62eb72138433b96f29ad9ce56d83e8c851f820.tar.gz | |
ChangeLogTag: Mon Jun 2 14:21:40 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp.diff | 17 |
3 files changed, 35 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a4f5fea7049..a58825d3b6e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,23 @@ -Mon Jun 2 14:02:02 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> +Mon Jun 2 14:21:40 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * TAO_IDL/fe/lex.yy.cpp: + + Fixes a compile error on QNX. Thanks to Adam Mitz for providing + the patch. + + * TAO_IDL/fe/lex.yy.cpp.diff: - Manually fixed an issue in flex generated code that was causing a - signed/unsigned mismatch. + Added this and change from previous commit to be automatically + applied when lex.yy.cpp is generated; Not sure why these are suddenly + necessary, may be an anomaly in my version of flex. +Mon Jun 2 14:02:02 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> + + * TAO_IDL/fe/lex.yy.cpp: + + Manually fixed an issue in flex generated code that was causing a + signed/unsigned mismatch. + Sun Jun 1 23:14:35 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> * MPC/config/tao_idl_mcpp.mpb: diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index 68de17aad33..296519fd118 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -35,6 +35,7 @@ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 #endif +#include <inttypes.h> typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -1078,7 +1079,7 @@ static int input (void ); if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive ) \ { \ int c = '*'; \ - int n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff index 7ac996987db..887396185d9 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff +++ b/TAO/TAO_IDL/fe/lex.yy.cpp.diff @@ -1,5 +1,22 @@ --- lex.yy.cpp.orig 2008-05-31 10:22:13.000000000 -0500 +++ lex.yy.cpp 2008-05-31 10:27:05.000000000 -0500 +@@ -35,6 +35,7 @@ + #ifndef __STDC_LIMIT_MACROS + #define __STDC_LIMIT_MACROS 1 + #endif ++#include <inttypes.h> + + typedef int8_t flex_int8_t; + typedef uint8_t flex_uint8_t; +@@ -1079,7 +1079,7 @@ + if ( TAO_YY_CURRENT_BUFFER_LVALUE->tao_yy_is_interactive ) \ + { \ + int c = '*'; \ +- size_t n; \ ++ int n; \ + for ( n = 0; n < max_size && \ + (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ @@ -1698,7 +1698,7 @@ idl_global->set_lineno(idl_global->lineno() + 1); idl_store_pragma(ace_tao_yytext); |