ChangeLogTag: Tue May 15 10:43:23 2001 Jeff Parsons <parsons@cs.wustl.edu>

1 files changed, 146 insertions, 156 deletions

diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index cc42bc9d9ec..72e630495b4 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -63,7 +63,7 @@ int
 be_union::gen_var_defn (char *)
 {
   TAO_OutStream *ch = 0;
-  TAO_NL nl;
+  TAO_NL be_nl;
   char namebuf [NAMEBUFSIZE];
 
   ACE_OS::memset (namebuf,
@@ -80,98 +80,93 @@ be_union::gen_var_defn (char *)
   // Depending upon the data type, there are some differences which we account
   // for over here.
 
-  ch->indent (); // start with whatever was our current indent level
   *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
+      << " " << namebuf << be_nl;
+  *ch << "{" << be_nl;
+  *ch << "public:" << be_idt_nl;
 
   // Default constructor.
-  *ch << namebuf << " (void); // default constructor" << nl;
+  *ch << namebuf << " (void);" << be_nl;
 
   // Constructor.
-  *ch << namebuf << " (" << this->local_name () << " *);" << nl;
+  *ch << namebuf << " (" << this->local_name () << " *);" << be_nl;
 
   // Copy constructor.
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
+  *ch << namebuf << " (const " << namebuf 
+      << " &);" << be_nl;
 
   // Fixed-size types only.
   if (this->size_type () == be_decl::FIXED)
     {
       *ch << namebuf << " (const " << this->local_name ()
-          << " &); // fixed-size types only" << nl;
+          << " &); // fixed-size types only" << be_nl;
     }
 
   // Destructor.
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
+  *ch << "~" << namebuf << " (void);" << be_nl;
+  *ch << be_nl;
 
   // Assignment operator from a pointer.
   *ch << namebuf << " &operator= ("
-      << this->local_name () << " *);" << nl;
+      << this->local_name () << " *);" << be_nl;
 
   // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
+  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
 
   // Fixed-size types only.
   if (this->size_type () == be_decl::FIXED)
     {
       *ch << namebuf << " &operator= (const " << this->local_name ()
-          << " &); // fixed-size types only" << nl;
+          << " &); // fixed-size types only" << be_nl;
     }
 
   // Arrow operator.
-  *ch << local_name () << " *operator-> (void);" << nl;
+  *ch << local_name () << " *operator-> (void);" << be_nl;
   *ch << "const " << this->local_name ()
-      << " *operator-> (void) const;" << nl;
-  *ch << nl;
+      << " *operator-> (void) const;" << be_nl;
+  *ch << be_nl;
 
   // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << this->local_name () << " &() const;" << nl;
-  *ch << "operator " << this->local_name () << " &();" << nl;
-  *ch << "operator " << this->local_name () << " &() const;" << nl;
+  *ch << "operator const " << this->local_name () << " &() const;" << be_nl;
+  *ch << "operator " << this->local_name () << " &();" << be_nl;
+  *ch << "operator " << this->local_name () << " &() const;" << be_nl;
 
   if (this->size_type () == be_decl::VARIABLE)
     {
+      *ch << "  // Variable size types only." << be_nl;
       *ch << "operator " << this->local_name ()
-          << " *&(); // variable-size types only" << nl;
+          << " *&();" << be_nl;
     }
 
-  *ch << nl;
-  *ch << "// in, inout, out, _retn " << nl;
+  *ch << be_nl;
+  *ch << "// in, inout, out, _retn " << be_nl;
 
   // The return types of in, out, inout, and _retn are based on the parameter
   // passing rules and the base type.
   if (this->size_type () == be_decl::FIXED)
     {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << this->local_name () << " &inout (void);" << nl;
-      *ch << this->local_name () << " &out (void);" << nl;
-      *ch << this->local_name () << " _retn (void);" << nl;
+      *ch << "const " << local_name () << " &in (void) const;" << be_nl;
+      *ch << this->local_name () << " &inout (void);" << be_nl;
+      *ch << this->local_name () << " &out (void);" << be_nl;
+      *ch << this->local_name () << " _retn (void);" << be_nl;
     }
   else
     {
-      *ch << "const " << this->local_name () << " &in (void) const;" << nl;
-      *ch << this->local_name () << " &inout (void);" << nl;
-      *ch << this->local_name () << " *&out (void);" << nl;
-      *ch << this->local_name () << " *_retn (void);" << nl;
+      *ch << "const " << this->local_name () << " &in (void) const;" << be_nl;
+      *ch << this->local_name () << " &inout (void);" << be_nl;
+      *ch << this->local_name () << " *&out (void);" << be_nl;
+      *ch << this->local_name () << " *_retn (void);" << be_nl;
     }
 
   // Generate an additional member function that 
   // returns the underlying pointer.
-  *ch << this->local_name () << " *ptr(void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
+  *ch << this->local_name () << " *ptr (void) const;" 
+      << be_uidt_nl << be_nl;
 
   // Generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << " *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
+  *ch << "private:" << be_idt_nl;
+  *ch << this->local_name () << " *ptr_;" << be_uidt_nl;
+  *ch << "};" << be_nl << be_nl;
 
   return 0;
 }
@@ -183,7 +178,7 @@ be_union::gen_var_impl (char *,
                         char *)
 {
   TAO_OutStream *ci = 0;
-  TAO_NL nl;
+  TAO_NL be_nl;
 
   // To hold the full and local _var names.
   char fname [NAMEBUFSIZE];
@@ -211,36 +206,36 @@ be_union::gen_var_impl (char *,
   ci->indent ();
 
   *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
+      << be_nl;
+  *ci << "// Inline operations for class " << fname << be_nl;
   *ci << "// *************************************************************\n\n";
 
   // Default constructor.
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (0)" << nl;
+    " (void) // default constructor" << be_nl;
+  *ci << "  " << ": ptr_ (0)" << be_nl;
   *ci << "{}\n\n";
 
   // Constructor from a pointer.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname << " (" << this->local_name ()
-      << " *p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
+      << " *p)" << be_nl;
+  *ci << "  : ptr_ (p)" << be_nl;
   *ci << "{}\n\n";
 
   // Copy constructor.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname << " (const ::" << fname 
-      << " &p) // copy constructor" << nl;
+      << " &p) // copy constructor" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
+  *ci << "if (p.ptr_)" << be_nl;
   *ci << "  ACE_NEW (this->ptr_, ::" << this->name ()
-      << " (*p.ptr_));" << nl;
-  *ci << "else" << nl;
+      << " (*p.ptr_));" << be_nl;
+  *ci << "else" << be_nl;
   *ci << "  this->ptr_ = 0;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -248,10 +243,10 @@ be_union::gen_var_impl (char *,
   // Fixed-size types only.
   if (this->size_type () == be_decl::FIXED)
     {
-      *ci << "// fixed-size types only" << nl;
-      *ci << "ACE_INLINE" << nl;
+      *ci << "// fixed-size types only" << be_nl;
+      *ci << "ACE_INLINE" << be_nl;
       *ci << fname << "::" << lname << " (const ::"
-          << this->name () << " &p)" << nl;
+          << this->name () << " &p)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "ACE_NEW (this->ptr_, ::" << this->name ()
@@ -262,8 +257,8 @@ be_union::gen_var_impl (char *,
 
   // Destructor.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
+  *ci << "ACE_INLINE" << be_nl;
+  *ci << fname << "::~" << lname << " (void) // destructor" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "delete this->ptr_;\n";
@@ -272,13 +267,13 @@ be_union::gen_var_impl (char *,
 
   // Assignment operator from a pointer.
   ci->indent ();
-  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << be_nl;
   *ci << fname << "::operator= (" << this->local_name ()
-      << " *p)" << nl;
+      << " *p)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
+  *ci << "delete this->ptr_;" << be_nl;
+  *ci << "this->ptr_ = p;" << be_nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -317,20 +312,20 @@ be_union::gen_var_impl (char *,
   if (this->size_type () == be_decl::FIXED)
     {
       ci->indent ();
-      *ci << "// fixed-size types only" << nl;
-      *ci << "ACE_INLINE ::" << fname << " &" << nl;
+      *ci << "// fixed-size types only" << be_nl;
+      *ci << "ACE_INLINE ::" << fname << " &" << be_nl;
       *ci << fname << "::operator= (const ::" << this->name ()
-          << " &p)" << nl;
+          << " &p)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "if (this->ptr_ != &p)" << nl;
+      *ci << "if (this->ptr_ != &p)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
+      *ci << "delete this->ptr_;" << be_nl;
       *ci << "ACE_NEW_RETURN (this->ptr_, ::"
           << this->name () << " (p), *this);\n";
       ci->decr_indent ();
-      *ci << "}" << nl;
+      *ci << "}" << be_nl;
       *ci << "return *this;\n";
       ci->decr_indent ();
       *ci << "}\n\n";
@@ -338,8 +333,8 @@ be_union::gen_var_impl (char *,
 
   // Two arrow operators.
   ci->indent ();
-  *ci << "ACE_INLINE const ::" << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
+  *ci << "ACE_INLINE const ::" << this->name () << " *" << be_nl;
+  *ci << fname << "::operator-> (void) const" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -347,8 +342,8 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << be_nl;
+  *ci << fname << "::operator-> (void)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -357,9 +352,9 @@ be_union::gen_var_impl (char *,
 
   // Other extra methods - 3 cast operator ().
   ci->indent ();
-  *ci << "ACE_INLINE " << nl;
+  *ci << "ACE_INLINE " << be_nl;
   *ci << fname << "::operator const ::" << this->name ()
-      << " &() const // cast" << nl;
+      << " &() const // cast" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -367,9 +362,9 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << nl;
+  *ci << "ACE_INLINE " << be_nl;
   *ci << fname << "::operator ::" << this->name ()
-      << " &() // cast " << nl;
+      << " &() // cast " << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -377,9 +372,9 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << nl;
+  *ci << "ACE_INLINE " << be_nl;
   *ci << fname << "::operator ::" << this->name ()
-      << " &() const// cast " << nl;
+      << " &() const// cast " << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -390,10 +385,10 @@ be_union::gen_var_impl (char *,
   if (this->size_type () == be_decl::VARIABLE)
     {
       ci->indent ();
-      *ci << "// variable-size types only" << nl;
-      *ci << "ACE_INLINE" << nl;
+      *ci << "// variable-size types only" << be_nl;
+      *ci << "ACE_INLINE" << be_nl;
       *ci << fname << "::operator ::" << this->name ()
-          << " *&() // cast " << nl;
+          << " *&() // cast " << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "return this->ptr_;\n";
@@ -403,8 +398,8 @@ be_union::gen_var_impl (char *,
 
   // in, inout, out, _retn, and ptr.
   ci->indent ();
-  *ci << "ACE_INLINE const ::" << this->name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
+  *ci << "ACE_INLINE const ::" << this->name () << " &" << be_nl;
+  *ci << fname << "::in (void) const" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -412,8 +407,8 @@ be_union::gen_var_impl (char *,
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE ::" << this->name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " &" << be_nl;
+  *ci << fname << "::inout (void)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return *this->ptr_;\n";
@@ -424,24 +419,24 @@ be_union::gen_var_impl (char *,
   ci->indent ();
   if (this->size_type () == be_decl::VARIABLE)
     {
-      *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE ::" << this->name () << " *&" << nl;
-      *ci << fname << "::out (void)" << nl;
+      *ci << "// mapping for variable size " << be_nl;
+      *ci << "ACE_INLINE ::" << this->name () << " *&" << be_nl;
+      *ci << fname << "::out (void)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
+      *ci << "delete this->ptr_;" << be_nl;
+      *ci << "this->ptr_ = 0;" << be_nl;
       *ci << "return this->ptr_;\n";
       ci->decr_indent ();
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
-      *ci << fname << "::_retn (void)" << nl;
+      *ci << "ACE_INLINE ::" << this->name () << " *" << be_nl;
+      *ci << fname << "::_retn (void)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
-      *ci << "::" << this->name () << " *tmp = this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
+      *ci << "::" << this->name () << " *tmp = this->ptr_;" << be_nl;
+      *ci << "this->ptr_ = 0;" << be_nl;
       *ci << "return tmp;\n";
       ci->decr_indent ();
       *ci << "}\n\n";
@@ -449,9 +444,9 @@ be_union::gen_var_impl (char *,
     }
   else
     {
-      *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE ::" << this->name () << " &" << nl;
-      *ci << fname << "::out (void)" << nl;
+      *ci << "// mapping for fixed size " << be_nl;
+      *ci << "ACE_INLINE ::" << this->name () << " &" << be_nl;
+      *ci << fname << "::out (void)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "return *this->ptr_;\n";
@@ -459,8 +454,8 @@ be_union::gen_var_impl (char *,
       *ci << "}\n\n";
 
       ci->indent ();
-      *ci << "ACE_INLINE ::" << this->name () << nl;
-      *ci << fname << "::_retn (void)" << nl;
+      *ci << "ACE_INLINE ::" << this->name () << be_nl;
+      *ci << fname << "::_retn (void)" << be_nl;
       *ci << "{\n";
       ci->incr_indent ();
       *ci << "return *this->ptr_;\n";
@@ -470,8 +465,8 @@ be_union::gen_var_impl (char *,
 
   // The additional ptr () member function.
   ci->indent ();
-  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << be_nl;
+  *ci << fname << "::ptr (void) const" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -486,7 +481,7 @@ int
 be_union::gen_out_defn (char *)
 {
   TAO_OutStream *ch = 0;
-  TAO_NL nl;
+  TAO_NL be_nl;
 
   // To hold the _out name.
   char namebuf [NAMEBUFSIZE];
@@ -503,54 +498,49 @@ be_union::gen_out_defn (char *)
 
   // Generate the out definition (always in the client header).
 
-  // Start with whatever was our current indent level.
-  ch->indent ();
-
   *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
+      << " " << namebuf << be_nl;
+  *ch << "{" << be_nl;
+  *ch << "public:" << be_idt_nl;
 
   // No default constructor.
 
   // Constructor from a pointer.
-  *ch << namebuf << " (" << this->local_name () << " *&);" << nl;
+  *ch << namebuf << " (" << this->local_name () << " *&);" << be_nl;
 
   // Constructor from a _var &.
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << nl;
+  *ch << namebuf << " (" << this->local_name () << "_var &);" << be_nl;
 
   // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << nl;
+  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
 
   // Assignment operator from a _out &.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
+  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
 
   // Assignment operator from a pointer &, cast operator, ptr fn, operator
   // -> and any other extra operators.
 
   // Assignment.
-  *ch << namebuf << " &operator= (" << this->local_name () << " *);" << nl;
+  *ch << namebuf << " &operator= (" << this->local_name () 
+      << " *);" << be_nl;
 
   // operator ().
-  *ch << "operator " << local_name () << " *&();" << nl;
+  *ch << "operator " << local_name () << " *&();" << be_nl;
 
   // ptr function.
-  *ch << this->local_name () << " *&ptr (void);" << nl;
+  *ch << this->local_name () << " *&ptr (void);" << be_nl;
 
   // operator ->
-  *ch << this->local_name () << " *operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << this->local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
+  *ch << this->local_name () << " *operator-> (void);" << be_nl;
+
+  *ch << be_uidt_nl;
+  *ch << "private:" << be_idt_nl;
+  *ch << this->local_name () << " *&ptr_;" << be_nl;
+  *ch << "// assignment from T_var not allowed." << be_nl;
+  *ch << "void operator= (const " << this->local_name () 
+      << "_var &);" << be_uidt_nl;
+  *ch << "};" << be_nl << be_nl;
+
   return 0;
 }
 
@@ -559,7 +549,7 @@ be_union::gen_out_impl (char *,
                         char *)
 {
   TAO_OutStream *ci = 0;
-  TAO_NL nl;
+  TAO_NL be_nl;
 
   // To hold the full and local _out names.
   char fname [NAMEBUFSIZE];
@@ -589,16 +579,16 @@ be_union::gen_out_impl (char *,
   ci->indent ();
 
   *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
+      << be_nl;
+  *ci << "// Inline operations for class " << fname << be_nl;
   *ci << "// *************************************************************\n\n";
 
   // Constructor from a pointer.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname << " (" << this->local_name ()
-      << " *&p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
+      << " *&p)" << be_nl;
+  *ci << "  : ptr_ (p)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "this->ptr_ = 0;\n";
@@ -607,33 +597,33 @@ be_union::gen_out_impl (char *,
 
   // Constructor from _var &.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname << " (" << this->local_name ()
-      << "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
+      << "_var &p) // constructor from _var" << be_nl;
+  *ci << "  : ptr_ (p.out ())" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
+  *ci << "delete this->ptr_;" << be_nl;
   *ci << "this->ptr_ = 0;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
 
   // Copy constructor.
   ci->indent ();
-  *ci << "ACE_INLINE" << nl;
+  *ci << "ACE_INLINE" << be_nl;
   *ci << fname << "::" << lname << " (const ::" << fname
-      << " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << lname << "&, p).ptr_)" << nl;
+      << " &p) // copy constructor" << be_nl;
+  *ci << "  : ptr_ (ACE_const_cast (" << lname << "&, p).ptr_)" << be_nl;
   *ci << "{}\n\n";
 
   // Assignment operator from _out &.
   ci->indent ();
-  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << be_nl;
   *ci << fname << "::operator= (const ::" << fname
-      << " &p)" << nl;
+      << " &p)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << lname << "&, p).ptr_;" << nl;
+  *ci << "this->ptr_ = ACE_const_cast (" << lname << "&, p).ptr_;" << be_nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -642,20 +632,20 @@ be_union::gen_out_impl (char *,
 
   // Assignment operator from pointer.
   ci->indent ();
-  *ci << "ACE_INLINE ::" << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->local_name () << " *p)" << nl;
+  *ci << "ACE_INLINE ::" << fname << " &" << be_nl;
+  *ci << fname << "::operator= (" << this->local_name () << " *p)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
+  *ci << "this->ptr_ = p;" << be_nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
 
   // Other extra methods - cast operator ().
   ci->indent ();
-  *ci << "ACE_INLINE " << nl;
+  *ci << "ACE_INLINE " << be_nl;
   *ci << fname << "::operator ::" << this->name ()
-      << " *&() // cast" << nl;
+      << " *&() // cast" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -664,8 +654,8 @@ be_union::gen_out_impl (char *,
 
   // ptr function.
   ci->indent ();
-  *ci << "ACE_INLINE ::" << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *&" << be_nl;
+  *ci << fname << "::ptr (void) // ptr" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -674,8 +664,8 @@ be_union::gen_out_impl (char *,
 
   // operator ->
   ci->indent ();
-  *ci << "ACE_INLINE ::" << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
+  *ci << "ACE_INLINE ::" << this->name () << " *" << be_nl;
+  *ci << fname << "::operator-> (void)" << be_nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";