Less indent and newlines in Any related code

    * TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:

8 files changed, 136 insertions, 152 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 f6349ef0183..3f6ef5dea96 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
@@ -135,51 +135,50 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
           *os << be_nl_2
               << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " &_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Non-copying insertion operator."
           *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)" << be_uidt
+              << "::" << node->name () << " *_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer operator.
           *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+              << "::CORBA::Boolean operator>>= (" << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " *&_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt << be_idt_nl
+              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -197,51 +196,50 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
 
   *os << be_nl_2
       << "/// Copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem)" << be_uidt
+      << "const " << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion operator."
   *os << "/// Non-copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem)" << be_uidt
+      << node->name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer operator.
   *os << "/// Extraction to const pointer." << be_nl
-      << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+      << "::CORBA::Boolean operator>>= (" << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem)" << be_uidt
+      << "const " << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
-      << be_idt << be_idt_nl
+      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}";
 
   *os << be_global->core_versioning_end () << be_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 884bae78ca8..c0e0427d1ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -213,11 +213,9 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << node->name () << "::_tao_duplicate (void) const" << be_nl
       << "{" << be_idt_nl
       << "::CORBA::Exception *result = 0;" << be_nl
-      << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-      << "result," << be_nl
-      << "::" << node->name () << " (*this)," << be_nl
-      << "0);" << be_uidt
-      << be_uidt_nl
+      << "ACE_NEW_RETURN (result, "
+      << "::" << node->name () << " (*this), 0);"
+      << be_nl
       << "return result;" << be_uidt_nl
       << "}" << be_nl_2;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index a18f15af4e3..6cb026e9f28 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -145,9 +145,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           *os << be_nl_2
               << "/// Copying insertion." << be_nl
               << "void" << be_nl
-              << "operator<<= (" << be_idt << be_idt_nl
+              << "operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << node->local_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
+              << node->local_name () << "_ptr _tao_elem)" << be_uidt_nl
               << "{" << be_idt_nl
               << node->local_name () << "_ptr _tao_objptr =" << be_idt_nl
               << node->local_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
@@ -156,17 +156,17 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
           *os << "/// Non-copying insertion." << be_nl
               << "void" << be_nl
-              << "operator<<= (" << be_idt << be_idt_nl
+              << "operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << node->local_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
+              << node->local_name () << "_ptr *_tao_elem)" << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-              << be_idt << be_idt_nl
+              << 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
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           *os << "::CORBA::Boolean" << be_nl
@@ -197,9 +197,9 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
   *os << be_nl_2
       << "/// Copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr _tao_elem)" << be_uidt << be_uidt_nl
+      << node->full_name () << "_ptr _tao_elem)" << be_uidt_nl
       << "{" << be_idt_nl
       << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
       << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
@@ -208,17 +208,17 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
   *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << "_ptr *_tao_elem)" << be_uidt << be_uidt_nl
+      << node->full_name () << "_ptr *_tao_elem)" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "*_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << 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 f716abff8aa..ff3efd24709 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
@@ -215,52 +215,50 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
           // Copying insertion.
           *os << be_nl
               << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " &_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_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
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Non-copying insertion.
           *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)" << be_uidt
+              << "::" << node->name () << " *_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_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
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+              << "::CORBA::Boolean operator>>= (" << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " *&_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt << be_idt_nl
+              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
+              << be_idt_nl
               << "_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
-              << be_uidt << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -276,52 +274,50 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
   // Copying insertion.
   *os << be_nl
       << "/// Copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem)" << be_uidt
+      << "const " << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_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
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion.
   *os << "/// Non-copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem)" << be_uidt
+      << node->name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_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
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer.
   *os << "/// Extraction to const pointer." << be_nl
-      << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+      << "::CORBA::Boolean operator>>= (" << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem)" << be_uidt
+      << "const " << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
-      << be_idt << be_idt_nl
+      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << be_idt_nl
       << "_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
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
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 b38017bb788..b938d981a43 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
@@ -107,52 +107,50 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
 
           // Copying insertion.
           *os << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " &_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
-              << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt << be_uidt_nl
+              << "_tao_elem);"
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Non-copying insertion.
           *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
+              << "void operator<<= (" << be_idt_nl
+              << "::CORBA::Any &_tao_any," << be_nl
+              << "::" << node->name () << " *_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+              << "::CORBA::Boolean operator>>= (" << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " *&_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt << be_idt_nl
+              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -172,14 +170,13 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "const " << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
       << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);"
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion.
@@ -205,14 +202,13 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "const " << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
       << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);"
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt << be_uidt_nl
       << "}";
 
   *os << be_global->core_versioning_end () << be_nl;
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 439433b180e..ed636e42cac 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
@@ -103,52 +103,50 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
           // Copying insertion.
           *os << "/// Copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " &_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " &_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert_copy ("
-              << be_idt << be_idt_nl
+              << 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 << be_uidt_nl
+              << "_tao_elem);"
+              << be_uidt << be_uidt_nl
               << "}" << be_nl_2;
 
           // Non-copying insertion.
           *os << "/// Non-copying insertion." << be_nl
-              << "void operator<<= (" << be_idt << be_idt_nl
+              << "void operator<<= (" << be_idt_nl
               << "::CORBA::Any &_tao_any," << be_nl
-              << "::" << node->name () << " *_tao_elem)" << be_uidt
+              << "::" << node->name () << " *_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
               << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::insert ("
-              << be_idt << be_idt_nl
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}" << be_nl_2;
 
           // Extraction to const pointer.
           *os << "/// Extraction to const pointer." << be_nl
-              << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+              << "::CORBA::Boolean operator>>= (" << be_idt_nl
               << "const ::CORBA::Any &_tao_any," << be_nl
-              << "const ::" << node->name () << " *&_tao_elem)" << be_uidt
+              << "const ::" << node->name () << " *&_tao_elem)"
               << be_uidt_nl
               << "{" << be_idt_nl
-              << "return" << be_idt_nl
-              << "TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
-              << be_idt << be_idt_nl
+              << "return TAO::Any_Dual_Impl_T< ::" << node->name () << ">::extract ("
+              << be_idt_nl
               << "_tao_any," << be_nl
               << "::" << node->name () << "::_tao_any_destructor," << be_nl
               << "::" << node->tc_name () << "," << be_nl
               << "_tao_elem);" << be_uidt
-              << be_uidt << be_uidt << be_uidt_nl
+              << be_uidt_nl
               << "}";
 
           be_util::gen_nested_namespace_end (os, module);
@@ -163,52 +161,50 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   // Copying insertion.
   *os << "/// Copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem)" << be_uidt
+      << "const " << node->name () << " &_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Non-copying insertion.
   *os << "/// Non-copying insertion." << be_nl
-      << "void operator<<= (" << be_idt << be_idt_nl
+      << "void operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem)" << be_uidt
+      << node->name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   // Extraction to const pointer.
   *os << "/// Extraction to const pointer." << be_nl
-      << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
+      << "::CORBA::Boolean operator>>= (" << be_idt_nl
       << "const ::CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " *&_tao_elem)" << be_uidt
+      << "const " << node->name () << " *&_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << "return" << be_idt_nl
-      << "TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
-      << be_idt << be_idt_nl
+      << "return TAO::Any_Dual_Impl_T<" << node->name () << ">::extract ("
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem);" << be_uidt
-      << be_uidt << be_uidt << be_uidt_nl
+      << 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 63cacd50699..ce748c930f4 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
@@ -92,9 +92,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
       // emit  nested variation of any operators
       *os << "/// Copying insertion." << be_nl
           << "void" << be_nl
-          << "operator<<= (" << be_idt << be_idt_nl
+          << "operator<<= (" << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem)" << be_uidt << be_uidt_nl
+          << node->local_name () << " *_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "::CORBA::add_ref (_tao_elem);" << be_nl
           << "_tao_any <<= &_tao_elem;" << be_uidt_nl
@@ -102,16 +102,16 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
       *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
-          << "operator<<= (" << be_idt << be_idt_nl
+          << "operator<<= (" << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem)" << be_uidt << be_uidt_nl
+          << node->local_name () << " **_tao_elem)" << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-          << be_idt << be_idt_nl
+          << 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 << be_uidt << be_uidt_nl
+          << "*_tao_elem);" << be_uidt << be_uidt_nl
           << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
@@ -141,9 +141,9 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *_tao_elem)" << be_uidt
+      << node->full_name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "::CORBA::add_ref (_tao_elem);" << be_nl
@@ -152,18 +152,18 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node)
 
   *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " **_tao_elem)" << be_uidt
+      << node->full_name () << " **_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "*_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl
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 d1b6dd6e6e8..dfb80cfc402 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
@@ -91,9 +91,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       // emit  nested variation of any operators
       *os << "/// Copying insertion." << be_nl
           << "void" << be_nl
-          << "operator<<= (" << be_idt << be_idt_nl
+          << "operator<<= (" << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " *_tao_elem)" << be_uidt
+          << node->local_name () << " *_tao_elem)"
           << be_uidt_nl
           << "{" << be_idt_nl
           << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl
@@ -110,18 +110,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
       *os << "/// Non-copying insertion." << be_nl
           << "void" << be_nl
-          << "operator<<= (" << be_idt << be_idt_nl
+          << "operator<<= (" << be_idt_nl
           << "::CORBA::Any &_tao_any," << be_nl
-          << node->local_name () << " **_tao_elem)" << be_uidt
+          << node->local_name () << " **_tao_elem)"
           << be_uidt_nl
           << "{" << be_idt_nl
           << "TAO::Any_Impl_T<" << node->local_name () << ">::insert ("
-          << be_idt << be_idt_nl
+          << 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
-          << be_uidt << be_uidt_nl
+          << be_uidt_nl
           << "}" << be_nl_2;
 
       *os << "::CORBA::Boolean" << be_nl
@@ -151,9 +151,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << "/// Copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " *_tao_elem)" << be_uidt
+      << node->full_name () << " *_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "#ifdef TAO_VALUETYPE_COPYING_ANY_INSERTION_USES_COPY_VALUE" << be_idt_nl
@@ -170,18 +170,18 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << "/// Non-copying insertion." << be_nl
       << "void" << be_nl
-      << "operator<<= (" << be_idt << be_idt_nl
+      << "operator<<= (" << be_idt_nl
       << "::CORBA::Any &_tao_any," << be_nl
-      << node->full_name () << " **_tao_elem)" << be_uidt
+      << node->full_name () << " **_tao_elem)"
       << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Any_Impl_T<" << node->name () << ">::insert ("
-      << be_idt << be_idt_nl
+      << be_idt_nl
       << "_tao_any," << be_nl
       << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "*_tao_elem);" << be_uidt
-      << be_uidt << be_uidt_nl
+      << be_uidt_nl
       << "}" << be_nl_2;
 
   *os << "::CORBA::Boolean" << be_nl