Use default/override

    * TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp:
    * TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
    * TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp:
    * TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
    * TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp:

5 files changed, 7 insertions, 21 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
index 7dd6916b136..19f7bc40b52 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
@@ -72,8 +72,8 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node)
   *os << be_nl
       << "{" << be_nl
       << "public:" << be_idt_nl
-      << rh_skel_class_name.c_str () << " ();" << be_nl
-      << "virtual ~" << rh_skel_class_name.c_str () << " ();";
+      << rh_skel_class_name.c_str () << " () = default;" << be_nl
+      << "virtual ~" << rh_skel_class_name.c_str () << " () = default;";
 
   // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) ==  -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index c95bbdba3a1..40e5dc8b263 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -67,20 +67,6 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << rh_skel_full_scope_name.c_str ()
-      << "::" << rh_skel_class_name.c_str () << " ()" << be_nl
-      << ": TAO_AMH_Response_Handler ()," << be_idt_nl
-      << "::" << node->full_name () << " ()" << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "}" << be_nl_2;
-
-  *os << rh_skel_full_scope_name.c_str ()
-      << "::~" << rh_skel_class_name.c_str ()
-      << " ()" << be_nl;
-  *os << "{" << be_nl;
-  *os << "}";
-
-
   // Generate code for elements in the scope (e.g., operations)
   // We'll rely on the base class (be_visitor_scope) to do the
   // right thing for us.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
index 080f6c6b715..d787bde8e24 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
@@ -57,9 +57,9 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
     }
 
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
-  *os << "virtual void ";
+  *os << "void ";
 
   // Step 2: Generate the method name
   // Check if we are an attribute node in disguise.
@@ -91,7 +91,7 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << ";";
+  *os << " override;";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 9e2e9b98cf9..cb5790d5e41 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -171,7 +171,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
           << "holder->raise_" << operation_name.c_str ()
           << " ();" << be_uidt_nl
           << "}" << be_nl
-          << "catch ( ::CORBA::Exception& ex)"
+          << "catch (const ::CORBA::Exception& ex)"
           << be_nl
           << "{" << be_idt_nl
           << "this->_tao_rh_send_exception (ex);" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index f926fced243..401b33a299b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -124,7 +124,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
     const char *skel_prefix)
 {
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl;
 
   *os << "static void " << skel_prefix
       << this->ctx_->port_prefix ().c_str ()