More compact code generation

    * TAO/TAO_IDL/be/be_interface.cpp:
    * TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:

2 files changed, 20 insertions, 27 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 977655765a1..7cce6542bf3 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -790,17 +790,15 @@ be_interface:: gen_var_out_seq_decls (void)
       << "class " << lname << ";" << be_nl
       << "typedef " << lname << " *" << lname << "_ptr;";
 
-  *os << be_nl_2
-      << "typedef" << be_idt_nl
-      << "TAO_Objref_Var_T<" << be_idt << be_idt_nl
-      << lname << be_uidt_nl
-      << ">" << be_uidt_nl
-      << lname << "_var;" << be_uidt_nl << be_nl
-      << "typedef" << be_idt_nl
-      << "TAO_Objref_Out_T<" << be_idt << be_idt_nl
-      << lname << be_uidt_nl
-      << ">" << be_uidt_nl
-      << lname << "_out;" << be_uidt;
+  *os << be_nl
+      << "typedef TAO_Objref_Var_T<"
+      << lname
+      << "> "
+      << lname << "_var;" << be_nl
+      << "typedef TAO_Objref_Out_T<"
+      << lname
+      << "> "
+      << lname << "_out;" << be_nl;
 
   os->gen_endif ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 9b9b3e041d3..fc815750ad8 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -311,24 +311,19 @@ be_visitor_sequence_ch::gen_varout_typedefs (be_sequence *node,
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl_2;
+  *os << be_nl;
 
-    AST_Type::SIZE_TYPE st = elem->size_type ();
+  AST_Type::SIZE_TYPE st = elem->size_type ();
 
-    *os << "typedef" << be_idt_nl
-        << (st == AST_Type::FIXED ? "::TAO_FixedSeq_Var_T<"
-                                  : "::TAO_VarSeq_Var_T<")
-        << be_idt << be_idt_nl
-        << node->local_name ();
+  *os << "typedef "
+      << (st == AST_Type::FIXED ? "::TAO_FixedSeq_Var_T<"
+                                : "::TAO_VarSeq_Var_T<")
+      << node->local_name ();
 
-    *os << be_uidt_nl
-        << ">" << be_uidt_nl
-        << node->local_name () << "_var;" << be_uidt;
+  *os << "> "
+      << node->local_name () << "_var;" << be_nl;
 
-    *os << be_nl_2
-        << "typedef" << be_idt_nl
-        << "::TAO_Seq_Out_T<" << be_idt << be_idt_nl
-        << node->local_name () << be_uidt_nl
-        << ">" << be_uidt_nl
-        << node->local_name () << "_out;" << be_uidt;
+  *os << "typedef ::TAO_Seq_Out_T<"
+      << node->local_name ()
+      << "> " << node->local_name () << "_out;" << be_nl;
 }