Less newlines in simple operations

    * TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
    * TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
    * TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:

3 files changed, 6 insertions, 7 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index f79eafd2f91..e792b18f3c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -71,7 +71,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
       << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
-      << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl
+      << "::CORBA::Object_ptr tmp {};" << be_nl
       << be_nl
       << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl
       << "stub->servant_orb_var ()->orb_core ()->"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 0b2826a3a2a..072a877ecad 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -471,7 +471,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
     }
   else
     {
-      *os << "return" << be_idt_nl;
+      *os << "return ";
 
       if (!node->is_abstract ())
         {
@@ -484,18 +484,17 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
               << node->local_name () << ">::" << pre <<" (";
         }
 
-      *os << be_idt << be_idt_nl
-          << "_tao_objref";
+      *os << "_tao_objref";
 
       if (ACE_OS::strcmp (pre, "narrow") == 0)
         {
-          *os << "," << be_nl
+          *os << ", "
               << "\"" << node->repoID () << "\"";
         }
 
       *os << ");";
 
-      *os << be_uidt << be_uidt << be_uidt << be_uidt_nl
+      *os << 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 9b9f7e6933a..81256400f5f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -375,7 +375,7 @@ be_visitor_interface_ss::this_method (be_interface *node)
 
   /* Coverity whines about an unused return value from _nil() when
      initializing tmp.  Just use zero instead. */
-  *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();"
+  *os << "::CORBA::Object_ptr tmp {};"
       << be_nl_2;
 
   *os << "::CORBA::Boolean const _tao_opt_colloc ="