diff options
| author | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-27 15:02:14 +0000 |
|---|---|---|
| committer | jeliazkov_i <jeliazkov_i@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-27 15:02:14 +0000 |
| commit | 139616818cff5c604825c20173f5579d0aa0a588 (patch) | |
| tree | 165a4ab5ffa1bfe45ea5730cb2d3225cb14f7f4e | |
| parent | d6cc5275be0035e3edd3c8dbee30f6daad6b72df (diff) | |
| download | ATCD-139616818cff5c604825c20173f5579d0aa0a588.tar.gz | |
ChangeLogTag: Thu Apr 27 14:57:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ace/Svc_Conf.y | 5 | ||||
| -rw-r--r-- | ace/Svc_Conf_y.cpp | 15 |
3 files changed, 28 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 47d6bebd2c2..2499381c830 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Thu Apr 27 14:57:10 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Svc_Conf.y: + * ace/Svc_Conf_Tokens.h: + * ace/Svc_Conf_y.cpp: + + Fixed fuzz complaint about #include inside a versioned namespace + in Svc_Conf_y.cpp. It was due to a code that Bison generates a + part of the parser, from Svc_Conf.y. Changed the versioned + namespace to encloses the non-generated code only, while the + rest of the parser seems to be designed so that multiple parses + can coexist without name clashes. + Thu Apr 27 14:29:07 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com> * ace/Dynamic_Service_Dependency.h: diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index 542a7a03e0b..a3b5b7f7080 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -35,6 +35,8 @@ static ACE_Module_Type *ace_get_module (const ACE_Service_Type *sr, // Force the pretty debugging code to compile. // #define YYDEBUG 1 +ACE_END_VERSIONED_NAMESPACE_DECL + %} %token ACE_DYNAMIC ACE_STATIC ACE_SUSPEND ACE_RESUME ACE_REMOVE ACE_USTREAM @@ -308,6 +310,9 @@ pathname ; %% + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Prints the error string to standard output. Cleans up the error // messages. diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index de8efe646c9..31bfdc88b5a 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -126,6 +126,8 @@ static ACE_Module_Type *ace_get_module (const ACE_Service_Type *sr, // Force the pretty debugging code to compile. // #define ACE_YYDEBUG 1 +ACE_END_VERSIONED_NAMESPACE_DECL + /* Enabling traces. */ @@ -339,11 +341,11 @@ static const ace_yysigned_char ace_yyrhs[] = /* ACE_YYRLINE[ACE_YYN] -- source line where rule number ACE_YYN was defined. */ static const unsigned short int ace_yyrline[] = { - 0, 60, 60, 69, 73, 77, 78, 79, 80, 81, - 82, 86, 96, 103, 110, 117, 124, 128, 128, 135, - 138, 145, 144, 153, 157, 165, 169, 194, 208, 217, - 226, 248, 255, 259, 264, 270, 274, 278, 285, 289, - 293, 300, 301, 305, 306, 307 + 0, 62, 62, 71, 75, 79, 80, 81, 82, 83, + 84, 88, 98, 105, 112, 119, 126, 130, 130, 137, + 140, 147, 146, 155, 159, 167, 171, 196, 210, 219, + 228, 250, 257, 261, 266, 272, 276, 280, 287, 291, + 295, 302, 303, 307, 308, 309 }; #endif @@ -1640,6 +1642,9 @@ ace_yyreturn: + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + // Prints the error string to standard output. Cleans up the error // messages. |