Use nullptr and cleanup

    * TAO/tao/AnyTypeCode/NVList.inl:
    * TAO/tao/AnyTypeCode/TypeCode.inl:
    * TAO/tao/CORBA_methods.h:
    * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
    * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h:
    * TAO/tao/DynamicInterface/Context.cpp:
    * TAO/tao/DynamicInterface/Context.h:
    * TAO/tao/DynamicInterface/Context.inl:
    * TAO/tao/DynamicInterface/DII_Reply_Handler.cpp:
    * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
    * TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp:
    * TAO/tao/DynamicInterface/ExceptionList.cpp:
    * TAO/tao/DynamicInterface/ExceptionList.h:
    * TAO/tao/DynamicInterface/ExceptionList.inl:
    * TAO/tao/DynamicInterface/Request.cpp:
    * TAO/tao/DynamicInterface/Request.h:
    * TAO/tao/DynamicInterface/Request.inl:
    * TAO/tao/DynamicInterface/Server_Request.cpp:
    * TAO/tao/DynamicInterface/Server_Request.h:
    * TAO/tao/DynamicInterface/Server_Request.inl:
    * TAO/tao/Environment.inl:
    * TAO/tao/IORTable/IOR_Table_Impl.h:
    * TAO/tao/IORTable/Locate_ResponseHandler.cpp:
    * TAO/tao/IORTable/Locate_ResponseHandler.h:
    * TAO/tao/LocalObject.inl:
    * TAO/tao/ORB.inl:
    * TAO/tao/Object.inl:
    * TAO/tao/PI/ORBInitInfo.h:
    * TAO/tao/Principal.h:
    * TAO/tao/Principal.inl:
    * TAO/tao/RTCORBA/Priority_Mapping_Manager.h:
    * TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h:
    * TAO/tao/RTScheduling/RTScheduler_Manager.h:
    * TAO/tao/Valuetype/AbstractBase.inl:

3 files changed, 8 insertions, 10 deletions

diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index 09837c238a2..be602fb44f6 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -43,16 +43,15 @@ class TAO_IORTable_Export TAO_IOR_Table_Impl
     public virtual ::CORBA::LocalObject
 {
 public:
-  static TAO_IOR_Table_Impl_ptr
-  _nil (void)
+  static TAO_IOR_Table_Impl_ptr _nil ()
   {
-    return static_cast<TAO_IOR_Table_Impl_ptr> (0);
+    return nullptr;
   }
 
   /// Constructor
-  TAO_IOR_Table_Impl (void);
+  TAO_IOR_Table_Impl ();
 
-  virtual bool async_available (void) { return false; }
+  virtual bool async_available () { return false; }
 
   /// Find the object, using the locator if it is not on the table.
   char *find (const char *object_key);
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index db75e4ff159..74dc4170f9f 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -25,12 +25,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // The pseudo-object _nil method.
 TAO_AMH_Locate_ResponseHandler_ptr
-TAO_AMH_Locate_ResponseHandler::_nil (void)
+TAO_AMH_Locate_ResponseHandler::_nil ()
 {
-  return (TAO_AMH_Locate_ResponseHandler_ptr) 0;
+  return nullptr;
 }
 
-
 TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler (
     TAO_ServerRequest & sr)
   : TAO_AMH_Response_Handler (),
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index 81d4ce29cf5..788c66983b0 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
@@ -114,13 +114,13 @@ public:
   /// CORBA Object related methods
   static TAO_AMH_Locate_ResponseHandler* _duplicate (
              TAO_AMH_Locate_ResponseHandler_ptr);
-  static TAO_AMH_Locate_ResponseHandler* _nil (void);
+  static TAO_AMH_Locate_ResponseHandler* _nil ();
   static TAO_AMH_Locate_ResponseHandler* _narrow (CORBA::Object_ptr);
   static TAO_AMH_Locate_ResponseHandler* _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);