1 files changed, 10 insertions, 9 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index daba6c407e4..2f8525957e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           ami_exception_holder_operation_cs, 
+ACE_RCSID (be_visitor_operation,
+           ami_exception_holder_operation_cs,
            "$Id$")
 
 // ************************************************************
@@ -69,7 +69,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
   *os << "void " << be_nl;
 
   // Get the scope name.
-  be_decl *parent = 
+  be_decl *parent =
     be_scope::narrow_from_scope (node->defined_in ())->decl ();
 
   if (parent == 0)
@@ -85,7 +85,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
     }
 
   be_interface *parent_interface = be_interface::narrow_from_decl (parent);
-  AST_Decl::NodeType nt = 
+  AST_Decl::NodeType nt =
     parent_interface->defined_in ()->scope_node_type ();
 
   if (parent_interface->is_nested () && nt == AST_Decl::NT_module)
@@ -145,12 +145,12 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
   // Don't do anything if the exception list is empty.
   if (node->exceptions ())
     {
-      *os << "static TAO_Exception_Data " << "exceptions_data [] = " << be_nl;
+      *os << "static TAO::Exception_Data " << "exceptions_data [] = " << be_nl;
       *os << "{" << be_idt_nl;
 
       int excep_count = 0;
 
-      AST_Decl *d = 0;
+      be_exception *ex = 0;
 
       // Initialize an iterator to iterate thru the exception list.
       // Continue until each element is visited.
@@ -158,12 +158,13 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done ();)
         {
-          d = ei.item ();
+          ex = be_exception::narrow_from_decl (ei.item ());
 
           *os << "{" << be_idt_nl
-              << "\"" << d->repoID () << "\"," << be_nl;
+              << "\"" << ex->repoID () << "\"," << be_nl;
           // Allocator method.
-          *os << d->name () << "::_alloc" << be_uidt_nl
+          *os << ex->name () << "::_alloc," << be_nl
+              << ex->tc_name () << be_uidt_nl
               << "}";
 
           ++excep_count;