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 | 21 |
1 files changed, 6 insertions, 15 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 f432f30d54a..9dbed0d7913 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 @@ -49,8 +49,6 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; - *os << be_global->core_versioning_begin () << be_nl; - if (!node->is_local ()) { *os << be_nl << be_nl @@ -68,21 +66,16 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "{" << be_idt_nl << "return false;" << be_uidt_nl << "}" << be_uidt_nl << be_nl - << (be_global->use_raw_throw () ? "try" :"ACE_TRY_NEW_ENV") - << be_idt_nl + << "ACE_TRY_NEW_ENV" << be_idt_nl << "{" << be_idt_nl - << "this->value_->_tao_decode (cdr" - << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER") - << ");" << ace_try_check << be_uidt_nl + << "this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);" << be_nl + << "ACE_TRY_CHECK;" << be_uidt_nl << "}" << be_uidt_nl - << (be_global->use_raw_throw () - ? "catch ( ::CORBA::Exception &)" - : "ACE_CATCHANY") - << be_idt_nl + << "ACE_CATCHANY" << be_idt_nl << "{" << be_idt_nl << "return false;" << be_uidt_nl - << "}" << be_uidt - << ace_endtry << be_nl << be_nl + << "}" << be_uidt_nl + << "ACE_ENDTRY;" << be_nl << be_nl << "return true;" << be_uidt_nl << "}" << be_uidt_nl << "}"; @@ -181,8 +174,6 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - *os << be_global->core_versioning_end () << be_nl; - // all we have to do is to visit the scope and generate code if (this->visit_scope (node) == -1) { |