diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index e8ad42ab833..92feeed2a52 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -108,13 +108,12 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "_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 - << "return 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "ACE_TRY_CHECK;" << be_nl + << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl + << "CORBA::Boolean result = type->equivalent (" << node->tc_name () + << ", ACE_TRY_ENV);" << be_nl + << "ACE_TRY_CHECK;" << be_nl << be_nl + << "if (!result)" << be_idt_nl + << "return 0; // not equivalent" << be_uidt_nl << be_nl << "if (_tao_any.any_owns_data ())" << be_nl << "{" << be_idt_nl << "_tao_elem = ACE_static_cast(" << be_idt << be_idt_nl |