summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-15 14:12:03 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-15 14:12:03 +0000
commit352d44c0d9461f0d0e1438b21842d85a36d64e8a (patch)
treee9e1c254aabb3c952650c586b357cd3db43f1c5a /etc
parent3b14413379bd08f152ee02078087f0d47d6fedff (diff)
downloadATCD-352d44c0d9461f0d0e1438b21842d85a36d64e8a.tar.gz
removed compile warnings
Diffstat (limited to 'etc')
-rw-r--r--etc/Svc_Conf_y.cpp.diff35
1 files changed, 22 insertions, 13 deletions
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index f99b62f7c57..4df26a881da 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -1,15 +1,15 @@
---- Svc_Conf_y.cpp.orig Mon Apr 27 08:27:17 1998
-+++ Svc_Conf_y.cpp Fri Apr 24 22:06:00 1998
+--- Svc_Conf_y.cpp.orig Fri May 15 09:08:06 1998
++++ Svc_Conf_y.cpp Fri May 15 09:08:42 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 $*/
+-/* $Id: Svc_Conf.y,v 4.19 1998/05/15 03:31:04 schmidt Exp $*/
++/* $Id: Svc_Conf_y.cpp,v 4.31 1998/05/15 03:31:04 schmidt Exp $*/
#define ACE_BUILD_DLL
#include "ace/ARGV.h"
#include "ace/Svc_Conf.h"
-@@ -403,7 +403,7 @@
+@@ -408,7 +408,7 @@
#endif /* ACE_YYDEBUG_INDENT */
#ifndef ACE_YYDEBUG_REDUCE
#ifdef __cplusplus
@@ -18,16 +18,16 @@
#else
ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
int ace_yynew_state;
-@@ -433,7 +433,7 @@
+@@ -438,7 +438,7 @@
#endif /* ACE_YYDEBUG_REDUCE */
#ifndef ACE_YYDEBUG_SHIFT_LEXEME
#ifdef __cplusplus
-void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent)
-+void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, char *ace_yytoken_string, int ace_yynew_indent)
++void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, char *ace_yytoken_string, int ace_yynew_indent)
#else
ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
int ace_yyold_state;
-@@ -448,7 +448,7 @@
+@@ -453,7 +453,7 @@
#endif /* ACE_YYDEBUG_SHIFT_LEXEME */
#ifndef ACE_YYDEBUG_LOOK_AHEAD
#ifdef __cplusplus
@@ -36,7 +36,7 @@
#else
ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
int ace_yynew_state;
-@@ -465,7 +465,7 @@
+@@ -470,7 +470,7 @@
#endif /* ACE_YYDEBUG_LOOK_AHEAD */
#ifndef ACE_YYDEBUG_DISCARD_STATE
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#else
ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
int ace_yynew_state;
-@@ -493,7 +493,7 @@
+@@ -498,7 +498,7 @@
#endif /* ACE_YYDEBUG_DISCARD_STATE */
#ifndef ACE_YYDEBUG_DISCARD_TOKEN
#ifdef __cplusplus
@@ -54,7 +54,7 @@
#else
ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
int ace_yynew_state;
-@@ -508,7 +508,7 @@
+@@ -513,7 +513,7 @@
#endif /* ACE_YYDEBUG_DISCARD_TOKEN */
#ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME
#ifdef __cplusplus
@@ -63,7 +63,7 @@
#else
ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
int ace_yyold_state;
-@@ -534,7 +534,7 @@
+@@ -539,7 +539,7 @@
extern char *ace_foo();
#endif
@@ -72,7 +72,7 @@
{
ace_yyn = *ace_yys;
if (ace_yyn >= '0' && ace_yyn <= '9')
-@@ -551,7 +551,7 @@
+@@ -556,7 +556,7 @@
*ace_yyssp = ace_yystate = 0;
ace_yyloop:
@@ -81,3 +81,12 @@
if (ace_yychar < 0)
{
if ((ace_yychar = ace_yylex()) < 0) ace_yychar = 0;
+@@ -666,7 +666,7 @@
+ if (5 < ace_yydebug)
+ printf("ace_yydebug: state %d, error recovery discards token %d (%s)\n",
+ ace_yystate, ace_yychar, ace_yys);
+- else
++ else
+ ACE_YYDEBUG_DISCARD_TOKEN(ace_yystate, ace_yychar, ace_yys, ace_yyssp-ace_yyss);
+ }
+ #endif