3 files changed, 31 insertions, 31 deletions

diff --git a/ACE/websvcs/lib/URL_Addr.cpp b/ACE/websvcs/lib/URL_Addr.cpp
index 7439bdd4f7d..5e5a02c9b1f 100644
--- a/ACE/websvcs/lib/URL_Addr.cpp
+++ b/ACE/websvcs/lib/URL_Addr.cpp
@@ -51,7 +51,7 @@ static size_t gopher_size = sizeof(gopher)/sizeof(gopher[0]) - 1;
 #  define ACE_PRINTF_S ACE_TEXT ("%ls")
 #endif
 
-ACE_URL_Addr::ACE_URL_Addr (void)
+ACE_URL_Addr::ACE_URL_Addr ()
   : url_ (0)
 {
 }
@@ -157,7 +157,7 @@ ACE_URL_Addr::known_scheme (const ACE_TCHAR *url)
 
 // ****************************************************************
 
-ACE_URL_Addr_Visitor::~ACE_URL_Addr_Visitor (void)
+ACE_URL_Addr_Visitor::~ACE_URL_Addr_Visitor ()
 {
 }
 
@@ -187,7 +187,7 @@ ACE_URL_Addr_Visitor::visit (ACE_Mailto_Addr*)
 
 // ****************************************************************
 
-ACE_HTTP_Addr::ACE_HTTP_Addr (void)
+ACE_HTTP_Addr::ACE_HTTP_Addr ()
   :  hostname_ (0),
      port_number_ (0),
      path_ (0),
@@ -217,7 +217,7 @@ ACE_HTTP_Addr::ACE_HTTP_Addr (const ACE_HTTP_Addr &addr)
   this->set (addr);
 }
 
-ACE_HTTP_Addr::~ACE_HTTP_Addr (void)
+ACE_HTTP_Addr::~ACE_HTTP_Addr ()
 {
   this->clear ();
   this->hostname_ = 0;
@@ -278,7 +278,7 @@ ACE_HTTP_Addr::set (const ACE_HTTP_Addr &addr)
 }
 
 void
-ACE_HTTP_Addr::clear (void)
+ACE_HTTP_Addr::clear ()
 {
   if (this->hostname_ != 0)
     ACE_OS::free (this->hostname_);
@@ -565,7 +565,7 @@ ACE_HTTP_Addr::accept (ACE_URL_Addr_Visitor *visitor)
 
 // ****************************************************************
 
-ACE_FTP_Addr::ACE_FTP_Addr (void)
+ACE_FTP_Addr::ACE_FTP_Addr ()
   :  user_ (0),
      password_ (0),
      hostname_ (0),
@@ -595,7 +595,7 @@ ACE_FTP_Addr::ACE_FTP_Addr (const ACE_FTP_Addr& addr)
   this->set (addr);
 }
 
-ACE_FTP_Addr::~ACE_FTP_Addr (void)
+ACE_FTP_Addr::~ACE_FTP_Addr ()
 {
   this->clear ();
 }
@@ -652,7 +652,7 @@ ACE_FTP_Addr::set (const ACE_FTP_Addr& addr)
 }
 
 void
-ACE_FTP_Addr::clear (void)
+ACE_FTP_Addr::clear ()
 {
   if (this->hostname_ != 0)
     ACE_OS::free (this->hostname_);
@@ -805,7 +805,7 @@ ACE_FTP_Addr::accept (ACE_URL_Addr_Visitor* visitor)
 
 // ****************************************************************
 
-ACE_Mailto_Addr::ACE_Mailto_Addr (void)
+ACE_Mailto_Addr::ACE_Mailto_Addr ()
   :  user_ (0),
      hostname_ (0),
      headers_ (0)
@@ -831,7 +831,7 @@ ACE_Mailto_Addr::ACE_Mailto_Addr (const ACE_Mailto_Addr &addr)
   this->set (addr);
 }
 
-ACE_Mailto_Addr::~ACE_Mailto_Addr (void)
+ACE_Mailto_Addr::~ACE_Mailto_Addr ()
 {
   this->clear ();
 }
@@ -877,7 +877,7 @@ ACE_Mailto_Addr::set (const ACE_Mailto_Addr &addr)
 }
 
 void
-ACE_Mailto_Addr::clear (void)
+ACE_Mailto_Addr::clear ()
 {
   if (this->user_ != 0)
     ACE_OS::free (this->user_);
diff --git a/ACE/websvcs/lib/URL_Addr.h b/ACE/websvcs/lib/URL_Addr.h
index a3e2ba7ba40..2cf9fe638ff 100644
--- a/ACE/websvcs/lib/URL_Addr.h
+++ b/ACE/websvcs/lib/URL_Addr.h
@@ -34,7 +34,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr : public ACE_Addr
 {
 public:
   /// Constructor.
-  ACE_URL_Addr (void);
+  ACE_URL_Addr ();
 
   /// The copy constructor.
   ACE_URL_Addr (const ACE_URL_Addr& address);
@@ -43,7 +43,7 @@ public:
   ACE_URL_Addr& operator= (const ACE_URL_Addr& address);
 
   /// destructor
-  virtual ~ACE_URL_Addr (void);
+  virtual ~ACE_URL_Addr ();
 
   /// Get the original URL
   const ACE_TCHAR *get_url () const;
@@ -124,7 +124,7 @@ class ACE_WEBSVCS_Export ACE_URL_Addr_Visitor
 {
 public:
   /// Destructor
-  virtual ~ACE_URL_Addr_Visitor (void);
+  virtual ~ACE_URL_Addr_Visitor ();
 
   /**
    * The visit methods for all the hierarchy.
@@ -159,7 +159,7 @@ class ACE_WEBSVCS_Export ACE_HTTP_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_HTTP_Addr (void);
+  ACE_HTTP_Addr ();
 
   /// Construct an HTTP URL from the host, path, query and port.
   ACE_HTTP_Addr (const ACE_TCHAR *host_name,
@@ -183,7 +183,7 @@ public:
   int set (const ACE_HTTP_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_HTTP_Addr (void);
+  virtual ~ACE_HTTP_Addr ();
 
   /**
    * Build the INET_Address implicit in the URL, notice that we
@@ -231,7 +231,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to cleanup resources
-  void clear (void);
+  void clear ();
 
 private:
   /// The host:port component in the URL
@@ -262,7 +262,7 @@ class ACE_WEBSVCS_Export ACE_FTP_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_FTP_Addr (void);
+  ACE_FTP_Addr ();
 
   /// Construct an FTP URL from the host_name, the path, the username
   /// and the password.
@@ -287,7 +287,7 @@ public:
   int set (const ACE_FTP_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_FTP_Addr (void);
+  virtual ~ACE_FTP_Addr ();
 
   /// Get the host name component in the URL
   const ACE_TCHAR *get_hostname () const;
@@ -318,7 +318,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to release the internal resources
-  void clear (void);
+  void clear ();
 
 private:
   /// The login name
@@ -345,7 +345,7 @@ class ACE_WEBSVCS_Export ACE_Mailto_Addr : public ACE_URL_Addr
 {
 public:
   /// Constructor
-  ACE_Mailto_Addr (void);
+  ACE_Mailto_Addr ();
 
   /// Construct an FTP URL from the host, path and headers.
   ACE_Mailto_Addr (const ACE_TCHAR *user,
@@ -367,7 +367,7 @@ public:
   int set (const ACE_Mailto_Addr &addr);
 
   /// Destructor
-  virtual ~ACE_Mailto_Addr (void);
+  virtual ~ACE_Mailto_Addr ();
 
   /// Get the username component in the URL
   const ACE_TCHAR *get_user () const;
@@ -395,7 +395,7 @@ private:
   size_t url_size (int flags = 0) const;
 
   /// Helper method to cleanup resources
-  void clear (void);
+  void clear ();
 
 private:
   ACE_TCHAR *user_;
diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp
index eac973ec5d4..d41958f28cb 100644
--- a/ACE/websvcs/tests/Test_URL_Addr.cpp
+++ b/ACE/websvcs/tests/Test_URL_Addr.cpp
@@ -2,10 +2,10 @@
 #include "ace/Log_Msg.h"
 
 
-void test_http_addr (void);
-void test_ftp_addr (void);
-void test_mailto_addr (void);
-void test_url_addr (void);
+void test_http_addr ();
+void test_ftp_addr ();
+void test_mailto_addr ();
+void test_url_addr ();
 
 int ACE_TMAIN (int, ACE_TCHAR*[])
 {
@@ -42,7 +42,7 @@ int ACE_TMAIN (int, ACE_TCHAR*[])
 #define URL_TEST_ARRAY \
     ACE_TEXT("file:/etc/passwd")
 
-void test_http_addr (void)
+void test_http_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     HTTP_TEST_ARRAY
@@ -82,7 +82,7 @@ void test_http_addr (void)
     }
 }
 
-void test_ftp_addr (void)
+void test_ftp_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     FTP_TEST_ARRAY
@@ -122,7 +122,7 @@ void test_ftp_addr (void)
     }
 }
 
-void test_mailto_addr (void)
+void test_mailto_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     MAILTO_TEST_ARRAY
@@ -162,7 +162,7 @@ void test_mailto_addr (void)
     }
 }
 
-void test_url_addr (void)
+void test_url_addr ()
 {
   static const ACE_TCHAR *addresses[] = {
     HTTP_TEST_ARRAY,