14 files changed, 49 insertions, 49 deletions
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index e6c22dccfd2..dd925c6cedc 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -13,13 +13,13 @@
 
 #include "Factory_Finder.h"
 
-Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server ()
 :   debug_level_ (1)
 {
   // Nothing
 }
 
-Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
+Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server ()
 {
   try
     {
@@ -146,7 +146,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 }
 
 int
-Quoter_Factory_Finder_Server::run (void)
+Quoter_Factory_Finder_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -161,7 +161,7 @@ Quoter_Factory_Finder_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Factory_Finder_Server::parse_args (void)
+Quoter_Factory_Finder_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("?d:"));
   int opt;
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 1ca45ac5e93..5dcb8c46ad0 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -31,19 +31,19 @@ class Quoter_Factory_Finder_Server
 {
 public:
   /// Default constructor
-  Quoter_Factory_Finder_Server (void);
+  Quoter_Factory_Finder_Server ();
 
   /// Destructor
-  ~Quoter_Factory_Finder_Server (void);
+  ~Quoter_Factory_Finder_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the orb
-  int run (void);
+  int run ();
 
   /// parse the passed parameters
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 461ccaccd91..c67a55c1bff 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -26,7 +26,7 @@ Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
+Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i ()
 {
   // Nothing
 }
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index aa6409d0e7f..32bfe203aeb 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -25,7 +25,7 @@ class Quoter_Factory_Finder_i : public POA_Stock::Quoter_Factory_Finder
 {
 public:
   Quoter_Factory_Finder_i (int debug_level = 1);
-  ~Quoter_Factory_Finder_i (void);
+  ~Quoter_Factory_Finder_i ();
 
   /**
    * Returns a sequence of Factories if factories matching the
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index c4a09c2923d..a008cc8d16a 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -14,13 +14,13 @@
 
 #include "orbsvcs/LifeCycleServiceC.h"
 
-Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server ()
 : use_LifeCycle_Service_ (0),
   debug_level_ (1)
 {
 }
 
-Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
+Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server ()
 {
   try
     {
@@ -195,7 +195,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (void)
+Quoter_Generic_Factory_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -209,7 +209,7 @@ Quoter_Generic_Factory_Server::run (void)
 // Function get_options.
 
 u_int
-Quoter_Generic_Factory_Server::parse_args (void)
+Quoter_Generic_Factory_Server::parse_args ()
 {
   ACE_Get_Opt get_opt (this->argc_, this->argv_, ACE_TEXT("l?d:"));
   int opt;
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 8f4f86191ac..71c994a0c1a 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -31,20 +31,20 @@ class Quoter_Generic_Factory_Server
 {
 public:
   /// Default constructor
-  Quoter_Generic_Factory_Server (void);
+  Quoter_Generic_Factory_Server ();
 
   /// Destructor
-  ~Quoter_Generic_Factory_Server (void);
+  ~Quoter_Generic_Factory_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc,
             ACE_TCHAR *argv[]);
 
   /// Run the orb.
-  int run (void);
+  int run ();
 
   /// Parse the passed parameters.
-  u_int parse_args (void);
+  u_int parse_args ();
 
 private:
   /// instance of the ORB Manager
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 66a60ebb862..57165cbde26 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -25,7 +25,7 @@ Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level)
 }
 
 // Destructor.
-Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
+Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i ()
 {
 }
 
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index cb6d51e9179..7515831d311 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -26,7 +26,7 @@ class Quoter_Generic_Factory_i : public POA_Stock::Quoter_Generic_Factory
 {
 public:
   Quoter_Generic_Factory_i (int debug_level = 1);
-  ~Quoter_Generic_Factory_i (void);
+  ~Quoter_Generic_Factory_i ();
 
   /// Returns true if the Generic Factory is able to forward a request
   /// for creating an object described by the <factory_key>.
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 7c25746e4a4..c789ac4b870 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -27,7 +27,7 @@ Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr)
 
 // Destructor
 
-Quoter_Factory_i::~Quoter_Factory_i (void)
+Quoter_Factory_i::~Quoter_Factory_i ()
 {
   for (size_t i = 0; i < this->quoter_num_; i++)
     delete this->my_quoters_[i];
@@ -37,7 +37,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (void)
+int Quoter_Factory_i::init ()
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -104,7 +104,7 @@ Quoter_i::Quoter_i (const char *name,
 
 // Destructor
 
-Quoter_i::~Quoter_i (void)
+Quoter_i::~Quoter_i ()
 {
   // Nothing
 }
@@ -248,7 +248,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (void)
+Quoter_i::remove ()
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n"));
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 476ce8b769e..2539a4261f3 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -38,7 +38,7 @@ public:
             PortableServer::POA_ptr poa_ptr = 0);
 
   /// Destructor
-  ~Quoter_i (void);
+  ~Quoter_i ();
 
   /// Returns the current quote for the stock <stock_name>
   virtual CORBA::Long get_quote (const char *stock_name);
@@ -54,7 +54,7 @@ public:
                      const CosLifeCycle::Criteria &the_criteria);
 
   /// Removes the object.
-  virtual void remove (void);
+  virtual void remove ();
 
 private:
   /// This flag defines if a Generic Factory is used (0 by default) or
@@ -84,10 +84,10 @@ public:
   Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr);
 
   /// Destructor.
-  ~Quoter_Factory_i (void);
+  ~Quoter_Factory_i ();
 
   /// Initialize everything in the factory
-  int init (void);
+  int init ();
 
   /// Return the quoter by the id <name>.
   virtual Stock::Quoter_ptr create_quoter (const char *name);
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index a65a944c5e1..e5eb55e1407 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -11,7 +11,7 @@ Quoter_Task::Quoter_Task (int argc, ACE_TCHAR **argv)
 }
 
 int
-Quoter_Task::svc (void)
+Quoter_Task::svc ()
 {
   if (this->quoter_client.init (this->argc_, this->argv_) == -1)
     return 1;
@@ -20,7 +20,7 @@ Quoter_Task::svc (void)
 }
 
 // Constructor.
-Quoter_Client::Quoter_Client (void)
+Quoter_Client::Quoter_Client ()
   : quoter_factory_key_ (0),
     quoter_key_ (ACE_OS::strdup ("key0")),
     shutdown_ (0),
@@ -34,7 +34,7 @@ Quoter_Client::Quoter_Client (void)
 // Parses the command line arguments and returns an error status.
 
 int
-Quoter_Client::parse_args (void)
+Quoter_Client::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("n:d:lx"));
   int opt;
@@ -78,7 +78,7 @@ Quoter_Client::parse_args (void)
 }
 
 int
-Quoter_Client::run (void)
+Quoter_Client::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -135,7 +135,7 @@ Quoter_Client::run (void)
   return 0;
 }
 
-Quoter_Client::~Quoter_Client (void)
+Quoter_Client::~Quoter_Client ()
 {
   // Free resources
   // Close the ior files
@@ -146,7 +146,7 @@ Quoter_Client::~Quoter_Client (void)
 }
 
 int
-Quoter_Client::init_naming_service (void)
+Quoter_Client::init_naming_service ()
 {
   const char *exception_message = "Null Message";
 
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 35721ddd9f1..298fb1075f0 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -37,11 +37,11 @@ class Quoter_Client
 {
 public:
   // = Constructor and destructor.
-  Quoter_Client (void);
-  ~Quoter_Client (void);
+  Quoter_Client ();
+  ~Quoter_Client ();
 
   /// Execute client example code.
-  int run (void);
+  int run ();
 
   /// Initialize the client communication endpoint with server.
   int init (int argc, ACE_TCHAR **argv);
@@ -51,10 +51,10 @@ private:
   CORBA::ORB_var orb_;
 
   /// Function to initialize the naming service.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
+  int parse_args ();
 
   /// # of arguments on the command line.
   int argc_;
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 6907e551726..476d2911c17 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -12,7 +12,7 @@
 #include "server.h"
 #include "tao/ORB_Core.h"
 
-Quoter_Server::Quoter_Server (void)
+Quoter_Server::Quoter_Server ()
   : num_of_objs_ (1),
     quoter_Factory_i_ptr_ (0),
     debug_level_ (1)
@@ -20,7 +20,7 @@ Quoter_Server::Quoter_Server (void)
 }
 
 int
-Quoter_Server::parse_args (void)
+Quoter_Server::parse_args ()
 {
   ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:n:"));
   int c;
@@ -141,7 +141,7 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (void)
+Quoter_Server::init_naming_service ()
 {
   const char *exception_message = "Null Message";
   try
@@ -192,7 +192,7 @@ Quoter_Server::init_naming_service (void)
 }
 
 int
-Quoter_Server::run (void)
+Quoter_Server::run ()
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -203,7 +203,7 @@ Quoter_Server::run (void)
   return 0;
 }
 
-Quoter_Server::~Quoter_Server (void)
+Quoter_Server::~Quoter_Server ()
 {
   try
     {
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index cefb4aca3a4..2658f5c0e29 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -42,24 +42,24 @@ class Quoter_Server
 {
 public:
   /// Default constructor
-  Quoter_Server (void);
+  Quoter_Server ();
 
   /// Destructor
-  ~Quoter_Server (void);
+  ~Quoter_Server ();
 
   /// Initialize the Quoter_Server state - parsing arguments and ...
   int init (int argc, ACE_TCHAR *argv[]);
 
   /// Run the server.
-  int run (void);
+  int run ();
 
 private:
   /// Parses the commandline arguments.
-  int parse_args (void);
+  int parse_args ();
 
   /// Initializes the name server and registers cubit factory with the
   /// name server.
-  int init_naming_service (void);
+  int init_naming_service ();
 
   /// Number of quoter objects we export.
   int num_of_objs_;