From 88df7918d3410b8fe7da44bdc99ae3e80935df66 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Tue, 17 Dec 2024 11:08:07 -0600 Subject: [PATCH] =default for generated implementation copy ctor --- TAO/TAO_IDL/be/be_interface.cpp | 39 ------------------ .../be/be_visitor_interface/interface_ih.cpp | 2 +- .../be/be_visitor_interface/interface_is.cpp | 46 ---------------------- TAO/TAO_IDL/be_include/be_interface.h | 6 --- 4 files changed, 1 insertion(+), 92 deletions(-) diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 6f16d765772..f7300996157 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2228,45 +2228,6 @@ be_interface::is_a_helper (be_interface * /*derived*/, } int -be_interface::copy_ctor_helper (be_interface *derived, - be_interface *base, - TAO_OutStream *os) -{ - // We can't call ourselves in a copy constructor, and - // abstract interfaces don't exist on the skeleton side. - if (derived == base || base->is_abstract () || derived->nmembers () > 0) - { - return 0; - } - - *os << "," << be_idt_nl; - - bool is_rh_base = - (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0); - - if (is_rh_base) - { - *os << "::POA_Messaging::ReplyHandler (rhs)"; - } - else if (base->is_nested ()) - { - be_decl *scope = nullptr; - scope = dynamic_cast (base->defined_in ())->decl (); - - *os << "POA_" << scope->name () << "::" - << base->local_name () << " (rhs)"; - } - else - { - *os << base->full_skel_name () << " (rhs)"; - } - - *os << be_uidt; - - return 0; -} - -int be_interface::in_mult_inheritance_helper (be_interface *derived, be_interface *base, TAO_OutStream *) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 0ea927be15e..4a3f5f4bc7f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -81,7 +81,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) << be_global->impl_class_prefix () << namebuf << be_global->impl_class_suffix () << " (const " << be_global->impl_class_prefix () << namebuf - << be_global->impl_class_suffix () << "&);" <impl_class_suffix () << "&) = default;" <gen_assign_op ()) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp index d786778da98..4d69dc9c88f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp @@ -62,52 +62,6 @@ be_visitor_interface_is::visit_interface (be_interface *node) *os << "{" <gen_copy_ctor () && !node->is_local ()) - { - *os << "//Implementation Skeleton Copy Constructor" << be_nl; - - *os << be_global->impl_class_prefix () << node->flat_name () - << be_global->impl_class_suffix () <<"::" - << be_global->impl_class_prefix () << node->flat_name () - << be_global->impl_class_suffix () << " (const " - << be_global->impl_class_prefix () << node->flat_name () - << be_global->impl_class_suffix () << "& rhs)" << be_idt_nl - << ": TAO_Abstract_ServantBase (rhs)," << be_nl - << " TAO_ServantBase (rhs)"; - - if (node->traverse_inheritance_graph (be_interface::copy_ctor_helper, - os) - == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_is::visit_interface - " - " copy ctor generation failed\n"), - -1); - } - - if (!node->is_local ()) - { - *os << "," << be_nl; - - if (node->is_nested ()) - { - be_decl *scope = nullptr; - scope = dynamic_cast (node->defined_in ())->decl (); - - *os << " POA_" << scope->name () << "::" - << node->local_name () << " (rhs)"; - } - else - { - *os << " " << node->full_skel_name () << " (rhs)"; - } - } - - *os << be_uidt_nl - << "{" << be_nl - << "}" << be_nl << be_uidt_nl; - } - if (be_global->gen_assign_op ()) { *os << "//Implementation Skeleton Copy Assignment" << be_nl; diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 55b5bb39736..e86f53c5b53 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -177,12 +177,6 @@ public: be_interface *, TAO_OutStream *os); - /// Helper method passed to the template method to invoke ctors of all the - /// base classes. - static int copy_ctor_helper (be_interface *, - be_interface *, - TAO_OutStream *os); - /// Helper method to determine if the interface node is involved in some kind /// of multiple inheritance or not. Required on the skeleton side. static int in_mult_inheritance_helper (be_interface *, -- 2.11.4.GIT