diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index f466e56c0d2..0a0abe97cda 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -120,30 +120,15 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << be_uidt << be_uidt_nl << ");" << be_uidt << "\n"; - if (this->ctx_->state () == TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_TIE_SH) + if (node->traverse_inheritance_graph (be_visitor_interface_tie_sh::method_helper, os) == -1) { - if (node->traverse_inheritance_graph (be_visitor_interface_tie_sh::ami_handler_method_helper, os) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh_ss::" - "visit_interface - " - "traversal of inhertance graph failed\n"), - -1); - } - } - else - { - if (node->traverse_inheritance_graph (be_visitor_interface_tie_sh::method_helper, os) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh_ss::" - "visit_interface - " - "traversal of inhertance graph failed\n"), - -1); - } + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_interface_tie_sh_ss::" + "visit_interface - " + "traversal of inhertance graph failed\n"), + -1); } - *os << be_uidt << "private:" << be_idt_nl << "T *ptr_;" << be_nl << "PortableServer::POA_var poa_;" << be_nl @@ -168,28 +153,6 @@ be_visitor_interface_tie_sh::method_helper (be_interface *, { be_visitor_context ctx; ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH); - - ctx.stream (os); - be_visitor* visitor = tao_cg->make_visitor (&ctx); - if (visitor == 0 || visitor->visit_scope (node) == -1) - { - delete visitor; - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_tie_sh::" - "method_helper\n"), -1); - } - delete visitor; - return 0; -} - -int -be_visitor_interface_tie_sh::ami_handler_method_helper (be_interface *, - be_interface *node, - TAO_OutStream *os) -{ - be_visitor_context ctx; - ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_TIE_SH); - ctx.stream (os); be_visitor* visitor = tao_cg->make_visitor (&ctx); if (visitor == 0 || visitor->visit_scope (node) == -1) |