[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
unified diffes for g++ 3.0
From: |
erik quanstrom |
Subject: |
unified diffes for g++ 3.0 |
Date: |
Fri, 22 Jun 2001 15:15:04 -0400 (EDT) |
how's this ....
--------------
$ rcsdiff -r1.1 -r1.3 -u flex.skl
===================================================================
RCS file: RCS/flex.skl,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- flex.skl 2001/06/22 14:05:35 1.1
+++ flex.skl 2001/06/22 15:20:32 1.3
@@ -1,7 +1,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $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.3 2001/06/22
15:20:32 discm Exp $
*/
#define FLEX_SCANNER
@@ -25,7 +25,17 @@
#include <stdlib.h>
%+
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)
+#define THROW_NIL throw()
+#define STD std::
+#include <iosfwd>
+#else
+#define THROW_NIL
+#define STD
class istream;
+#endif
+
%*
#include <unistd.h>
@@ -153,7 +163,7 @@
%-
FILE *yy_input_file;
%+
- istream* yy_input_file;
+ STD istream* yy_input_file;
%*
char *yy_ch_buf; /* input buffer */
@@ -646,7 +656,7 @@
} /* end of yylex */
%+
-yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
+yyFlexLexer::yyFlexLexer( STD istream* arg_yyin, ostream* arg_yyout )
{
yyin = arg_yyin;
yyout = arg_yyout;
@@ -681,7 +691,7 @@
yy_delete_buffer( yy_current_buffer );
}
-void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
+void yyFlexLexer::switch_streams( STD istream* new_in, ostream* new_out )
{
if ( new_in )
{
@@ -1055,7 +1065,7 @@
FILE *input_file;
#endif
%+
-void yyFlexLexer::yyrestart( istream* input_file )
+void yyFlexLexer::yyrestart( STD istream* input_file )
%*
{
if ( ! yy_current_buffer )
@@ -1126,7 +1136,7 @@
int size;
#endif
%+
-YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
+YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( STD istream* file, int size )
%*
{
YY_BUFFER_STATE b;
@@ -1192,8 +1202,10 @@
#endif
%+
-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 )
%*
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- unified diffes for g++ 3.0,
erik quanstrom <=