diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-26 23:53:35 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-26 23:53:35 +0000 |
| commit | 0fb38be9a9e2b35bd7b27929385bc08db0e64a0f (patch) | |
| tree | 46f7c48186227c5d6ce7ffa15778cc91ca3ff69a | |
| parent | 0194d4641811feb49ec367b7f4715293147c586b (diff) | |
| download | ATCD-0fb38be9a9e2b35bd7b27929385bc08db0e64a0f.tar.gz | |
ChangeLogTag: Mon Jan 26 17:46:18 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 4 |
3 files changed, 21 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1711f775a76..fc229e79c87 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Mon Jan 26 17:46:18 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: + * TAO_IDL/be/be_visitor_operation/operation.cpp: + + In generated operation stub code, changed the name of the + array of argument helper classes passed to Invocation_Adapter, + so that the array name does not begin with the characters + '_tao_'. These characters are coincidentally applied as a prefix + to each argument helper class identifier, and so there was a + possibility of a name clash. Of course there is still a + chance of a name clash with the argument identifier itself, + but there is no way to eliminate that, only to minimize it. + This fix closes [BUGID:1725]. Thanks to Mouna Seri + <seri@crhc.uiuc.edu> for reporting the bug and for sending + the example IDL file that illustrated it. + Mon Jan 26 09:32:58 2004 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/FTRT_Event_Service/Event_Service/FTRT_Event_Service.mpc: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 9fdba1bb247..5e3e89372a5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -183,7 +183,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) // Assemble the arg helper class pointer array. *os << be_nl << be_nl - << "TAO::Argument *_tao_signature [] =" << be_idt_nl + << "TAO::Argument *_the_tao_operation_signature [] =" << be_idt_nl << "{" << be_idt_nl << "&_tao_retval"; @@ -235,7 +235,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << be_nl << be_nl << "TAO::Asynch_Invocation_Adapter _tao_call (" << be_idt << be_idt_nl << "this," << be_nl - << "_tao_signature," << be_nl + << "_the_tao_operation_signature," << be_nl << nargs << "," << be_nl << "\"" << opname.fast_rep () << "\"," << be_nl << opname_len << "," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index d4537f8cbf4..bda75a9f38f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -457,7 +457,7 @@ be_visitor_operation::gen_stub_operation_body ( this->gen_stub_body_arglist (node, os); *os << be_nl << be_nl - << "TAO::Argument *_tao_signature [] =" << be_idt_nl + << "TAO::Argument *_the_tao_operation_signature [] =" << be_idt_nl << "{" << be_idt_nl << "&_tao_retval"; @@ -493,7 +493,7 @@ be_visitor_operation::gen_stub_operation_body ( << "TAO::" << (node->is_abstract () ? "AbstractBase_" : "" ) << "Invocation_Adapter _tao_call (" << be_idt << be_idt_nl << "this," << be_nl - << "_tao_signature," << be_nl + << "_the_tao_operation_signature," << be_nl << node->argument_count () + 1 << "," << be_nl << "\""; |