updated Svc_Conf_y.cpp.diff patch file

2 files changed, 26 insertions, 17 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index 5c27d0f39fa..42ade933e7e 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,16 +1,16 @@
 Mon Apr 27 07:18:54 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-	* ace/Service_Object.i (ACE_Service_Object_Ptr): Delete the
- 	  underlying Service_Object after calling its fini() method.
-  	  Thanks to Tom Arbuckle <arbuckle@uran.informatik.uni-bonn.de>
- 	  for pointing this out.
+        * ace/Service_Object.i (ACE_Service_Object_Ptr): Delete the
+          underlying Service_Object after calling its fini() method.
+          Thanks to Tom Arbuckle <arbuckle@uran.informatik.uni-bonn.de>
+          for pointing this out.
 
 Sun Apr 26 21:50:07 1998  David L. Levine  <levine@cs.wustl.edu>
 
-        * ace/Svc_Conf_l.cpp,etc/Svc_Conf_l.cpp.diff,etc/README:
-          updated the patch file.  Thanks to J. Russell Noseworthy
+        * ace/Svc_Conf_l.cpp,etc/Svc_Conf_[ly].cpp.diff,etc/README:
+          updated the patch files.  Thanks to J. Russell Noseworthy
           <rnosewor@objectsciences.com> for reporting problems with
-          it.
+          them.
 
 Sun Apr 26 01:05:20 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index 91cc08ebc50..f99b62f7c57 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -1,6 +1,15 @@
---- Svc_Conf_y.cpp.orig	Mon Feb 23 09:14:42 1998
-+++ Svc_Conf_y.cpp	Mon Feb 23 09:24:51 1998
-@@ -395,7 +397,7 @@
+--- Svc_Conf_y.cpp.orig	Mon Apr 27 08:27:17 1998
++++ Svc_Conf_y.cpp	Fri Apr 24 22:06:00 1998
+@@ -3,7 +3,7 @@
+  Modified 5/2/90 by J. Roskind to support graphic debugging modes";
+ #endif
+ #line 2 "Svc_Conf.y"
+-/* $Id: Svc_Conf.y,v 4.18 1998/04/17 19:46:08 nanbor Exp $*/
++/* $Id: Svc_Conf_y.cpp,v 4.30 1998/04/23 23:23:34 schmidt Exp $*/
+ #define ACE_BUILD_DLL
+ #include "ace/ARGV.h"
+ #include "ace/Svc_Conf.h"
+@@ -403,7 +403,7 @@
  #endif /* ACE_YYDEBUG_INDENT */
  #ifndef ACE_YYDEBUG_REDUCE
  #ifdef __cplusplus
@@ -9,7 +18,7 @@
  #else
  ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
  int ace_yynew_state;
-@@ -425,7 +427,7 @@
+@@ -433,7 +433,7 @@
  #endif /* ACE_YYDEBUG_REDUCE */
  #ifndef ACE_YYDEBUG_SHIFT_LEXEME
  #ifdef __cplusplus
@@ -18,7 +27,7 @@
  #else
  ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
  int ace_yyold_state;
-@@ -440,7 +442,7 @@
+@@ -448,7 +448,7 @@
  #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
  #ifndef ACE_YYDEBUG_LOOK_AHEAD
  #ifdef __cplusplus
@@ -27,7 +36,7 @@
  #else
  ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
-@@ -457,7 +459,7 @@
+@@ -465,7 +465,7 @@
  #endif /* ACE_YYDEBUG_LOOK_AHEAD */
  #ifndef ACE_YYDEBUG_DISCARD_STATE
  #ifdef __cplusplus
@@ -36,7 +45,7 @@
  #else
  ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
  int ace_yynew_state;
-@@ -485,7 +487,7 @@
+@@ -493,7 +493,7 @@
  #endif /* ACE_YYDEBUG_DISCARD_STATE */
  #ifndef ACE_YYDEBUG_DISCARD_TOKEN
  #ifdef __cplusplus
@@ -45,7 +54,7 @@
  #else
  ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
-@@ -500,7 +502,7 @@
+@@ -508,7 +508,7 @@
  #endif /* ACE_YYDEBUG_DISCARD_TOKEN */
  #ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME
  #ifdef __cplusplus
@@ -54,7 +63,7 @@
  #else
  ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
  int ace_yyold_state;
-@@ -526,7 +528,7 @@
+@@ -534,7 +534,7 @@
      extern char *ace_foo();
  #endif
  
@@ -63,7 +72,7 @@
      {
          ace_yyn = *ace_yys;
          if (ace_yyn >= '0' && ace_yyn <= '9')
-@@ -543,7 +545,7 @@
+@@ -551,7 +551,7 @@
      *ace_yyssp = ace_yystate = 0;
  
  ace_yyloop: