1 files changed, 13 insertions, 13 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 23d9a366eb9..68c2c3cb5d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -23,7 +23,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e
   : event_channel_ (ec),
     refcount_ (1),
     suspended_ (false),
-    child_ (0),
+    child_ (nullptr),
     consumer_validate_connection_(validate_connection)
 {
   this->lock_ =
@@ -35,7 +35,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e
   this->qos_.is_gateway = false;
 }
 
-TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
+TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier ()
 {
   this->event_channel_->destroy_supplier_lock (this->lock_);
   this->cleanup_i ();
@@ -80,7 +80,7 @@ TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*)
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (void)
+TAO_EC_ProxyPushSupplier::shutdown ()
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -116,7 +116,7 @@ TAO_EC_ProxyPushSupplier::shutdown (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::cleanup_i (void)
+TAO_EC_ProxyPushSupplier::cleanup_i ()
 {
   this->consumer_ =
     RtecEventComm::PushConsumer::_nil ();
@@ -124,11 +124,11 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
   // @@ Why don't we have a destroy() method in the
   // filter_builder?
   delete this->child_;
-  this->child_ = 0;
+  this->child_ = nullptr;
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
+TAO_EC_ProxyPushSupplier::deactivate () throw ()
 {
   try
     {
@@ -145,21 +145,21 @@ TAO_EC_ProxyPushSupplier::deactivate (void) throw ()
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::_incr_refcnt (void)
+TAO_EC_ProxyPushSupplier::_incr_refcnt ()
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
   return this->refcount_++;
 }
 
 void
-TAO_EC_ProxyPushSupplier::refcount_zero_hook (void)
+TAO_EC_ProxyPushSupplier::refcount_zero_hook ()
 {
   // Use the event channel
   this->event_channel_->destroy_proxy (this);
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
+TAO_EC_ProxyPushSupplier::_decr_refcnt ()
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
@@ -259,7 +259,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
                                                 qos_info);
   }
 
-  if (this->child_ != 0)
+  if (this->child_ != nullptr)
     this->child_->clear ();
 }
 
@@ -308,7 +308,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
                                                        qos_info);
   }
 
-  if (this->child_ != 0)
+  if (this->child_ != nullptr)
     this->child_->clear ();
 }
 
@@ -430,7 +430,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
 }
 
 void
-TAO_EC_ProxyPushSupplier::clear (void)
+TAO_EC_ProxyPushSupplier::clear ()
 {
   ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
@@ -438,7 +438,7 @@ TAO_EC_ProxyPushSupplier::clear (void)
 }
 
 CORBA::ULong
-TAO_EC_ProxyPushSupplier::max_event_size (void) const
+TAO_EC_ProxyPushSupplier::max_event_size () const
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);