Use =default for skeleton copy constructor

DOCGroup · Dec 17, 2024 · 5dcda05 · 5dcda05
1 parent 70c1a78
commit 5dcda05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 40 deletions.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -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
       << "virtual ~" << class_name.c_str () << " () = default;" << be_nl_2;
 
   // _is_a

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -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;
     }
@@ -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)
     {
@@ -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,
-                                           os);
-}
-
 ACE_CString
 be_visitor_interface_ss::generate_flat_name (be_interface *node)
 {

diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -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);