ChangeLogTag: Thu Nov 15 20:44:40 2001 Craig Rodrigues <crodrigu@bbn.com>

1 files changed, 50 insertions, 21 deletions

diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index bea9aec1be4..bda20aa37cb 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,26 +1,31 @@
---- Svc_Conf_l.cpp.orig	Sat Nov 10 01:16:38 2001
-+++ Svc_Conf_l.cpp	Sat Nov 10 01:11:39 2001
-@@ -1,3 +1,4 @@
+--- Svc_Conf_l.cpp	Thu Nov 15 20:41:55 2001
++++ /tmp/new/Svc_Conf_l.cpp	Thu Nov 15 20:37:24 2001
+@@ -1,17 +1,14 @@
 +#define ACE_YY_NO_UNPUT
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
-@@ -8,9 +9,6 @@
+- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
++ * $Header: /project/cvs-repository/ACE_wrappers-repository/ace/Svc_Conf_l.cpp,v 4.55 2001/11/15 04:27:01 crodrigu Exp $
+  */
+ 
+ #define FLEX_SCANNER
  #define ACE_YY_FLEX_MAJOR_VERSION 2
  #define ACE_YY_FLEX_MINOR_VERSION 5
  
 -#include "ace/OS.h"
+-#include "ace/OS.h"
 -
 -
  /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
  #ifdef c_plusplus
  #ifndef __cplusplus
-@@ -21,8 +19,8 @@
+@@ -22,7 +19,8 @@
  
  #ifdef __cplusplus
  
 -#include /**/ <stdlib.h>
- #include "ace/OS.h"
++#include "ace/OS.h"
 +#include "ace/Object_Manager.h"
  
  /* Use prototypes in function declarations. */
@@ -60,7 +65,7 @@
  
  /* Points to current character in buffer. */
 -static char *ace_yy_c_buf_p = (char *) 0;
-+static ACE_TCHAR *ace_yy_c_buf_p = (char *) 0;
++static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0;
  static int ace_yy_init = 1;		/* whether we need to initialize */
  static int ace_yy_start = 0;	/* start state number */
  
@@ -106,15 +111,27 @@
  
  /* The intent behind this definition is that it'll catch
   * any uses of REJECT which flex missed.
-@@ -499,7 +499,7 @@
+@@ -499,9 +499,9 @@
  #define ace_yymore() ace_yymore_used_but_not_detected
  #define ACE_YY_MORE_ADJ 0
  #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET
 -char *ace_yytext;
 +ACE_TCHAR *ace_yytext;
  #define INITIAL 0
- // $Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $
+-// $Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $
++// $Id: Svc_Conf_l.cpp,v 4.55 2001/11/15 04:27:01 crodrigu Exp $
  // Sample lexical analysis for regular expression subset.  Must be
+ // compiled with FLEX and an ANSI C++ compiler.
+ 
+@@ -512,7 +512,7 @@
+ 
+ ACE_RCSID (ace,
+ 	   Svc_Conf_l,
+-	   "$Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $")
++	   "$Id: Svc_Conf_l.cpp,v 4.55 2001/11/15 04:27:01 crodrigu Exp $")
+ 
+ // Keeps track of the current line for debugging output.
+ int ace_yylineno = 1;
 @@ -536,15 +536,15 @@
  #endif
  
@@ -168,8 +185,8 @@
 +          ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM);
 +
  	register ace_yy_state_type ace_yy_current_state;
--	register char *ace_yy_cp, *ace_yy_bp;
-+	register ACE_TCHAR *ace_yy_cp, *ace_yy_bp;
+-	register char *ace_yy_cp = NULL, *ace_yy_bp = NULL;
++	register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0;
  	register int ace_yy_act;
  
  
@@ -472,7 +489,19 @@
  
  	b->ace_yy_is_our_buffer = 1;
  
-@@ -1524,10 +1531,10 @@
+@@ -1459,6 +1466,11 @@
+ 	}
+ 
+ 
++#ifndef ACE_YY_ALWAYS_INTERACTIVE
++#ifndef ACE_YY_NEVER_INTERACTIVE
++extern int nop_isatty ACE_YY_PROTO(( int ));
++#endif
++#endif
+ 
+ #ifdef ACE_YY_USE_PROTOS
+ void ace_yy_init_buffer( ACE_YY_BUFFER_STATE b, FILE *file )
+@@ -1519,10 +1531,10 @@
  
  #ifndef ACE_YY_NO_SCAN_BUFFER
  #ifdef ACE_YY_USE_PROTOS
@@ -485,7 +514,7 @@
  ace_yy_size_t size;
  #endif
  	{
-@@ -1541,7 +1548,7 @@
+@@ -1536,7 +1548,7 @@
  
  	b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) );
  	if ( ! b )
@@ -494,7 +523,7 @@
  
  	b->ace_yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
  	b->ace_yy_buf_pos = b->ace_yy_ch_buf = base;
-@@ -1562,10 +1569,10 @@
+@@ -1557,10 +1569,10 @@
  
  #ifndef ACE_YY_NO_SCAN_STRING
  #ifdef ACE_YY_USE_PROTOS
@@ -507,7 +536,7 @@
  #endif
  	{
  	int len;
-@@ -1579,23 +1586,23 @@
+@@ -1574,23 +1586,23 @@
  
  #ifndef ACE_YY_NO_SCAN_BYTES
  #ifdef ACE_YY_USE_PROTOS
@@ -536,7 +565,7 @@
  
  	for ( i = 0; i < len; ++i )
  		buf[i] = bytes[i];
-@@ -1604,7 +1611,7 @@
+@@ -1599,7 +1611,7 @@
  
  	b = ace_yy_scan_buffer( buf, n );
  	if ( ! b )
@@ -545,7 +574,7 @@
  
  	/* It's okay to grow etc. this buffer, and we should throw it
  	 * away when we're done.
-@@ -1639,8 +1646,8 @@
+@@ -1634,8 +1646,8 @@
  					(void *) ace_yy_start_stack, new_size );
  
  		if ( ! ace_yy_start_stack )
@@ -556,7 +585,7 @@
  		}
  
  	ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START;
-@@ -1654,7 +1661,7 @@
+@@ -1649,7 +1661,7 @@
  static void ace_yy_pop_state()
  	{
  	if ( --ace_yy_start_stack_ptr < 0 )
@@ -565,7 +594,7 @@
  
  	BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]);
  	}
-@@ -1673,13 +1680,13 @@
+@@ -1668,13 +1680,13 @@
  #endif
  
  #ifdef ACE_YY_USE_PROTOS
@@ -582,7 +611,7 @@
  	exit( ACE_YY_EXIT_FAILURE );
  	}
  
-@@ -1705,11 +1712,11 @@
+@@ -1700,11 +1712,11 @@
  
  #ifndef ace_yytext_ptr
  #ifdef ACE_YY_USE_PROTOS
@@ -597,7 +626,7 @@
  int n;
  #endif
  	{
-@@ -1721,10 +1728,10 @@
+@@ -1716,10 +1728,10 @@
  
  #ifdef ACE_YY_NEED_STRLEN
  #ifdef ACE_YY_USE_PROTOS