diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 09cc032fbd7..9cd335ec55b 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -70,42 +70,23 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) *os << "void operator<<= (CORBA::Any &_tao_any, " << node->full_name () << "_ptr _tao_elem)" << be_nl << "{" << be_idt_nl - << "CORBA::Object_ptr *_tao_obj_ptr = 0;" << be_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl - << "ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);" << be_nl - << "*_tao_obj_ptr = " << node->full_name () - << "::_duplicate (_tao_elem);" << be_nl << "TAO_OutputCDR stream;" << be_nl - << "if (stream << *_tao_obj_ptr)" << be_nl + << "if (stream << _tao_elem)" << be_nl << "{" << be_idt_nl - << "_tao_any._tao_replace (" << be_idt << be_idt_nl + << "_tao_any._tao_replace (" << be_idt << be_idt_nl << node->tc_name () << ", " << be_nl << "TAO_ENCAP_BYTE_ORDER," << be_nl << "stream.begin ()," << be_nl << "1," << be_nl - << "_tao_obj_ptr," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl - << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "delete _tao_obj_ptr;" << be_uidt_nl + << node->full_name () << "::_duplicate (_tao_elem)," << be_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_obj_ptr;" << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_uidt_nl << "}\n" << be_nl; *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->full_name () << "_ptr &_tao_elem)" << be_nl << "{" << be_idt_nl - << "CORBA::Object_ptr *tmp = 0;" << be_nl - << "ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl @@ -113,7 +94,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "delete tmp;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl @@ -127,25 +107,18 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) << "_tao_elem = " << node->full_name () << "::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);" << be_nl << "ACE_TRY_CHECK;" << be_nl - << "*tmp = (CORBA::Object_ptr) _tao_elem; // any owns the object" << be_nl << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "tmp," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << "_tao_elem," << be_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else // failure" << be_nl - << "{" << be_idt_nl - << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl << "{" << be_idt_nl - << "delete tmp;" << be_nl << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl << "return 0;" << be_uidt_nl << "}" << be_nl |