diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 08:06:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-04-09 08:06:37 +0000 |
| commit | a4e770bb2c52b233e644941a2c3fd92bf7cca68f (patch) | |
| tree | 3658a6e8a123f8a8b6db5398fabdc94d2305b9c6 | |
| parent | b648d4f80727ac9e040517fb8db7e633fde6da9d (diff) | |
| download | ATCD-a4e770bb2c52b233e644941a2c3fd92bf7cca68f.tar.gz | |
Wed Apr 9 08:06:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Svc_Conf.y | 16 | ||||
| -rw-r--r-- | ACE/ace/Svc_Conf_y.cpp | 16 |
3 files changed, 22 insertions, 16 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3ed34afde2e..810814a9cd8 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 9 08:06:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Svc_Conf.y: + * ace/Svc_Conf_y.cpp: + Fixed unicode build problems + Wed Apr 9 07:18:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Service_Config.h: diff --git a/ACE/ace/Svc_Conf.y b/ACE/ace/Svc_Conf.y index 983e997d589..a3bd23b9256 100644 --- a/ACE/ace/Svc_Conf.y +++ b/ACE/ace/Svc_Conf.y @@ -291,13 +291,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // messages. void -yyerror (char const * s) -{ - yyerror (-1, -1, s); -} - -void -yyerror (int yyerrno, int yylineno, char const * s) +yyerror (int yyerrno, int yylineno, ACE_TCHAR const * s) { #if defined (ACE_NLOGGING) ACE_UNUSED_ARG (yyerrno); @@ -309,7 +303,13 @@ yyerror (int yyerrno, int yylineno, char const * s) ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), yyerrno, yylineno, - ACE_TEXT_CHAR_TO_TCHAR (s))); + s)); +} + +void +yyerror (ACE_TCHAR const * s) +{ + yyerror (-1, -1, s); } // Note that SRC_REC represents left context, which is the STREAM * diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 678b85fb672..a8558b95090 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1913,13 +1913,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // messages. void -ace_yyerror (ACE_TCHAR const * s) -{ - ace_yyerror (-1, -1, s); -} - -void -ace_yyerror (int ace_yyerrno, int ace_yylineno, char const * s) +ace_yyerror (int ace_yyerrno, int ace_yylineno, ACE_TCHAR const * s) { #if defined (ACE_NLOGGING) ACE_UNUSED_ARG (ace_yyerrno); @@ -1931,7 +1925,13 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, char const * s) ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), ace_yyerrno, ace_yylineno, - ACE_TEXT_CHAR_TO_TCHAR (s))); + s)); +} + +void +ace_yyerror (ACE_TCHAR const * s) +{ + ace_yyerror (-1, -1, s); } // Note that SRC_REC represents left context, which is the STREAM * |