diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index cc46761452b..f35f7eab081 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -68,7 +68,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::duplicate (" + << "TAO::Objref_Traits<" << node->name () << ">::tao_duplicate (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -79,7 +79,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "void" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::release (" + << "TAO::Objref_Traits<" << node->name () << ">::tao_release (" << be_idt << be_idt_nl << node->name () << "_ptr p" << be_uidt_nl << ")" << be_uidt_nl @@ -90,7 +90,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" + << "TAO::Objref_Traits<" << node->name () << ">::tao_nil (void)" << be_nl << "{" << be_idt_nl << "return " << node->name () << "::_nil ();" << be_uidt_nl @@ -99,7 +99,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << be_nl << be_nl << "ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION " << be_nl << "CORBA::Boolean" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::marshal (" + << "TAO::Objref_Traits<" << node->name () << ">::tao_marshal (" << be_idt << be_idt_nl << node->name () << "_ptr p," << be_nl << "TAO_OutputCDR & cdr" << be_uidt_nl @@ -109,29 +109,6 @@ be_visitor_component_cs::visit_component (be_component *node) << "}"; } - if (node->has_mixed_parentage ()) - { - *os << be_nl << be_nl - << "void" << be_nl - << "CORBA::release (" - << node->name () - << "_ptr p)" << be_nl - << "{" << be_idt_nl - << "CORBA::AbstractBase_ptr abs = p;" << be_nl - << "CORBA::release (abs);" << be_uidt_nl - << "}"; - - *os << be_nl << be_nl - << "CORBA::Boolean" << be_nl - << "CORBA::is_nil (" - << node->name () - << "_ptr p)" << be_nl - << "{" << be_idt_nl - << "CORBA::Object_ptr obj = p;" << be_nl - << "return CORBA::is_nil (obj);" << be_uidt_nl - << "}"; - } - // Generate the proxy broker factory function pointer definition. *os << be_nl << be_nl << "// Function pointer for collocation factory initialization." @@ -195,16 +172,6 @@ be_visitor_component_cs::visit_component (be_component *node) << "}" << be_nl << be_nl; } - if (node->has_mixed_parentage ()) - { - *os << "void" << be_nl - << node->name () << "::_add_ref (void)" << be_nl - << "{" << be_idt_nl - << "this->ACE_NESTED_CLASS (CORBA, Object)::_add_ref ();" - << be_uidt_nl - << "}" << be_nl << be_nl; - } - // The _narrow method. *os << node->full_name () << "_ptr" << be_nl << node->full_name () << "::_narrow (" << be_idt << be_idt_nl |