diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-08-26 15:06:31 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-08-26 15:06:31 +0000 |
| commit | 1babeb148d277d762f324d525a835fc331a72e79 (patch) | |
| tree | 5af41eab1f023567fc58186c0d31dcad419d19c3 | |
| parent | ce7295c868d297b1693a4ff17d589dba4474ce1e (diff) | |
| download | ATCD-1babeb148d277d762f324d525a835fc331a72e79.tar.gz | |
ChangeLogTag:Tue Aug 26 10:05:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog_ref | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index b815fb497e1..6dd52cf7e28 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,9 @@ +Tue Aug 26 10:05:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * TAO_IDL/be/be_codegen.cpp: Included the new header for AMI + * TAO_IDL/be/be_visitor_operation/ami_cs.cpp: Added ";" after + generating the array of arguments. + Mon Aug 25 20:08:33 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index ffed700b23c..cc821d98247 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1386,7 +1386,7 @@ TAO_CodeGen::gen_stub_src_includes (void) if (be_global->ami_call_back () == I_TRUE) { this->gen_standard_include (this->client_stubs_, - "tao/Messaging/Twoway_Asynch_Invocation.h"); + "tao/Messaging/Asynch_Invocation_Adapter.h"); // If a valuetype has been seen, this will be in the header file. if (!ACE_BIT_ENABLED (idl_global->decls_seen_info_, 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 03306ba20c4..1fd75978776 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -169,12 +169,12 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) << be_uidt_nl << "}" << be_uidt_nl << be_nl; - *os << "if (this->the_TAO_" << parent->local_name () + *os << "if (this->the_TAO_" << parent->local_name () << "_Proxy_Broker_ == 0)" << be_idt_nl << "{" << be_idt_nl - << parent->flat_name () << "_setup_collocation (" + << parent->flat_name () << "_setup_collocation (" << be_idt << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()" + << "this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_uidt_nl; @@ -266,8 +266,8 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) } } - *os << be_uidt_nl - << "}" << be_uidt; + *os << be_uidt_nl + << "};" << be_uidt; be_interface *intf = be_interface::narrow_from_decl (parent); @@ -296,7 +296,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) } *os << "AMI_" << parent->local_name () << "Handler::" - << opname.fast_rep () + (this->ctx_->attribute () != 0) + << opname.fast_rep () + (this->ctx_->attribute () != 0) << "_reply_stub" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt_nl |