diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-27 11:03:53 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-02-27 11:03:53 +0000 |
| commit | c667ca60af85a1da5e1c9784dbddec476639bbd2 (patch) | |
| tree | d77d81caf89701fbdec1cffeaf888e832ad94320 | |
| parent | 31c26cbd989eb3fbcc5f29f04fc856b4f539b1de (diff) | |
| download | ATCD-c667ca60af85a1da5e1c9784dbddec476639bbd2.tar.gz | |
ChangeLogTag: Sun Feb 27 11:03:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 50becd43eb9..9ffdb575d4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -80,25 +80,16 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << "CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl << be_nl - << "if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())" - << be_idt_nl - << "{" << be_idt_nl - << "ACE_NEW_RETURN (" << be_idt << be_idt_nl - << "tmp," << be_nl - << "CORBA::Object (stub, 1, this)," << be_nl - << "0" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl - << "}" << be_uidt_nl - << "else" - << be_idt_nl - << "{" << be_idt_nl + << "CORBA::Boolean _tao_opt_colloc =" << be_idt_nl + << "stub->servant_orb_var ()->orb_core ()->" + << "optimize_collocation_objects ();" << be_uidt_nl << be_nl << "ACE_NEW_RETURN (" << be_idt << be_idt_nl << "tmp," << be_nl - << "CORBA::Object (stub, 0, this)," << be_nl + << "CORBA::Object (stub, _tao_opt_colloc, this)," << be_nl << "0" << be_uidt_nl - << ");" << be_uidt << be_uidt_nl - << "}" << be_uidt_nl << be_nl - << "CORBA::Object_var obj = tmp;" << be_nl + << ");" << be_uidt_nl << be_nl; + + *os << "CORBA::Object_var obj = tmp;" << be_nl << "(void) safe_stub.release ();" << be_nl << be_nl; *os << "typedef ::" << node->name () << " STUB_SCOPED_NAME;" << be_nl |