5 files changed, 24 insertions, 24 deletions

diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 54391be46d0..3dafb41d56a 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -49,14 +49,14 @@ ACE_TMAIN(int, ACE_TCHAR *[])
 class Options
 {
 public:
-  Options (void);
-  ~Options (void);
+  Options ();
+  ~Options ();
 
   int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc, ACE_TCHAR *argv[]);
-  void print_usage_and_die (void);
+  void print_usage_and_die ();
 
 private:
   ACE_TCHAR progname[128];
@@ -75,7 +75,7 @@ private:
 
 typedef ACE_Singleton<Options, ACE_Mutex> OPTIONS;
 
-Options::Options (void)
+Options::Options ()
   : opt_setargs (0),
     opt_args (0),
     opt_install (0),
@@ -91,13 +91,13 @@ Options::Options (void)
   ACE::init ();
 }
 
-Options::~Options (void)
+Options::~Options ()
 {
   ACE::fini ();
 }
 
 void
-Options::print_usage_and_die (void)
+Options::print_usage_and_die ()
 {
   ORBSVCS_DEBUG ((LM_INFO,
               ACE_TEXT ("Usage: %s")
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index cde1f49c6c3..3e1b4adbd72 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -14,7 +14,7 @@
 #define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT ("TaoNotifyServiceOptions")
 #define TAO_SERVICE_PARAM_COUNT ACE_TEXT ("TaoServiceParameterCount")
 
-TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::TAO_NT_Notify_Service ()
   : argc_ (0),
     argc_save_ (0),
     argv_ (0),
@@ -22,7 +22,7 @@ TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
 {
 }
 
-TAO_NT_Notify_Service::~TAO_NT_Notify_Service (void)
+TAO_NT_Notify_Service::~TAO_NT_Notify_Service ()
 {
   if (argv_save_)
     {
@@ -238,7 +238,7 @@ TAO_NT_Notify_Service::init (int argc,
 }
 
 int
-TAO_NT_Notify_Service::svc (void)
+TAO_NT_Notify_Service::svc ()
 {
   TAO_Notify_Service_Driver notify_service;
 
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 1548b5606ec..f99ef755182 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -34,8 +34,8 @@ class TAO_NT_Notify_Service : public ACE_NT_Service
 public:
   typedef TAO_SYNCH_RECURSIVE_MUTEX MUTEX;
 
-  TAO_NT_Notify_Service (void);
-  virtual ~TAO_NT_Notify_Service (void);
+  TAO_NT_Notify_Service ();
+  virtual ~TAO_NT_Notify_Service ();
 
   /// We override <handle_control> because it handles stop requests
   /// privately.
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index f46860dbcec..03fb45de211 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -31,7 +31,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Logging_Strategy.h"
 
-TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::TAO_Notify_Service_Driver ()
 : notify_service_ (0)
 , bootstrap_ (false)
 , use_name_svc_ (true)
@@ -47,7 +47,7 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
 {
 }
 
-TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
+TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver ()
 {
 }
 
@@ -335,7 +335,7 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-TAO_Notify_Service_Driver::resolve_naming_service (void)
+TAO_Notify_Service_Driver::resolve_naming_service ()
 {
   try
     {
@@ -366,7 +366,7 @@ TAO_Notify_Service_Driver::resolve_naming_service (void)
 }
 
 int
-TAO_Notify_Service_Driver::run (void)
+TAO_Notify_Service_Driver::run ()
 {
   if (TAO_debug_level > 0 )
     ORBSVCS_DEBUG ((LM_DEBUG,
@@ -388,7 +388,7 @@ TAO_Notify_Service_Driver::run (void)
 }
 
 int
-TAO_Notify_Service_Driver::fini (void)
+TAO_Notify_Service_Driver::fini ()
 {
   /// Release all the _vars as the ORB about to go away.
   CosNotifyChannelAdmin::EventChannelFactory_var factory =
@@ -689,7 +689,7 @@ LoggingWorker::start ()
 }
 
 int
-LoggingWorker::svc (void)
+LoggingWorker::svc ()
 {
   if (TAO_debug_level > 0)
     {
@@ -719,7 +719,7 @@ LoggingWorker::end ()
     }
 }
 
-Worker::Worker (void)
+Worker::Worker ()
 {
 }
 
@@ -730,7 +730,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 }
 
 int
-Worker::svc (void)
+Worker::svc ()
 {
 #if 0
   // ACE_Thread::getprio() fails on systems that do not support thread
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 486fdbd1e3f..bcc90d11e45 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -57,7 +57,7 @@ class Worker : public ACE_Task_Base
 {
 public:
   /// ctor
-  Worker (void);
+  Worker ();
 
   void orb (CORBA::ORB_ptr orb);
 
@@ -82,10 +82,10 @@ friend class LoggingWorker;
 
 public:
   /// Constructor.
-  TAO_Notify_Service_Driver (void);
+  TAO_Notify_Service_Driver ();
 
   /// Destructor.
-  virtual ~TAO_Notify_Service_Driver (void);
+  virtual ~TAO_Notify_Service_Driver ();
 
   /// Initializes the Service.
   /// Returns 0 on success, -1 on error.
@@ -93,7 +93,7 @@ public:
 
   /// run the Service.
   /// Returns 0 on success, -1 on error.
-  int run (void);
+  int run ();
 
   /// Shutdown the Service.
   /// Returns 0 on success, -1 on error.
@@ -112,7 +112,7 @@ protected:
   TAO_Notify_Service* notify_service_;
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// Parses the command line arguments.
   int parse_args (int argc, ACE_TCHAR *argv []);