1 files changed, 28 insertions, 28 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index 460cb93d1bc..5bfbd0b57ff 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -20,22 +20,19 @@
 //
 // ============================================================================
 
-#include        "be.h"
-
+#include "be.h"
 #include "be_visitor_sequence.h"
 
-ACE_RCSID(be_visitor_sequence, gen_bounded_obj_sequence_ch, "$Id$")
+ACE_RCSID (be_visitor_sequence, 
+           gen_bounded_obj_sequence_ch, 
+           "$Id$")
 
 
 int
 be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
-
-  // Retrieve the base type since we may need to do some code
-  // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = be_type::narrow_from_decl (node->base_type ());
 
   if (!bt)
     {
@@ -63,7 +60,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
 
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  be_visitor_sequence_base visitor (&ctx);
 
   // !! Branching in either compile time template instantiation
   // or manual template instantiation.
@@ -78,20 +75,20 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       << "// = Initialization and termination methods." << be_nl
       << be_nl;
 
-  // default constructor
+  // Default constructor.
   *os << class_name << " (void);" << be_nl;
 
-  // constructor
+  // Constructor.
   *os << class_name << " (" << be_idt << be_idt_nl
       << "CORBA::ULong length," << be_nl;
 
-  bt->accept (visitor);
+  bt->accept (&visitor);
 
   *os <<"* *value," << be_nl
       << "CORBA::Boolean release = 0" << be_uidt_nl
       << ");" << be_uidt_nl;
 
-  // constructor
+  // Constructor.
   *os << class_name << " (" << be_idt << be_idt_nl
       << "const " << class_name << " &rhs" << be_uidt_nl
       << ");" << be_uidt_nl;
@@ -101,10 +98,10 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       << "const " << class_name << " &rhs" << be_uidt_nl
       << ");" << be_uidt_nl;
 
-  // destructor
+  // Destructor.
   *os << "virtual ~" << class_name << " (void);" << be_nl << be_nl;
 
-  // Accessors
+  // Accessors.
   *os << "// = Accessors." << be_nl;
 
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
@@ -133,9 +130,13 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
         }
 
       if (is_valuetype)
-        *os << "TAO_Valuetype_Manager<";
+        {
+          *os << "TAO_Valuetype_Manager<";
+        }
       else
-      *os << "TAO_Object_Manager<";
+        {
+          *os << "TAO_Object_Manager<";
+        }
     }
 
   *os << bt->name () << ","
@@ -148,14 +149,14 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   // allocbuf
   *os << "static ";
 
-  bt->accept (visitor);
+  bt->accept (&visitor);
 
   *os << " **allocbuf (CORBA::ULong length);" << be_nl;
 
   // freebuf
   *os << "static void freebuf (";
 
-  bt->accept (visitor);
+  bt->accept (&visitor);
 
   *os << " **buffer);" << be_nl << be_nl;
 
@@ -169,13 +170,13 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   *os << "virtual void _deallocate_buffer (void);" << be_nl;
 
   // get_buffer
-  bt->accept(visitor);
+  bt->accept (&visitor);
   *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
 
   // get_buffer
   *os << "const ";
 
-  bt->accept (visitor);
+  bt->accept (&visitor);
 
   *os << "* *get_buffer (void) const;" << be_nl;
 
@@ -189,20 +190,19 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
     {
       // Pseudo objects do not require these methods.
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
-                << "void* target," << be_nl
-                << "CORBA_Object *src" << be_nl
-                << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
-                << ");" << be_uidt_nl;
-
+          << "void* target," << be_nl
+          << "CORBA_Object *src" << be_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
+          << ");" << be_uidt_nl;
       *os << "virtual CORBA_Object* _upcast (void *src) const;";
     }
+
   *os << be_uidt_nl << "};" << be_nl;
 
   os->gen_endif ();
 
-  // generate #endif for AHETI
+  // Generate #endif for AHETI.
   os->gen_endif_AHETI ();
 
-  delete visitor;
   return 0;
 }