ChangeLogTag: Thu Sep 26 13:11:03 2002 Jeff Parsons <parsons@cs.wustl.edu>

7 files changed, 17 insertions, 9 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index cb975a06926..5f67e5ec968 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1186,6 +1186,8 @@ TAO_CodeGen::end_server_template_header (void)
 int
 TAO_CodeGen::end_server_template_inline (void)
 {
+  *this->server_template_inline_ << "\n\n";
+   
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index 203da19c4f4..8be61b129cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -603,6 +603,8 @@ be_visitor_field_ch::visit_union (be_union *node)
         }
     }
 
+  *os << be_nl << be_nl;
+
   // This was a typedefed array.
   // ACE_NESTED_CLASS macro generated by nested_type_name
   // is necessary if the struct, union, or valuetype containing this
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index be788d61101..ac208f83648 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -55,16 +55,15 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
 
   // No CDR operations for locality constraint interfaces.
   if (node->cli_hdr_cdr_op_gen ()
-      || node->imported ()
-      || node->is_local ())
+      || node->imported ())
     {
       return 0;
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the CDR << and >> operator declarations.
-  os->indent ();
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << be_global->stub_export_macro () << " CORBA::Boolean "
       << "operator<< (TAO_OutputCDR &, const " << node->full_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index f235917d488..fc5e6743c73 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -76,7 +76,7 @@ be_visitor_module_sh::visit_module (be_module *node)
                         -1);
     }
 
-  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+  *os << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "}" << be_nl << "TAO_NAMESPACE_CLOSE // module "
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 71c23453f66..a8ae905ee86 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -59,12 +59,13 @@ int be_visitor_root::visit_root (be_root *node)
                         -1);
     }
 
+  TAO_OutStream *os = this->ctx_->stream ();
+
   // If we are generating the client header file, this is the place to
   // generate the proxy broker factory function pointer declarations
   // and the extern declarations for non-defined interfaces.
   if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CH)
     {
-      TAO_OutStream *os = this->ctx_->stream ();
       be_interface *i = 0;
       be_interface_fwd *ifwd = 0;
       size_t index = 0;
@@ -395,9 +396,14 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_CH:
       (void) tao_cg->end_client_header ();
       break;
+    case TAO_CodeGen::TAO_ROOT_CI:
+    case TAO_CodeGen::TAO_ROOT_CS:
+      *os << "\n\n";
+      break;
     default:
       break;
     }
+
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
index 2188643ffe8..97ca768ed1b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp
@@ -408,6 +408,7 @@ be_visitor_sequence_ci::gen_unbounded_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE" << be_nl;
+  *os << "const ";
 
   bt->accept (&visitor);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index c45d601a4a8..d5c24bdc4e0 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -283,8 +283,6 @@ be_visitor_typecode_defn::visit_type (be_type *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  os->indent (); // start from current indentation level
-
   // Generate the typecode information here
   *os << "static const CORBA::Long _oc_";
 
@@ -292,7 +290,7 @@ be_visitor_typecode_defn::visit_type (be_type *node)
   *os << node->flat_name ();
 
   *os << "[] =" << be_nl;
-  *os << "{" << be_idt << "\n";
+  *os << "{" << be_idt_nl;
 
   // Add the sizeof the enum tk_* and the encap length that we do not put into
   // this array but which will exist in the CDR buffer.