diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp')
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 8d6da3795ab..6ede455da3a 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -57,32 +57,26 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) *os << "void operator<<= (CORBA::Any &_tao_any, const " << node->name () << "_forany &_tao_elem)" << be_nl << "{" << be_idt_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl << "TAO_OutputCDR stream;" << be_nl << "stream << _tao_elem;" << be_nl << "if (_tao_elem.nocopy ()) // no copy" << 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 << "(void *)_tao_elem.in ()," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << node->name () << "_forany::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "else // copy" << 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 + << node->tc_name () << "," << be_nl + << "TAO_ENCAP_BYTE_ORDER," << be_nl + << "stream.begin ()," << be_nl + << "1," << be_nl << node->name () << "_dup (_tao_elem.in ())," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl - << ");" << be_uidt << be_uidt << be_uidt_nl - << "}" << be_nl - << "ACE_TRY_CHECK;" << be_nl - << "ACE_CATCHANY {}" << be_nl - << "ACE_ENDTRY;" << be_uidt_nl + << node->name () << "_forany::_tao_any_destructor" << be_uidt_nl + << ");" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "}\n\n"; os->indent (); @@ -112,10 +106,10 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "if (stream >> _tao_elem)" << be_nl << "{" << be_idt_nl << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl - << node->tc_name () << "," << be_nl - << "1," << be_nl - << "_tao_elem.inout ()," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << node->tc_name () << "," << be_nl + << "1," << be_nl + << "_tao_elem.inout ()," << be_nl + << node->name () << "_forany::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl << "return 1;" << be_uidt_nl |