diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 20:20:20 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-05-23 20:20:20 +0000 |
| commit | 1319908a9fe43ddb4bd87e6cfc7f26ecf6dd7a70 (patch) | |
| tree | acfa3071d63c22f12c37b23d5ec706a6b1b2c877 | |
| parent | 1acea17d26d9d1b4223796f82ba6655b111fa68c (diff) | |
| download | ATCD-1319908a9fe43ddb4bd87e6cfc7f26ecf6dd7a70.tar.gz | |
ChangeLogTag:Fri May 23 15:18:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp | 6 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp | 10 |
4 files changed, 20 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 416fbde4834..5ec4b7da735 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri May 23 15:18:32 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * TAO_IDL/be_interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ci.cpp: + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Added code to + initialize the proxy_broker pointers in the constructors. + Fri May 23 15:08:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: @@ -16,7 +23,7 @@ Fri May 23 13:21:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> instantiations. * tao/Valuetype/AbstractBase.cpp: - * tao/Valuetype/Seq_Tmplinst.cpp: Templat einstantiations for the + * tao/Valuetype/Seq_Tmplinst.cpp: Template instantiations for the ValueType library. Fri May 23 11:16:31 2003 Ossama Othman <ossama@dre.vanderbilt.edu> diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index c5afbec50e6..a6ac59e7bc4 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -520,7 +520,8 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_nl; - *os << ": ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)"; + *os << ": ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)," << be_idt_nl + << "the"<< this->base_proxy_broker_name () << "_ (0)" << be_uidt_nl; if (this->has_mixed_parentage_) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp index a0661719285..40a0330d1fa 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -90,7 +90,8 @@ be_visitor_interface_ci::visit_interface (be_interface *node) << " objref," << be_nl << " _tao_collocated," << be_nl << " servant" << be_nl - << " )" << be_uidt_nl + << " )," << be_uidt_nl + << "the"<< node->base_proxy_broker_name () << "_ (0)" << be_uidt_nl << "{}"; } else @@ -175,7 +176,8 @@ be_visitor_interface_ci::visit_interface (be_interface *node) << "IOP::IOR *ior," << be_nl << "TAO_ORB_Core *oc" << be_uidt_nl << ")" << be_nl; - *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)"; + *os << ": ACE_NESTED_CLASS (CORBA, Object) (ior, oc)," << be_idt_nl + << "the"<< node->base_proxy_broker_name () << "_ (0)" << be_uidt_nl; *os << be_uidt_nl << "{" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 5050a59d693..9b080c5c111 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -173,10 +173,12 @@ be_visitor_operation_cs::visit_operation (be_operation *node) // be null. Initialize it now *os << "if (!this->is_evaluated ())" << be_idt_nl << "{" << be_idt_nl - << "ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);" << be_nl - << "this->" << intf->flat_name () - << "_setup_collocation (" << be_idt << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()" + << "ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);" << be_uidt_nl << be_nl + << "}" << be_uidt_nl + << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)"<< be_idt_nl + << "{" << be_idt_nl + << intf->flat_name () << "_setup_collocation (" << be_idt << be_idt_nl + << "this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl; |