diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2008-06-02 14:59:15 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2008-06-02 14:59:15 +0000 |
| commit | afe871b370922fd9d740e48661673af535a14a39 (patch) | |
| tree | f468365f7349512cd7033a68d06ec406d2830447 | |
| parent | ee62eb72138433b96f29ad9ce56d83e8c851f820 (diff) | |
| download | ATCD-afe871b370922fd9d740e48661673af535a14a39.tar.gz | |
ChangeLogTag: Mon Jun 2 14:58:26 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 18 | ||||
| -rw-r--r-- | TAO/MPC/config/fe_mcpp.mpb | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/contrib/mcpp/mbchar.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/mcpp_tao_yyinput.h | 2 |
4 files changed, 17 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a58825d3b6e..8f0349fb3c4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,16 +1,24 @@ +Mon Jun 2 14:58:26 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu> + + * MPC/config/fe_mcpp.mpb: + * TAO_IDL/contrib/mcpp/mbchar.cpp: + * TAO_IDL/fe/mcpp_tao_yyinput.h: + + Fuzz errors. + 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. - + the patch. + * TAO_IDL/fe/lex.yy.cpp.diff: 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. - + 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: diff --git a/TAO/MPC/config/fe_mcpp.mpb b/TAO/MPC/config/fe_mcpp.mpb index e41aec29fa0..ea6099e5839 100644 --- a/TAO/MPC/config/fe_mcpp.mpb +++ b/TAO/MPC/config/fe_mcpp.mpb @@ -1,3 +1,4 @@ +// $Id$ feature(mcpp) { macros += USE_MCPP_BUFFER_LEXING } diff --git a/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp b/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp index 9be8d5b03e5..991cdac85b9 100644 --- a/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp +++ b/TAO/TAO_IDL/contrib/mcpp/mbchar.cpp @@ -331,8 +331,8 @@ static size_t mb_read_utf8( int c1, char ** in_pp, char ** out_pp); #define NAMLEN 20 const char * set_encoding(const char * name, /* Name of encoding specified */ - const char * env, /* Name of environment variable */ - int pragma + const char * env, /* Name of environment variable */ + int pragma /* 2: #pragma setlocale, 1: #pragma __setlocale, 0: not #pragma */ ) /* diff --git a/TAO/TAO_IDL/fe/mcpp_tao_yyinput.h b/TAO/TAO_IDL/fe/mcpp_tao_yyinput.h index bd1534826b8..bc92b5641bd 100644 --- a/TAO/TAO_IDL/fe/mcpp_tao_yyinput.h +++ b/TAO/TAO_IDL/fe/mcpp_tao_yyinput.h @@ -1,5 +1,5 @@ /** $Id$ - * @file mcpp_yyinput.h + * @file mcpp_tao_yyinput.h * @author William R. Otte <wotte@dre.vanderbilt.edu> * * Provides a YY_INPUT macro which enables lexing from an in-memory buffer |