Merge pull request #328 from jwillemsen/master

Removed not necessary c-style cast and reduce size of generated code

12 files changed, 150 insertions, 150 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 0fa3168285d..73d1eba7c3c 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -134,7 +134,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           // Copying insertion operator.
 
           *os << be_nl_2
-              << "// Copying insertion." << be_nl
+              << "/// Copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
               << "const ::" << node->name () << " &_tao_elem)" << be_uidt
@@ -150,7 +150,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "}" << be_nl_2;
 
           // Non-copying insertion operator."
-          *os << "// Non-copying insertion." << be_nl
+          *os << "/// Non-copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " *_tao_elem)" << be_uidt
@@ -166,20 +166,20 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
               << "}" << be_nl_2;
 
           // Extraction to non-const pointer operator.
-          *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+          *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " *&_tao_elem)" << be_uidt
               << be_uidt_nl
               << "{" << be_idt_nl
               << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-              << "const ::" << node->name () << " *&> (" << be_nl
-              << "_tao_elem);" << be_uidt
+              << "const ::" << node->name () << " *&> (_tao_elem);"
+              << be_uidt
               << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer operator.
-          *os << "// Extraction to const pointer." << be_nl
+          *os << "/// Extraction to const pointer." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
@@ -209,7 +209,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
   // Copying insertion operator.
 
   *os << be_nl_2
-      << "// Copying insertion." << be_nl
+      << "/// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " &_tao_elem)" << be_uidt
@@ -220,12 +220,12 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion operator."
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *_tao_elem)" << be_uidt
@@ -236,29 +236,29 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to non-const pointer operator.
-  *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+  *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *&_tao_elem)" << be_uidt
       << be_uidt_nl
       << "{" << be_idt_nl
       << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-      << "const " << node->name () << " *&> (" << be_nl
-      << "_tao_elem);" << be_uidt
+      << "const " << node->name () << " *&> (_tao_elem);"
+      << be_uidt
       << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer operator.
-  *os << "// Extraction to const pointer." << be_nl
+  *os << "/// Extraction to const pointer." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << " *&_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index cef74921c27..7c18447874c 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -55,8 +55,8 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
   *os << be_nl_2
       << "::CORBA::Boolean operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->name () << " &_tao_aggregate" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << " &_tao_aggregate)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
 
   // Do we have any members?
@@ -115,14 +115,14 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
   if (node->nmembers () > 0)
     {
       *os << "strm," << be_nl
-          << node->name () << " &_tao_aggregate" << be_uidt_nl
-          << ")" << be_uidt_nl;
+          << node->name () << " &_tao_aggregate)" << be_uidt
+          << be_uidt_nl;
     }
   else
     {
       *os << "," << be_nl
-          << node->name () << "&" << be_uidt_nl
-          << ")" << be_uidt_nl;
+          << node->name () << "&)" << be_uidt
+          << be_uidt_nl;
     }
 
   *os  << "{" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 4642d5503b1..884bae78ca8 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -70,8 +70,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           << ": ::CORBA::UserException ("
           << be_idt << be_idt << be_idt_nl
           << "\"" << node->repoID () << "\"," << be_nl
-          << "\"" << node->local_name () << "\"" << be_uidt_nl
-          << ")" << be_uidt << be_uidt << be_uidt_nl;
+          << "\"" << node->local_name () << "\")" << be_uidt
+          << be_uidt << be_uidt << be_uidt_nl;
       *os << "{" << be_idt;
 
       // Assign each individual member. We need yet another state.
@@ -102,8 +102,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << " (void)" << be_idt_nl;
   *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl
       << "\"" << node->repoID () << "\"," << be_nl
-      << "\"" << node->local_name () << "\"" << be_uidt_nl
-      << ")" << be_uidt << be_uidt << be_uidt_nl;
+      << "\"" << node->local_name () << "\")" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl;
   *os << "{" << be_nl;
   *os << "}" << be_nl_2;
 
@@ -118,8 +118,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << node->name () << " &_tao_excp)" << be_idt_nl;
   *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl
       << "_tao_excp._rep_id ()," << be_nl
-      << "_tao_excp._name ()" << be_uidt_nl
-      << ")" << be_uidt << be_uidt << be_uidt_nl;
+      << "_tao_excp._name ())" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl;
   *os << "{";
 
   ctx = *this->ctx_;
@@ -216,8 +216,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
       << "result," << be_nl
       << "::" << node->name () << " (*this)," << be_nl
-      << "0" << be_uidt_nl
-      << ");" << be_uidt_nl
+      << "0);" << be_uidt
+      << be_uidt_nl
       << "return result;" << be_uidt_nl
       << "}" << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 04e77789bf5..e37489f190e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -191,7 +191,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     {
       *os << " ||" << be_uidt_nl
           << "!ACE_OS::strcmp (" << be_idt << be_idt_nl
-          << "(char *)value," << be_nl
+          << "value," << be_nl
           << "\"IDL:omg.org/CORBA/AbstractBase:1.0\""
           << be_uidt_nl
           << ")";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 80734a4a59e..f69bf8dae01 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -196,7 +196,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       *os << be_uidt_nl << "};" << be_nl_2;
 
       *os << "::CORBA::ULong const exceptions_count = "
-          << excep_count << ";\n" << be_nl;
+          << excep_count << ";" << be_nl;
 
       exception_data_arg = "exceptions_data";
       exception_count_arg = "exceptions_count";
@@ -207,8 +207,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
       << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
       << "reinterpret_cast <unsigned char*> (cdr->rd_ptr ())," << be_nl
-      << "0" << be_uidt_nl
-      << ");" << be_uidt_nl;
+      << "0);" << be_uidt
+      << be_uidt_nl;
 
  *os  << "::Messaging::ExceptionHolder* exception_holder_ptr = 0;" << be_nl
       << "ACE_NEW (" << be_idt << be_idt_nl
@@ -220,17 +220,17 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << exception_data_arg << "," << be_nl
       << exception_count_arg  << "," << be_nl
       << "_tao_in.char_translator ()," << be_nl
-      << "_tao_in.wchar_translator ()" << ")" << be_uidt_nl
-      << ");" << be_uidt_nl << be_uidt_nl;
+      << "_tao_in.wchar_translator ()" << "));" << be_uidt
+      << be_uidt_nl << be_uidt_nl;
 
   *os << "::Messaging::ExceptionHolder_var exception_holder_var = "
       << "exception_holder_ptr;" << be_nl;
 
   *os << "_tao_reply_handler_object->"
       << node->local_name () << "_excep (" << be_idt << be_idt_nl
-      << "exception_holder_var";
+      << "exception_holder_var);";
 
-  *os << be_uidt_nl << ");" << be_uidt_nl;
+  *os << be_uidt << be_uidt_nl;
 
   *os << "break;" << be_uidt_nl
       << "}" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index fb60b2eb2e4..33e783d94b4 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -214,7 +214,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
           // Copying insertion.
           *os << be_nl
-              << "// Copying insertion." << be_nl
+              << "/// Copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
               << "const ::" << node->name () << " &_tao_elem" << be_uidt_nl
@@ -226,12 +226,12 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Non-copying insertion.
-          *os << "// Non-copying insertion." << be_nl
+          *os << "/// Non-copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " *_tao_elem)" << be_uidt
@@ -242,25 +242,25 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to non-const pointer (deprecated, just calls the other).
-          *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+          *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " *&_tao_elem)" << be_uidt
               << be_uidt_nl
               << "{" << be_idt_nl
               << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-              << "const ::" << node->name () << " *&> (" << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "const ::" << node->name () << " *&> (_tao_elem);"
+              << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer.
-          *os << "// Extraction to const pointer." << be_nl
+          *os << "/// Extraction to const pointer." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
@@ -272,8 +272,8 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
               << "_tao_any," << be_nl
               << "::"  <<  node->name () << "::_tao_any_destructor," << be_nl
               << "::" << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -288,7 +288,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
 
   // Copying insertion.
   *os << be_nl
-      << "// Copying insertion." << be_nl
+      << "/// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " &_tao_elem)" << be_uidt
@@ -300,12 +300,12 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion.
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *_tao_elem)" << be_uidt
@@ -316,25 +316,25 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << (td != 0 ? td->tc_name () : node->tc_name ()) << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to non-const pointer (deprecated, just calls the other).
-  *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+  *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *&_tao_elem)" << be_uidt
       << be_uidt_nl
       << "{" << be_idt_nl
       << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-      << "const " << node->name () << " *&> (" << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "const " << node->name () << " *&> (_tao_elem);"
+      << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer.
-  *os << "// Extraction to const pointer." << be_nl
+  *os << "/// Extraction to const pointer." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
       << "const " << node->name () << " *&_tao_elem)" << be_uidt
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 33402290f7a..a5b11b21d8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -146,8 +146,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << be_uidt_nl
               << "{" << be_idt_nl
               << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-              << "const ::" << node->name () << " *&> (" << be_nl
-              << "_tao_elem);" << be_uidt
+              << "const ::" << node->name () << " *&> (_tao_elem);"
+              << be_uidt
               << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
@@ -164,8 +164,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -219,8 +219,8 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << be_uidt_nl
       << "{" << be_idt_nl
       << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-      << "const " << node->name () << " *&> (" << be_nl
-      << "_tao_elem);" << be_uidt
+      << "const " << node->name () << " *&> (_tao_elem);"
+      << be_uidt
       << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 73ff0b66ce8..29cd5a11f1f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -102,11 +102,11 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
           be_util::gen_nested_namespace_begin (os, module);
 
           // Copying insertion.
-          *os << "// Copying insertion." << be_nl
+          *os << "/// Copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem" << be_uidt_nl
-              << ")" << be_uidt_nl
+              << "const ::" << node->name () << " &_tao_elem)" << be_uidt
+              << be_uidt_nl
               << "{" << be_idt_nl
 
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
@@ -119,40 +119,40 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "}" << be_nl_2;
 
           // Non-copying insertion.
-          *os << "// Non-copying insertion." << be_nl
+          *os << "/// Non-copying insertion." << be_nl
               << "void operator<<= (" << be_idt << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem" << be_uidt_nl
-              << ")" << be_uidt_nl
+              << "::" << node->name () << " *_tao_elem)" << be_uidt
+              << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
               << be_idt << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to non-const pointer (deprecated, just calls the other).
-          *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+          *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
               << "::" << node->name () << " *&_tao_elem" << be_uidt_nl
               << ")" << be_uidt_nl
               << "{" << be_idt_nl
               << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-              << "const ::" << node->name () << " *&> (" << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt_nl
+              << "const ::" << node->name () << " *&> (_tao_elem);"
+              << be_uidt
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer.
-          *os << "// Extraction to const pointer." << be_nl
+          *os << "/// Extraction to const pointer." << be_nl
               << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem" << be_uidt_nl
-              << ")" << be_uidt_nl
+              << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
+              << be_uidt_nl
               << "{" << be_idt_nl
               << "return" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
@@ -160,8 +160,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem" << be_uidt_nl
-              << ");" << be_uidt << be_uidt << be_uidt_nl
+              << "_tao_elem);" << be_uidt
+              << be_uidt << be_uidt << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -175,11 +175,11 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
   *os << be_global->core_versioning_begin () << be_nl;
 
   // Copying insertion.
-  *os << "// Copying insertion." << be_nl
+  *os << "/// Copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << " &_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
 
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
@@ -187,45 +187,45 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion.
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->name () << " *_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to non-const pointer (deprecated, just calls the other).
-  *os << "// Extraction to non-const pointer (deprecated)." << be_nl
+  *os << "/// Extraction to non-const pointer (deprecated)." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
       << node->name () << " *&_tao_elem" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return _tao_any >>= const_cast<" << be_idt << be_idt_nl
-      << "const " << node->name () << " *&> (" << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "const " << node->name () << " *&> (_tao_elem);"
+      << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer.
-  *os << "// Extraction to const pointer." << be_nl
+  *os << "/// Extraction to const pointer." << be_nl
       << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "const " << node->name () << " *&_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
@@ -233,8 +233,8 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << "_tao_elem);" << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index 14a336be46c..63cacd50699 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -56,8 +56,8 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       << "::CORBA::Boolean" << be_nl
       << "Any_Impl_T<" << node->name () << ">::to_value ("
       << be_idt <<  be_idt_nl
-      << "::CORBA::ValueBase *&_tao_elem" << be_uidt_nl
-      << ") const" << be_uidt_nl
+      << "::CORBA::ValueBase *&_tao_elem) const" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::add_ref (this->value_);" << be_nl
       << "_tao_elem = this->value_;" << be_nl
@@ -90,7 +90,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << "// Copying insertion." << be_nl
+      *os << "/// Copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
@@ -100,7 +100,7 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
           << "}" << be_nl_2;
 
-      *os << "// Non-copying insertion." << be_nl
+      *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
@@ -139,31 +139,31 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << be_global->core_versioning_begin () << be_nl;
 
-  *os << "// Copying insertion." << be_nl
+  *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " *_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
       << "_tao_any <<= &_tao_elem;" << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " **_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " **_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "*_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "*_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
index 9a5f2aad3a8..96b6b5bbae1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -49,25 +49,25 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
       << "operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->full_name ()
-      << " *_tao_valuebox" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << " *_tao_valuebox)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
   *os << "return" << be_idt_nl
       << "::CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl
       << "strm," << be_nl
       << "_tao_valuebox," << be_nl
       << "reinterpret_cast<ptrdiff_t> (&"
-      << node->full_name () << "::_downcast)"
-      << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << node->full_name () << "::_downcast));"
+      << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
       << node->full_name ()
-      << " *&_tao_valuebox" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << " *&_tao_valuebox)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
   *os << "return " << node->full_name ()
       << "::_tao_unmarshal (strm, _tao_valuebox);"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index 23c7c332885..d1b6dd6e6e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -55,8 +55,8 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "::CORBA::Boolean" << be_nl
       << "Any_Impl_T<" << node->name () << ">::to_value ("
       << be_idt <<  be_idt_nl
-      << "::CORBA::ValueBase *&_tao_elem" << be_uidt_nl
-      << ") const" << be_uidt_nl
+      << "::CORBA::ValueBase *&_tao_elem) const" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::add_ref (this->value_);" << be_nl
       << "_tao_elem = this->value_;" << be_nl
@@ -89,12 +89,12 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << "// Copying insertion." << be_nl
+      *os << "/// Copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " *_tao_elem)" << be_uidt
+          << be_uidt_nl
           << "{" << be_idt_nl
           << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl
           << node->local_name () << " *_tao_copy =" << be_idt_nl
@@ -108,20 +108,20 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
           << "#endif" << be_uidt_nl
           << "}" << be_nl_2;
 
-      *os << "// Non-copying insertion." << be_nl
+      *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
           << "operator<<= (" << be_idt << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << node->local_name () << " **_tao_elem)" << be_uidt
+          << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
           << be_idt << be_idt_nl
           << "_tao_any," << be_nl
           << node->local_name () << "::_tao_any_destructor," << be_nl
           << node->tc_name ()->last_component () << "," << be_nl
-          << "*_tao_elem" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
+          << "*_tao_elem);" << be_uidt
+          << be_uidt << be_uidt_nl
           << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
@@ -149,12 +149,12 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << be_global->core_versioning_begin () << be_nl;
 
-  *os << "// Copying insertion." << be_nl
+  *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " *_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl
       << node->full_name () << " *_tao_copy =" << be_idt_nl
@@ -168,20 +168,20 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "#endif" << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << "// Non-copying insertion." << be_nl
+  *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
       << "operator<<= (" << be_idt << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " **_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << node->full_name () << " **_tao_elem)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
-      << "*_tao_elem" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "*_tao_elem);" << be_uidt
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index 125a20dd86b..4c2213e6315 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -68,25 +68,25 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
       << "operator<< (" << be_idt << be_idt_nl
       << "TAO_OutputCDR &strm," << be_nl
       << "const " << node->full_name ()
-      << " *_tao_valuetype" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << " *_tao_valuetype)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
   *os << "return" << be_idt_nl
       << "::CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl
       << "strm," << be_nl
       << "_tao_valuetype," << be_nl
       << "reinterpret_cast<ptrdiff_t> (&"
-      << node->full_name () << "::_downcast)"
-      << be_uidt_nl
-      << ");" << be_uidt << be_uidt << be_uidt_nl
+      << node->full_name () << "::_downcast));"
+      << be_uidt
+      << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
       << "operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &strm," << be_nl
       << node->full_name ()
-      << " *&_tao_valuetype" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << " *&_tao_valuetype)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl;
   *os << "return " << node->full_name ()
       << "::_tao_unmarshal (strm, _tao_valuetype);"