diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp | 117 |
1 files changed, 19 insertions, 98 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 3ac5c434f64..c7f223d8d18 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -56,36 +56,18 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) *os << "void operator<<= (CORBA::Any &_tao_any, const " << node->name () << " &_tao_elem) // copying" << be_nl << "{" << be_idt_nl - << node->name () << " *_tao_any_val = 0;" << be_nl - << "ACE_NEW (_tao_any_val, " << node->name () - << " (_tao_elem));" << be_nl - << "if (!_tao_any_val) return;" << be_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl << "TAO_OutputCDR stream;" << be_nl - << "stream << *_tao_any_val;" << be_nl + << "stream << _tao_elem;" << be_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_any_val," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl - << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY " << be_nl - << "{" << be_idt_nl - << "delete _tao_any_val;" << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_uidt_nl + << "stream.begin ()" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}\n" << be_nl; *os << "void operator<<= (CORBA::Any &_tao_any, " << node->name () << " *_tao_elem) // non copying" << be_nl << "{" << be_idt_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl << "TAO_OutputCDR stream;" << be_nl << "stream << *_tao_elem;" << be_nl << "_tao_any._tao_replace (" << be_idt << be_idt_nl @@ -94,83 +76,29 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "stream.begin ()," << be_nl << "1," << be_nl << "_tao_elem," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl - << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_uidt_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}\n" << be_nl; *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl - << "ACE_TRY_NEW_ENV" << be_nl - << "{" << be_idt_nl - << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl - << "if (!type->equivalent (" << node->tc_name () - << ", ACE_TRY_ENV)) // not equal" << be_idt_nl - << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl - << "return 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl - << "if (_tao_any.any_owns_data ())" << be_nl - << "{" << be_idt_nl - << "_tao_elem = (" << node->name () << " *)_tao_any.value ();" - << be_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl // else any does not own the data - << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl - << "TAO_InputCDR stream (" << be_idt << be_idt_nl - << "_tao_any._tao_get_cdr ()," << be_nl - << "_tao_any._tao_byte_order ()" << be_uidt_nl - << ");" << be_uidt_nl - << "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 - << "ACE_reinterpret_cast (void *, _tao_elem)," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl - << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl - << "return 1;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete _tao_elem;" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl - << "}" << be_nl - << "ACE_ENDTRY;" << be_nl - << "return 0;" << be_uidt_nl + << "return _tao_any >>= ACE_const_cast(" << be_idt << be_idt_nl + << "const " << node->name () << "*&," << be_nl + << "_tao_elem" << be_uidt_nl + << ");" << be_uidt << be_uidt_nl << "}\n\n"; *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const " << node->name () << " *&_tao_elem)" << be_nl << "{" << be_idt_nl + << "_tao_elem = 0;" << be_nl << "ACE_TRY_NEW_ENV" << be_nl << "{" << be_idt_nl << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << "if (!type->equivalent (" << node->tc_name () << ", ACE_TRY_ENV)) // not equal" << be_idt_nl << "{" << be_idt_nl - << "_tao_elem = 0;" << be_nl << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << "ACE_TRY_CHECK;" << be_nl @@ -182,39 +110,32 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}" << be_nl << "else" << be_nl // else any does not own the data << "{" << be_idt_nl - << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);" - << be_nl + << node->name () << " *tmp;" << be_nl + << "ACE_NEW_RETURN (tmp, " << node->name () << ", 0);" << be_nl << "TAO_InputCDR stream (" << be_idt << be_idt_nl << "_tao_any._tao_get_cdr ()," << be_nl << "_tao_any._tao_byte_order ()" << be_uidt_nl << ");" << be_uidt_nl - << "if (stream >> *(" << node->name () << " *)_tao_elem)" << be_nl + << "if (stream >> *tmp)" << be_nl << "{" << be_idt_nl - << "((CORBA::Any *)&_tao_any)->_tao_replace (" + << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl << node->tc_name () << "," << be_nl << "1," << be_nl - << "ACE_reinterpret_cast (void *, ACE_const_cast (" - << node->name () << " *&, _tao_elem))," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << "tmp," << be_nl + << node->name () << "::_tao_any_destructor" << be_uidt_nl << ");" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl + << "_tao_elem = tmp;" << be_nl << "return 1;" << be_uidt_nl << "}" << be_nl << "else" << be_nl << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_uidt_nl + << "delete tmp;" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_uidt_nl << "}" << be_nl << "ACE_CATCHANY" << be_nl - << "{" << be_idt_nl - << "delete ACE_const_cast (" << node->name () - << " *&, _tao_elem);" << be_nl - << "_tao_elem = 0;" << be_nl - << "return 0; " << be_uidt_nl + << "{" << be_nl << "}" << be_nl << "ACE_ENDTRY;" << be_nl << "return 0;" << be_uidt_nl |