[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
minor fixes to improve flex compatability with g++ 3.0
From: |
goon |
Subject: |
minor fixes to improve flex compatability with g++ 3.0 |
Date: |
Fri, 22 Jun 2001 11:13:26 -0400 (EDT) |
hi,
i did manage to cajole g++3.0 and flex 2.5.4a into talking
nicely with one another. differences follow.
one question remains. i would like to use something along
the lines of yy_scan_bytes() but as far as i can tell, there
is no c++ analog. am i missing something here?
thanks
erik
----------
; rcsdiff -r1.1 flex.skl
===================================================================
RCS file: RCS/flex.skl,v
retrieving revision 1.1
diff -r1.1 flex.skl
4c4
< * $Header: /home/discm/build/src/flex-2.5.4/RCS/flex.skl,v 1.1 2001/06/22
14:05:35 discm Exp $
---
> * $Header: /home/discm/build/src/flex-2.5.4/RCS/flex.skl,v 1.2 2001/06/22
> 15:01:16 discm Exp discm $
27a28,35
>
> #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)
> #define THROW_NIL throw()
> #define STD std::
> #include <iosfwd>
> #else
> #define THROW_NIL
> #define STD
28a37,38
> #endif
>
156c166
< istream* yy_input_file;
---
> STD istream* yy_input_file;
649c659
< yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
---
> yyFlexLexer::yyFlexLexer( STD istream* arg_yyin, ostream* arg_yyout )
684c694
< void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
---
> void yyFlexLexer::switch_streams( STD istream* new_in, ostream* new_out )
1058c1068
< void yyFlexLexer::yyrestart( istream* input_file )
---
> void yyFlexLexer::yyrestart( STD istream* input_file )
1129c1139
< YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
---
> YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( STD istream* file, int size )
1195,1196c1205,1208
< extern "C" int isatty YY_PROTO(( int ));
< void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
---
> #ifndef YY_NEVER_INTERACTIVE
> extern "C" int isatty YY_PROTO(( int )) THROW_NIL ;
> #endif
> void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, STD istream* file )
- minor fixes to improve flex compatability with g++ 3.0,
goon <=