Merge branch 'master' into format-security

1 files changed, 4 insertions, 4 deletions

diff --git a/ACE/ace/Cached_Connect_Strategy_T.h b/ACE/ace/Cached_Connect_Strategy_T.h
index ef2a0a8c33d..dd7ac7d3da2 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.h
+++ b/ACE/ace/Cached_Connect_Strategy_T.h
@@ -57,10 +57,10 @@ public:
     int delete_lock = 0);
 
   /// Destructor
-  virtual ~ACE_Cached_Connect_Strategy_Ex (void);
+  virtual ~ACE_Cached_Connect_Strategy_Ex ();
 
   /// Explicit purging of connection entries from the connection cache.
-  virtual int purge_connections (void);
+  virtual int purge_connections ();
 
   /// Mark as closed (non-locking version). This is used during the cleanup of the
   /// connections purged.
@@ -71,7 +71,7 @@ public:
    * method had to be devised to avoid memory leaks and perform
    * cleanup of the <connection_cache_>.
    */
-  void cleanup (void);
+  void cleanup ();
 
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
@@ -100,7 +100,7 @@ public:
           CCSBASE;
 
   // = Accessor.
-  CACHING_STRATEGY &caching_strategy (void);
+  CACHING_STRATEGY &caching_strategy ();
 
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;