diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp index f43230e0343..924091b2ace 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp @@ -18,8 +18,8 @@ // // ============================================================================ -ACE_RCSID (be_visitor_valuetype, - ami_exception_holder_cs, +ACE_RCSID (be_visitor_valuetype, + ami_exception_holder_cs, "$Id$") // ************************************************************ @@ -42,10 +42,9 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype ( be_valuetype *node ) { -#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER) TAO_OutStream *os = this->ctx_->stream (); - if (node->is_nested () + if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) { *os << "OBV_"; @@ -54,7 +53,7 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype ( *os << node->compute_name ("_tao_", "") << "::" << node->compute_local_name ("_tao_", "") << " () { }" << be_nl << be_nl; - if (node->is_nested () + if (node->is_nested () && node->defined_in ()->scope_node_type () == AST_Decl::NT_module) { *os << "OBV_"; @@ -69,12 +68,10 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype ( ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_ami_exception_holder_cs::" "visit_valuetype - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } -#else - ACE_UNUSED_ARG (node); -#endif + return 0; } |