diff options
| -rw-r--r-- | ChangeLog-98b | 5 | ||||
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_command.y | 13 | ||||
| -rw-r--r-- | ace/Svc_Conf.h | 2 | ||||
| -rw-r--r-- | ace/Svc_Conf.y | 2 |
6 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index a39b69fb73a..4b373626eba 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,8 @@ +Fri Jul 24 15:15:28 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Svc_Conf.h: Change from yyerror (char *) to yyerror (const + char *). + Fri Jul 24 14:36:30 1998 Chris Gill <cdgill@cs.wustl.edu> * ace/OS.{cpp, h} (ACE_Time_Value): Added ACE_Time_Value::max, diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index f3ad1ec4ec8..9a716701ba9 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Fri Jul 24 15:16:28 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * orbsvcs/tests/Concurrency/CC_command.tab.cpp, + orbsvcs/tests/Concurrency/CC_command.tab.y: Fixed a couple of + minor inconsistencies that showed up on HP/UX 11. Thanks to + John Mulhern <9107@mn3.lawson.lawson.com> for reporting this. + Fri Jul 24 09:56:27 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * tests/Simple/client_impl.cpp: diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 3926230dd5c..508486ccf0e 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -93,13 +93,11 @@ static int ace_cc_yymaxdepth = ACE_CC_YYMAXDEPTH; # line 115 "CC_command.y" - -int ace_cc_yyerror(char *s) +void ace_cc_yyerror(char *s) { printf("%d: %s at %s in:\n%s\n", line_no, s, ace_cc_yytext, line_buf); ACE_OS::exit(-1); - return 0; } ace_cc_yytabelem ace_cc_yyexca[] ={ -1, 1, diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.y b/TAO/orbsvcs/tests/Concurrency/CC_command.y index f12c4ee258a..41b5d610aef 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.y +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.y @@ -114,10 +114,13 @@ lock_mode: T_READ { $$ = CosConcurrencyControl::read; } %% -int yyerror(char *s) +void +yyerror (const char *s) { - printf("%d: %s at %s in:\n%s\n", - line_no, s, yytext, line_buf); - ACE_OS::exit(-1); - return 0; + ACE_OS::printf ("%d: %s at %s in:\n%s\n", + line_no, + s, + yytext, + line_buf); + ACE_OS::exit (-1); } diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h index 143762a5fb8..fa3ba07eb0e 100644 --- a/ace/Svc_Conf.h +++ b/ace/Svc_Conf.h @@ -62,7 +62,7 @@ extern FILE *ace_yyin; && ferror( ace_yyin ) ) \ ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); -void ace_yyerror (char *); +void ace_yyerror (const char *); // Error handling routine required by YACC or BISON extern int ace_yylineno; diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index 74a59471cec..68fe9ea09ea 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -281,7 +281,7 @@ pathname // messages. void -yyerror (char *s) +yyerror (const char *s) { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("[error %d] on line %d: %s\n"), ++yyerrno, yylineno, ASYS_WIDE_STRING (s))); |