1 files changed, 8 insertions, 8 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index eb1cbd75784..5cfcba36781 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -16,7 +16,7 @@ be_visitor_union_cs::be_visitor_union_cs (be_visitor_context *ctx)
 {
 }
 
-be_visitor_union_cs::~be_visitor_union_cs (void)
+be_visitor_union_cs::~be_visitor_union_cs ()
 {
 }
 
@@ -35,7 +35,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   // declaration inside of the union statement. We need to generate its
   // typecode.
 
-  be_type *bt = be_type::narrow_from_decl (node->disc_type ());
+  be_type *bt = dynamic_cast<be_type*> (node->disc_type ());
 
   if (!bt)
     {
@@ -77,7 +77,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
 
   // Generate the copy constructor and the assignment operator here.
   *os << be_nl_2
-      << node->name () << "::" << node->local_name () << " (void)" << be_nl
+      << node->name () << "::" << node->local_name () << " ()" << be_nl
       << "{" << be_idt_nl
       << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl;
 
@@ -89,16 +89,16 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << "this->disc_ = ";
 
   UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-  be_union_branch *ub = 0;
+  be_union_branch *ub = nullptr;
 
   // In case we have some bogus enum values from an enum declared
   // in our scope.
-  while (ub == 0)
+  while (ub == nullptr)
     {
       // Just get the union's first member.
       AST_Decl *d = si.item ();
 
-      ub = be_union_branch::narrow_from_decl (d);
+      ub = dynamic_cast<be_union_branch*> (d);
       si.next ();
     }
 
@@ -189,7 +189,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << be_uidt_nl << "}" << be_nl_2;
 
   *os << node->name () << "::~" << node->local_name ()
-      << " (void)" << be_nl
+      << " ()" << be_nl
       << "{" << be_idt_nl
       << "// Finalize." << be_nl
       << "this->_reset ();" << be_uidt_nl
@@ -267,7 +267,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS);
 
   *os << "/// Reset method to reset old values of a union." << be_nl;
-  *os << "void " << node->name () << "::_reset (void)" << be_nl;
+  *os << "void " << node->name () << "::_reset ()" << be_nl;
   *os << "{" << be_idt_nl;
 
   if (!boolDisc)