Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use =default for skeleton copy constructor #2309

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Use =default for skeleton copy constructor #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dcda05
Use =default for skeleton copy constructor
mitza-oci Dec 17, 2024
88df791
=default for generated implementation copy ctor
mitza-oci Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions TAO/TAO_IDL/be/be_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,45 +2227,6 @@ be_interface::is_a_helper (be_interface * /*derived*/,
return 0;
}

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<be_scope*> (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,
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () << "&);" <<be_nl <<be_nl;
<< be_global->impl_class_suffix () << "&) = default;" <<be_nl <<be_nl;
}

if (be_global->gen_assign_op ())
Expand Down
46 changes: 0 additions & 46 deletions TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,52 +62,6 @@ be_visitor_interface_is::visit_interface (be_interface *node)
*os << "{" <<be_nl;
*os << "}" << be_nl_2;

if (be_global->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<be_scope*> (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;
Expand Down
2 changes: 1 addition & 1 deletion TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)

// Copy constructor and destructor.
*os << class_name.c_str () << " (const "
<< class_name.c_str () << "& rhs);" << be_nl
<< class_name.c_str () << "& rhs) = default;" << be_nl
mitza-oci marked this conversation as resolved.
Show resolved Hide resolved
<< "virtual ~" << class_name.c_str () << " () = default;" << be_nl_2;

// _is_a
Expand Down
38 changes: 1 addition & 37 deletions TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
<< local_name_prefix << node_local_name
<< " ()";

bool const init_bases = node->nmembers () == 0;
if (init_bases)
if (node->nmembers () == 0)
{
*os << be_idt_nl << ": TAO_ServantBase ()" << be_uidt_nl;
}
Expand All @@ -125,33 +124,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
<< "_optable);" << be_uidt_nl
<< "}" << be_nl_2;

// find if we are at the top scope or inside some module
*os << full_skel_name << "::"
<< local_name_prefix << node_local_name << " ("
<< "const " << local_name_prefix
<< node_local_name << " &"
<< (init_bases ? "rhs" : "") << ")";

if (init_bases)
{
*os << be_idt_nl
<< ": TAO_Abstract_ServantBase (rhs)," << be_nl
<< " TAO_ServantBase (rhs)";
}

if (this->generate_copy_ctor (node, os) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("be_visitor_interface_ss::")
ACE_TEXT ("visit_interface - ")
ACE_TEXT (" copy ctor generation failed\n")),
-1);
}

*os << be_uidt_nl
<< "{" << be_nl
<< "}" << be_nl_2;

// Generate code for elements in the scope (e.g., operations).
if (this->visit_scope (node) == -1)
{
Expand Down Expand Up @@ -456,14 +428,6 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node)
return 0;
}

int
be_visitor_interface_ss::generate_copy_ctor (be_interface *node,
TAO_OutStream *os)
{
return node->traverse_inheritance_graph (be_interface::copy_ctor_helper,
mitza-oci marked this conversation as resolved.
Show resolved Hide resolved
os);
}

ACE_CString
be_visitor_interface_ss::generate_flat_name (be_interface *node)
{
Expand Down
6 changes: 0 additions & 6 deletions TAO/TAO_IDL/be_include/be_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,6 @@ class be_interface : public virtual AST_Interface,
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 *,
Expand Down
3 changes: 1 addition & 2 deletions TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ class be_visitor_interface_ss : public be_visitor_interface

virtual int generate_amh_classes (be_interface *node);
virtual int generate_proxy_classes (be_interface *node);
virtual int generate_copy_ctor (be_interface *node,
TAO_OutStream *os);

virtual ACE_CString generate_flat_name (be_interface *node);
virtual ACE_CString generate_local_name (be_interface *node);
virtual ACE_CString generate_full_skel_name (be_interface *node);
Expand Down
Loading