From 3f40bd99d9dfc5916d439eb60260710a5079f7eb Mon Sep 17 00:00:00 2001 From: crodrigu Date: Thu, 15 Nov 2001 04:27:21 +0000 Subject: ChangeLogTag: Wed Nov 14 23:11:59 2001 Craig Rodrigues --- ChangeLog | 13 +++++++++++++ ChangeLogs/ChangeLog-02a | 13 +++++++++++++ ChangeLogs/ChangeLog-03a | 13 +++++++++++++ ace/Naming_Context.cpp | 8 ++++---- ace/Svc_Conf_l.cpp | 4 ++-- ace/Svc_Conf_y.cpp | 6 +++--- 6 files changed, 48 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c32e6bd1e2..664efb805b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Wed Nov 14 23:11:59 2001 Craig Rodrigues + + * ace/Naming_Context.cpp (info): Fixed Unicode build problems + by consistently using ACE_TCHAR instead of char, and by + using Unicode aware string functions in ACE_OS_String + instead of ACE_OS. + + * ace/Svc_Conf_l.cpp: Default intialized ace_yy_c_buf_p to ACE_TCHAR + instead of char. Default initialized ace_yy_cp, ace_yy_bp to 0. + + * ace/Svc_Conf_y.cpp: Wrap string literals passed to ace_yyerror + with ACE_LIB_TEXT(). + Wed Nov 14 06:38:41 2001 Balachandran Natarajan * docs/ACE-bug-process.html (HREF): Changed references from ace.cs diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 9c32e6bd1e2..664efb805b9 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,16 @@ +Wed Nov 14 23:11:59 2001 Craig Rodrigues + + * ace/Naming_Context.cpp (info): Fixed Unicode build problems + by consistently using ACE_TCHAR instead of char, and by + using Unicode aware string functions in ACE_OS_String + instead of ACE_OS. + + * ace/Svc_Conf_l.cpp: Default intialized ace_yy_c_buf_p to ACE_TCHAR + instead of char. Default initialized ace_yy_cp, ace_yy_bp to 0. + + * ace/Svc_Conf_y.cpp: Wrap string literals passed to ace_yyerror + with ACE_LIB_TEXT(). + Wed Nov 14 06:38:41 2001 Balachandran Natarajan * docs/ACE-bug-process.html (HREF): Changed references from ace.cs diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 9c32e6bd1e2..664efb805b9 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,16 @@ +Wed Nov 14 23:11:59 2001 Craig Rodrigues + + * ace/Naming_Context.cpp (info): Fixed Unicode build problems + by consistently using ACE_TCHAR instead of char, and by + using Unicode aware string functions in ACE_OS_String + instead of ACE_OS. + + * ace/Svc_Conf_l.cpp: Default intialized ace_yy_c_buf_p to ACE_TCHAR + instead of char. Default initialized ace_yy_cp, ace_yy_bp to 0. + + * ace/Svc_Conf_y.cpp: Wrap string literals passed to ace_yyerror + with ACE_LIB_TEXT(). + Wed Nov 14 06:38:41 2001 Balachandran Natarajan * docs/ACE-bug-process.html (HREF): Changed references from ace.cs diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index 3744b6baffe..d601c548556 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -37,17 +37,17 @@ ACE_Naming_Context::info (ACE_TCHAR **strp, size_t length) const { ACE_TRACE ("ACE_Naming_Context::info"); - char buf[BUFSIZ]; + ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, "%s\t#%s\n", "ACE_Naming_Context", "Proxy for making calls to a Name Server"); - if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) + if (*strp == 0 && (*strp = ACE_OS_String::strdup (buf)) == 0) return -1; else - ACE_OS::strsncpy (*strp, buf, length); - return ACE_OS::strlen (buf); + ACE_OS_String::strsncpy (*strp, buf, length); + return ACE_OS_String::strlen (buf); } int diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index 770986e809a..c82bab96e51 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -216,7 +216,7 @@ static int ace_yy_n_chars; /* number of characters read into ace_yy_ch_buf */ int ace_yyleng; /* Points to current character in buffer. */ -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 */ @@ -679,7 +679,7 @@ ACE_YY_DECL ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM); register ace_yy_state_type ace_yy_current_state; - register ACE_TCHAR *ace_yy_cp, *ace_yy_bp; + register ACE_TCHAR *ace_yy_cp=0, *ace_yy_bp=0; register int ace_yy_act; diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 19acdbb9140..820b5858271 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -568,7 +568,7 @@ ace_yynewstate: /* Extend the stack our own way. */ if (ace_yystacksize >= ACE_YYMAXDEPTH) { - ace_yyerror("parser stack overflow"); + ace_yyerror(ACE_LIB_TEXT("parser stack overflow")); if (ace_yyfree_stacks) { free (ace_yyss); @@ -1098,11 +1098,11 @@ ace_yyerrlab: /* here on detecting error */ free(msg); } else - ace_yyerror ("parse error; also virtual memory exceeded"); + ace_yyerror (ACE_LIB_TEXT("parse error; also virtual memory exceeded")); } else #endif /* ACE_YYERROR_VERBOSE */ - ace_yyerror("parse error"); + ace_yyerror(ACE_LIB_TEXT("parse error")); } goto ace_yyerrlab1; -- cgit v1.2.1