1 files changed, 23 insertions, 30 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
index 129104f1a06..ab1945a19a6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
@@ -18,33 +18,36 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
+#include "be.h"
 #include "be_visitor_valuetype.h"
 
-ACE_RCSID(be_visitor_valuetype, ami_exception_holder_ch, "$Id$")
+ACE_RCSID (be_visitor_valuetype, 
+           ami_exception_holder_ch, 
+           "$Id$")
 
 // ******************************************************
-// Interface visitor for client header
+// Interface visitor for client header.
 // ******************************************************
 
-be_visitor_valuetype_ami_exception_holder_ch::be_visitor_valuetype_ami_exception_holder_ch (be_visitor_context *ctx)
+be_visitor_valuetype_ami_exception_holder_ch::
+be_visitor_valuetype_ami_exception_holder_ch (be_visitor_context *ctx)
   : be_visitor_valuetype (ctx)
 {
 }
 
-be_visitor_valuetype_ami_exception_holder_ch::~be_visitor_valuetype_ami_exception_holder_ch (void)
+be_visitor_valuetype_ami_exception_holder_ch::
+~be_visitor_valuetype_ami_exception_holder_ch (void)
 {
 }
 
 int
-be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (be_valuetype *node)
+be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (
+    be_valuetype *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the implemenation of the Messaging aware ORB
+  // Generate the implemenation of the Messaging aware ORB.
   *os << be_nl
       << "class _tao_" << node->local_name () << be_idt_nl
       << ": public ";
@@ -58,17 +61,15 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (be_valuetype *nod
       << "  public virtual OBV_Messaging::ExceptionHolder," << be_nl
       << "  public virtual CORBA::DefaultValueRefCountBase" << be_uidt_nl
       << "{" << be_nl;
-
   *os << "public:" << be_idt_nl;
-
   *os << "_tao_" << node->local_name () << " ();" << be_nl << be_nl;
-
   *os << "~_tao_" << node->local_name () << " ();" << be_nl << be_nl;
 
   if (this->visit_valuetype_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ami_exception_holder_cs::"
+                         "(%N:%l) be_visitor_valuetype_ami_"
+                         "exception_holder_cs::"
                          "visit_valuetype - "
                          "codegen for scope failed\n"),
                         -1);
@@ -76,36 +77,28 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (be_valuetype *nod
 
   *os << be_uidt_nl
       << "};" << be_nl << be_nl;
+
   return 0;
 }
 
 int
-be_visitor_valuetype_ami_exception_holder_ch::visit_operation (be_operation *node)
+be_visitor_valuetype_ami_exception_holder_ch::visit_operation (
+    be_operation *node
+  )
 {
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_OPERATION_IH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ami_exception_holder_ch::"
-                         "visit_operation - "
-                         "Bad visitor to argument list\n"),
-                        -1);
-    }
+  be_visitor_operation_ih visitor (&ctx);
 
-  if (node->accept (visitor) == -1)
+  if (node->accept (&visitor) == -1)
     {
-      delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ami_exception_holder_ch::"
+                         "(%N:%l) be_visitor_valuetype_"
+                         "ami_exception_holder_ch::"
                          "visit_operation - "
                          "codegen for argument list failed\n"),
                         -1);
     }
 
-  delete visitor;
-
   return 0;
 }