17 files changed, 64 insertions, 64 deletions
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
index 19eae83c9dc..04e5211f63f 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp
@@ -306,9 +306,9 @@ TAO_AMH_DSI_Exception_Holder::raise_invoke ()
 
 // The pseudo-object _nil method.
 TAO_AMH_DSI_Response_Handler_ptr
-TAO_AMH_DSI_Response_Handler::_nil (void)
+TAO_AMH_DSI_Response_Handler::_nil ()
 {
-  return (TAO_AMH_DSI_Response_Handler_ptr) 0;
+  return nullptr;
 }
 
 
diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
index e5960f6dbcb..70abfe5ad7c 100644
--- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
+++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h
@@ -244,13 +244,13 @@ public:
   /// CORBA Object related methods
   static TAO_AMH_DSI_Response_Handler* _duplicate (
              TAO_AMH_DSI_Response_Handler_ptr);
-  static TAO_AMH_DSI_Response_Handler* _nil (void);
+  static TAO_AMH_DSI_Response_Handler* _nil ();
   static TAO_AMH_DSI_Response_Handler* _narrow (CORBA::Object_ptr);
   static TAO_AMH_DSI_Response_Handler* _unchecked_narrow (CORBA::Object_ptr);
 
 protected:
   /// Return 0.  Should never be used.
-  virtual const char *_interface_repository_id (void) const;
+  virtual const char *_interface_repository_id () const;
 
   /// Simply returns "this"
   virtual void *_downcast (const char *repository_id);
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 92f4a4a6161..1ecc267b2de 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -10,23 +10,23 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Context::Context (void)
+CORBA::Context::Context ()
   : refcount_ (1)
 {
 }
 
-CORBA::Context::~Context (void)
+CORBA::Context::~Context ()
 {
 }
 
 CORBA::ULong
-CORBA::Context::_incr_refcount (void)
+CORBA::Context::_incr_refcount ()
 {
   return ++refcount_;
 }
 
 CORBA::ULong
-CORBA::Context::_decr_refcount (void)
+CORBA::Context::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
@@ -141,14 +141,14 @@ CORBA::ContextList::remove (CORBA::ULong)
 }
 
 CORBA::ContextList_ptr
-CORBA::ContextList::_duplicate (void)
+CORBA::ContextList::_duplicate ()
 {
   ++this->refcount_;
   return this;
 }
 
 void
-CORBA::ContextList::_destroy (void)
+CORBA::ContextList::_destroy ()
 {
   CORBA::ULong const current = --this->refcount_;
 
@@ -159,13 +159,13 @@ CORBA::ContextList::_destroy (void)
 }
 
 void
-CORBA::ContextList::_incr_refcount (void)
+CORBA::ContextList::_incr_refcount ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::ContextList::_decr_refcount (void)
+CORBA::ContextList::_decr_refcount ()
 {
   --this->refcount_;
 
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index dd9eb9cfc5a..39230031607 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -75,18 +75,18 @@ namespace CORBA
 
     // = Pseudo-object methods
     static Context *_duplicate (Context*);
-    static Context *_nil (void);
+    static Context *_nil ();
 
     // = Reference counting.
-    CORBA::ULong _incr_refcount (void);
-    CORBA::ULong _decr_refcount (void);
+    CORBA::ULong _incr_refcount ();
+    CORBA::ULong _decr_refcount ();
 
     // = All the spec-required functions below will just throw a
     //   CORBA::NO_IMPLEMENT exception and do nothing else.
 
-    const char *context_name (void) const;
+    const char *context_name () const;
 
-    CORBA::Context_ptr parent (void) const;
+    CORBA::Context_ptr parent () const;
 
     void create_child (const char *child_ctx_name,
                        CORBA::Context_out child_ctx);
@@ -160,8 +160,8 @@ namespace CORBA
     void remove (CORBA::ULong slot);
 
     /// Increment and decrement ref counts.
-    void _incr_refcount (void);
-    void  _decr_refcount (void);
+    void _incr_refcount ();
+    void  _decr_refcount ();
 
     // Useful for template programming.
     typedef CORBA::ContextList_ptr _ptr_type;
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index d7e2b0a99a3..adc82cb7a4f 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -5,7 +5,7 @@ ACE_INLINE
 CORBA::Context_ptr
 CORBA::Context::_duplicate (CORBA::Context_ptr x)
 {
-  if (x != 0)
+  if (x)
     {
       x->_incr_refcount ();
     }
@@ -15,9 +15,9 @@ CORBA::Context::_duplicate (CORBA::Context_ptr x)
 
 ACE_INLINE
 CORBA::Context_ptr
-CORBA::Context::_nil (void)
+CORBA::Context::_nil ()
 {
-  return (CORBA::Context_ptr)0;
+  return nullptr;
 }
 
 // *************************************************************
@@ -25,29 +25,29 @@ CORBA::Context::_nil (void)
 // *************************************************************
 
 ACE_INLINE
-CORBA::ContextList::ContextList (void)
+CORBA::ContextList::ContextList ()
 {
 }
 
 ACE_INLINE
 CORBA::ULong
-CORBA::ContextList::count (void)
+CORBA::ContextList::count ()
 {
   return (CORBA::ULong) this->ctx_list_.size ();
 }
 
 ACE_INLINE
 CORBA::ContextList_ptr
-CORBA::ContextList::_nil (void)
+CORBA::ContextList::_nil ()
 {
-  return (CORBA::ContextList_ptr)0;
+  return nullptr;
 }
 
 ACE_INLINE
 CORBA::ContextList_ptr
 CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x)
 {
-  if (x != 0)
+  if (x)
     {
       x->_incr_refcount ();
     }
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
index 364dbad4979..1bfa74fede8 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -16,9 +16,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // The pseudo-object _nil method.
 TAO_DII_Reply_Handler_ptr
-TAO_DII_Reply_Handler::_nil (void)
+TAO_DII_Reply_Handler::_nil ()
 {
-  return static_cast<TAO_DII_Reply_Handler_ptr> (0);
+  return nullptr;
 }
 
 // DII Request class implementation
@@ -27,7 +27,7 @@ TAO_DII_Reply_Handler::TAO_DII_Reply_Handler ()
 {
 }
 
-TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler (void)
+TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler ()
 {
 }
 
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
index eeb88e369dd..fd8b33bf261 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -89,7 +89,7 @@ public:
 
   /// CORBA Object related methods
   static TAO_DII_Reply_Handler* _duplicate (TAO_DII_Reply_Handler_ptr);
-  static TAO_DII_Reply_Handler* _nil (void);
+  static TAO_DII_Reply_Handler* _nil ();
   static TAO_DII_Reply_Handler* _narrow (CORBA::Object_ptr);
   static TAO_DII_Reply_Handler* _unchecked_narrow (CORBA::Object_ptr);
 
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index a63b6f5264e..dace7b4b5f4 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -89,7 +89,7 @@ TAO_Dynamic_Adapter_Impl::request_is_nil (CORBA::Request_ptr req)
 void
 TAO_Dynamic_Adapter_Impl::request_release (CORBA::Request_ptr req)
 {
-  if (req != 0)
+  if (req)
     {
       req->_decr_refcount ();
     }
@@ -104,7 +104,7 @@ TAO_Dynamic_Adapter_Impl::server_request_is_nil (CORBA::ServerRequest_ptr req)
 void
 TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
 {
-  if (req != 0)
+  if (req)
     {
       req->_decr_refcount ();
     }
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 40a06e0ded3..82f57f73181 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -67,26 +67,26 @@ CORBA::ExceptionList::remove (CORBA::ULong)
 }
 
 CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_duplicate (void)
+CORBA::ExceptionList::_duplicate ()
 {
   this->_incr_refcount ();
   return this;
 }
 
 void
-CORBA::ExceptionList::_destroy (void)
+CORBA::ExceptionList::_destroy ()
 {
   this->_decr_refcount ();
 }
 
 void
-CORBA::ExceptionList::_incr_refcount (void)
+CORBA::ExceptionList::_incr_refcount ()
 {
   ++this->refcount_;
 }
 
 void
-CORBA::ExceptionList::_decr_refcount (void)
+CORBA::ExceptionList::_decr_refcount ()
 {
   CORBA::ULong const refcount = --this->refcount_;
 
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index a59a7b059eb..8e38a929adf 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -73,7 +73,7 @@ namespace CORBA
 
     void _destroy (void);
 
-    static ExceptionList_ptr _nil (void);
+    static ExceptionList_ptr _nil ();
 
     /// Add a TypeCode to the list.
     void add (CORBA::TypeCode_ptr tc);
@@ -88,8 +88,8 @@ namespace CORBA
     void remove (CORBA::ULong slot);
 
     /// Increment and decrement ref counts.
-    void _incr_refcount (void);
-    void _decr_refcount (void);
+    void _incr_refcount ();
+    void _decr_refcount ();
 
     /// Useful for template programming.
     typedef CORBA::ExceptionList_ptr _ptr_type;
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
index 4178f77d903..d175462de12 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ b/TAO/tao/DynamicInterface/ExceptionList.inl
@@ -2,30 +2,30 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
-CORBA::ExceptionList::ExceptionList (void)
+CORBA::ExceptionList::ExceptionList ()
   : refcount_ (1)
 {
 }
 
 ACE_INLINE
 CORBA::ULong
-CORBA::ExceptionList::count (void)
+CORBA::ExceptionList::count ()
 {
   return (CORBA::ULong) this->tc_list_.size ();
 }
 
 ACE_INLINE
 CORBA::ExceptionList_ptr
-CORBA::ExceptionList::_nil (void)
+CORBA::ExceptionList::_nil ()
 {
-  return static_cast<CORBA::ExceptionList_ptr>(0);
+  return nullptr;
 }
 
 ACE_INLINE
 CORBA::ExceptionList_ptr
 CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x)
 {
-  if (x != 0)
+  if (x)
     {
       x->_incr_refcount ();
     }
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index b2fc6791b79..1dcca1819aa 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -26,13 +26,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Reference counting for DII Request object.
 
 CORBA::ULong
-CORBA::Request::_incr_refcount (void)
+CORBA::Request::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::Request::_decr_refcount (void)
+CORBA::Request::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 19054aa74c2..af1b1f07563 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -162,17 +162,17 @@ namespace CORBA
 
     /// Pseudo object methods.
     static CORBA::Request* _duplicate (CORBA::Request*);
-    static CORBA::Request* _nil (void);
+    static CORBA::Request* _nil ();
 
     // = Reference counting.
-    CORBA::ULong _incr_refcount (void);
-    CORBA::ULong _decr_refcount (void);
+    CORBA::ULong _incr_refcount ();
+    CORBA::ULong _decr_refcount ();
 
     /// Set the lazy evaluation flag.
     void _tao_lazy_evaluation (bool lazy_evaluation);
 
     /// Get the byte order member.
-    int _tao_byte_order (void) const;
+    int _tao_byte_order () const;
 
     /// Set the byte order member.
     void _tao_byte_order (int byte_order);
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 69bf66a866d..ea1b7f79204 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_INLINE CORBA::Request_ptr
 CORBA::Request::_duplicate (CORBA::Request_ptr x)
 {
-  if (x != 0)
+  if (x)
     {
       x->_incr_refcount ();
     }
@@ -13,20 +13,20 @@ CORBA::Request::_duplicate (CORBA::Request_ptr x)
 }
 
 ACE_INLINE CORBA::Request_ptr
-CORBA::Request::_nil (void)
+CORBA::Request::_nil ()
 {
-  return 0;
+  return nullptr;
 }
 
 ACE_INLINE CORBA::Object_ptr
-CORBA::Request::target (void) const
+CORBA::Request::target () const
 {
   return this->target_;
 }
 
 // Return the operation name for the request.
 ACE_INLINE const CORBA::Char *
-CORBA::Request::operation (void) const
+CORBA::Request::operation () const
 {
   return this->opname_;
 }
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 6c4fcd680da..c485c43d3a1 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -20,13 +20,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Reference counting for DSI ServerRequest object.
 CORBA::ULong
-CORBA::ServerRequest::_incr_refcount (void)
+CORBA::ServerRequest::_incr_refcount ()
 {
   return ++this->refcount_;
 }
 
 CORBA::ULong
-CORBA::ServerRequest::_decr_refcount (void)
+CORBA::ServerRequest::_decr_refcount ()
 {
   CORBA::ULong const new_count = --this->refcount_;
 
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 8532a92c237..47660cea05f 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -102,11 +102,11 @@ namespace CORBA
 
     // Pseudo object methods.
     static ServerRequest_ptr _duplicate (ServerRequest_ptr);
-    static ServerRequest_ptr _nil (void);
+    static ServerRequest_ptr _nil ();
 
     // = Reference counting.
-    CORBA::ULong _incr_refcount (void);
-    CORBA::ULong _decr_refcount (void);
+    CORBA::ULong _incr_refcount ();
+    CORBA::ULong _decr_refcount ();
 
     /// Set the lazy evaluation flag.
     void _tao_lazy_evaluation (bool lazy_evaluation);
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
index 460d34c9af0..73b9112cd31 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -13,13 +13,13 @@ CORBA::ServerRequest::_duplicate (CORBA::ServerRequest_ptr x)
 }
 
 ACE_INLINE CORBA::ServerRequest_ptr
-CORBA::ServerRequest::_nil (void)
+CORBA::ServerRequest::_nil ()
 {
-  return static_cast <CORBA::ServerRequest_ptr>(0);
+  return nullptr;
 }
 
 ACE_INLINE CORBA::Context_ptr
-CORBA::ServerRequest::ctx (void) const
+CORBA::ServerRequest::ctx () const
 {
   return this->ctx_;
 }