1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
index 6f354a6592a..9f4f09196be 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -17,7 +17,7 @@ be_visitor_union_discriminant_ch::be_visitor_union_discriminant_ch (
 {
 }
 
-be_visitor_union_discriminant_ch::~be_visitor_union_discriminant_ch (void)
+be_visitor_union_discriminant_ch::~be_visitor_union_discriminant_ch ()
 {
 }
 
@@ -27,7 +27,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
   // Get the enclosing union backend.
   be_union *bu =
     dynamic_cast<be_union*> (this->ctx_->node ());
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -70,7 +70,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
   *os << be_nl_2
       << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
-  *os << bt->nested_type_name (bu) << " _d (void) const;";
+  *os << bt->nested_type_name (bu) << " _d () const;";
 
   return 0;
 }
@@ -82,7 +82,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
   // get the enclosing union backend.
   be_union *bu =
     dynamic_cast<be_union*> (this->ctx_->node ());
-  be_type *bt = 0;
+  be_type *bt = nullptr;
 
   // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
@@ -103,7 +103,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
   *os << be_nl_2
       << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl;
   // The get method.
-  *os << bt->nested_type_name (bu) << " _d (void) const;";
+  *os << bt->nested_type_name (bu) << " _d () const;";
 
   return 0;
 }
@@ -125,6 +125,6 @@ be_visitor_union_discriminant_ch::visit_typedef (be_typedef *node)
                         -1);
     }
 
-  this->ctx_->alias (0);
+  this->ctx_->alias (nullptr);
   return 0;
 }