===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/usr.bin/lex/flex.skl	2001/01/05 18:26:23	1.6
+++ src/usr.bin/lex/flex.skl	2004/02/03 21:20:17	1.7
@@ -1,9 +1,9 @@
-/*	$OpenBSD: flex.skl,v 1.6 2001/01/05 18:26:23 millert Exp $	*/
+/*	$OpenBSD: flex.skl,v 1.7 2004/02/03 21:20:17 espie Exp $	*/
 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.6 2001/01/05 18:26:23 millert Exp $
+ * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.7 2004/02/03 21:20:17 espie Exp $
  */
 
 #define FLEX_SCANNER
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 %+
-class istream;
+#include <iosfwd>
 %*
 #include <unistd.h>
 
@@ -156,7 +156,7 @@
 %-
 	FILE *yy_input_file;
 %+
-	istream* yy_input_file;
+	std::istream* yy_input_file;
 %*
 
 	char *yy_ch_buf;		/* input buffer */
@@ -472,14 +472,14 @@
 %-
 			yyin = stdin;
 %+
-			yyin = &cin;
+			yyin = &std::cin;
 %*
 
 		if ( ! yyout )
 %-
 			yyout = stdout;
 %+
-			yyout = &cout;
+			yyout = &std::cout;
 %*
 
 		if ( ! yy_current_buffer )
@@ -649,7 +649,7 @@
 	} /* end of yylex */
 
 %+
-yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
+yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )
 	{
 	yyin = arg_yyin;
 	yyout = arg_yyout;
@@ -684,7 +684,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, std::ostream* new_out )
 	{
 	if ( new_in )
 		{
@@ -1058,7 +1058,7 @@
 FILE *input_file;
 #endif
 %+
-void yyFlexLexer::yyrestart( istream* input_file )
+void yyFlexLexer::yyrestart( std::istream* input_file )
 %*
 	{
 	if ( ! yy_current_buffer )
@@ -1129,7 +1129,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;
@@ -1182,7 +1182,7 @@
 %-
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
+#include <unistd.h>
 #endif
 #endif
 
@@ -1196,7 +1196,7 @@
 
 %+
 extern "C" int isatty YY_PROTO(( int ));
-void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
+void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )
 %*
 
 	{
@@ -1443,7 +1443,7 @@
 
 void yyFlexLexer::LexerError( yyconst char msg[] )
 	{
-	cerr << msg << '\n';
+	std::cerr << msg << '\n';
 	exit( YY_EXIT_FAILURE );
 	}
 %*