diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-23 02:51:14 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-23 02:51:14 +0000 |
| commit | 00b31674b8a16b723ea0444f1f4d9c82b9e24689 (patch) | |
| tree | 331ce34c82fd2c961011cf62a1d3eae16ce55bca | |
| parent | fa99bfb4648858eda0dc4f87f12ac2aa3417a8e0 (diff) | |
| download | ATCD-00b31674b8a16b723ea0444f1f4d9c82b9e24689.tar.gz | |
Mon Jul 22 22:42:20 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index e9a3283f175..002c4a8a91a 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -280,8 +280,14 @@ oneway return IDL_ONEWAY; (\"([^\\\"]*|\\[ntvbrfax\\\?\'\"])*\"[ \t]*)+ { /* Skip the quotes */ char *tmp = ace_yytext; - tmp[strlen(tmp)-1] = '\0'; - yylval.sval = new UTL_String(tmp + 1); +#if defined (__SUNPRO_CC) + tmp[strlen (tmp) - 2] = '\0'; +#else + tmp[strlen (tmp) - 1] = '\0'; +#endif + ACE_NEW_RETURN (yylval.sval, + UTL_String (tmp + 1), + IDL_STRING_LITERAL); return IDL_STRING_LITERAL; } L\"([^\\\"]*|\\u([0-9a-fA-F]{1,4}))*\" { diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index f6c08ece498..b69a6bfa646 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -790,7 +790,7 @@ static char *tao_yy_last_accepting_cpos; char tao_yytext[TAO_YYLMAX]; char *tao_yytext_ptr; #define INITIAL 0 -/* $Id: idl.ll,v 1.60.4.5 2002/06/28 14:06:18 parsons Exp $ +/* $Id: idl.ll,v 1.67 2002/07/01 13:49:22 parsons Exp $ COPYRIGHT @@ -1523,8 +1523,14 @@ TAO_YY_RULE_SETUP { /* Skip the quotes */ char *tmp = ace_tao_yytext; - tmp[strlen(tmp)-1] = '\0'; - tao_yylval.sval = new UTL_String(tmp + 1); +#if defined (__SUNPRO_CC) + tmp[strlen (tmp) - 2] = '\0'; +#else + tmp[strlen (tmp) - 1] = '\0'; +#endif + ACE_NEW_RETURN (tao_yylval.sval, + UTL_String (tmp + 1), + IDL_STRING_LITERAL); return IDL_STRING_LITERAL; } TAO_YY_BREAK |