6 files changed, 26 insertions, 26 deletions
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
index 456ee812712..a6ad523e6fb 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp
@@ -13,7 +13,7 @@ Echo_Client_i::Echo_Client_i (void) : payload_length_ (0)
 }
 
 //Destructor.
-Echo_Client_i::~Echo_Client_i (void)
+Echo_Client_i::~Echo_Client_i ()
 {
   //no-op
 }
diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
index 141a23106ed..c419bf51425 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h
@@ -29,10 +29,10 @@ class Echo_Client_i
 {
 public:
   /// Constructor
-  Echo_Client_i (void);
+  Echo_Client_i ();
 
   /// Destructor
-  ~Echo_Client_i (void);
+  ~Echo_Client_i ();
 
   /// Execute the methods
   int run (const char *, int, ACE_TCHAR **);
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
index 580c0547647..e0cfc3b3fc6 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp
@@ -2,13 +2,13 @@
 
 // Constructor.
 
-Echo_i::Echo_i (void)
+Echo_i::Echo_i ()
 {
 }
 
 // Destructor.
 
-Echo_i::~Echo_i (void)
+Echo_i::~Echo_i ()
 {
 }
 
@@ -80,7 +80,7 @@ Echo_i::echo_string (const char *mesg)
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (void)
+Echo_i::shutdown ()
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\nThe echo server is shutting down\n")));
diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.h b/TAO/tests/Bug_3683_Regression/Echo_i.h
index 0cd222b57eb..6160644d8b9 100644
--- a/TAO/tests/Bug_3683_Regression/Echo_i.h
+++ b/TAO/tests/Bug_3683_Regression/Echo_i.h
@@ -30,10 +30,10 @@ class Echo_i : public POA_Echo
 {
 public:
   /// Constructor.
-  Echo_i (void);
+  Echo_i ();
 
   /// Destructor.
-  virtual ~Echo_i (void);
+  virtual ~Echo_i ();
 
   /// Return the mesg string back from the server.
   virtual Echo::List *echo_list (const char *mesg);
@@ -42,7 +42,7 @@ public:
   virtual char *echo_string (const char *mesg);
 
   /// Shutdown the server.
-  virtual void shutdown (void);
+  virtual void shutdown ();
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 8ecb7692921..186b561ecbf 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -11,7 +11,7 @@
 
 // Constructor.
 template <class Servant>
-Server<Servant>::Server (void)
+Server<Servant>::Server ()
   : servant_ (0)
   , ior_output_file_ (0)
   , ins_ (0)
@@ -25,13 +25,13 @@ Server<Servant>::Server (void)
 
 // Destructor.
 template <class Servant>
-Server<Servant>::~Server (void)
+Server<Servant>::~Server ()
 {
 }
 
 // Parse the command-line arguments and set options.
 template <class Servant> int
-Server<Servant>::parse_args (void)
+Server<Servant>::parse_args ()
 {
   ACE_Get_Opt get_opts (this->argc_, this->argv_,
                         ACE_TEXT ("do:i:"), 1, 0,
@@ -165,7 +165,7 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (void)
+Server<Servant>::run ()
 {
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run () == -1)
@@ -178,7 +178,7 @@ Server<Servant>::run (void)
 
 // Constructor.
 template <class ServerInterface>
-Client<ServerInterface>::Client (void)
+Client<ServerInterface>::Client ()
   : ior_ ("")
   , do_shutdown_ (0)
 {
@@ -218,7 +218,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename)
 
 // Parses the command line arguments and returns an error status.
 template <class ServerInterface> int
-Client<ServerInterface>::parse_args (void)
+Client<ServerInterface>::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_,
                         ACE_TEXT ("df:nk:x"), 1, 0,
@@ -265,7 +265,7 @@ Client<ServerInterface>::parse_args (void)
 }
 
 template <class ServerInterface>
-Client<ServerInterface>::~Client (void)
+Client<ServerInterface>::~Client ()
 {
   this->orb_->destroy ();
 }
@@ -320,7 +320,7 @@ Client<ServerInterface>::init (const char *,
 }
 
 template <class ServerInterface> int
-Client<ServerInterface>::do_shutdown (void)
+Client<ServerInterface>::do_shutdown ()
 {
   // Returns the shutdwon flag
   return this->do_shutdown_;
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h
index 1dc1e1c70dc..244b5b66170 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.h
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.h
@@ -34,10 +34,10 @@ class Server
 {
 public:
   /// Constructor.
-  Server (void);
+  Server ();
 
   /// Destructor.
-  ~Server (void);
+  ~Server ();
 
   /// Initialize the Server state - parsing arguments and waiting.
   /// interface_name is the name used to register the Servant.
@@ -46,7 +46,7 @@ public:
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Ignore this method if you are not testing the InterOperable
   /// Naming Service.
@@ -54,7 +54,7 @@ public:
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// A holder of the servant that does ref counting for him.
   typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var;
@@ -94,10 +94,10 @@ class Client
 {
 public:
   /// Constructor.
-  Client (void);
+  Client ();
 
   /// Destructor.
-  ~Client (void);
+  ~Client ();
 
   /// Initialize the client communication endpoint with server.
   int init (const char *name, int argc, ACE_TCHAR *argv[]);
@@ -106,7 +106,7 @@ public:
   ServerInterface *operator-> () { return server_.in (); }
 
   /// Returns the shutdown flag.
-  int do_shutdown (void);
+  int do_shutdown ();
 
   /// Fills in the shutdwon flag.
   void do_shutdown (int);
@@ -114,7 +114,7 @@ public:
   /// Initialize naming service
   int obtain_initial_references (const char *name);
 
-  CORBA::ORB_ptr orb (void)
+  CORBA::ORB_ptr orb ()
     {
       return CORBA::ORB::_duplicate (this->orb_.in ());
     }
@@ -124,7 +124,7 @@ private:
   int read_ior (ACE_TCHAR *filename);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// Remember our orb.
   CORBA::ORB_var orb_;