Remove obsolescent (void) in functions with no parameters

13 files changed, 41 insertions, 41 deletions

diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index ba7dab08712..f20c5e9d531 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -26,7 +26,7 @@ extern "C" void handler (int)
 
 //***************************************************************//
 
-Activity::Activity (void)
+Activity::Activity ()
   :builder_ (0),
    barrier_ (0),
    active_task_count_ (0),
@@ -35,7 +35,7 @@ Activity::Activity (void)
   state_lock_ = new ACE_Lock_Adapter <TAO_SYNCH_MUTEX>;
 }
 
-Activity::~Activity (void)
+Activity::~Activity ()
 {
   delete state_lock_;
   delete barrier_;
@@ -48,13 +48,13 @@ Activity::builder (Builder* builder)
 }
 
 CORBA::ORB_ptr
-Activity::orb (void)
+Activity::orb ()
 {
   return orb_.in ();
 }
 
 RTCORBA::Current_ptr
-Activity::current (void)
+Activity::current ()
 {
   return current_.in ();
 }
@@ -101,7 +101,7 @@ Activity::init (int& argc, ACE_TCHAR *argv [])
 }
 
 int
-Activity::resolve_naming_service (void)
+Activity::resolve_naming_service ()
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService");
@@ -119,7 +119,7 @@ Activity::resolve_naming_service (void)
 }
 
 void
-Activity::activate_poa_list (void)
+Activity::activate_poa_list ()
 {
   POA_LIST list;
   int count = builder_->poa_list (list);
@@ -131,7 +131,7 @@ Activity::activate_poa_list (void)
 }
 
 void
-Activity::activate_job_list (void)
+Activity::activate_job_list ()
 {
   JOB_LIST list;
   int count = builder_->job_list (list);
@@ -178,7 +178,7 @@ Activity::activate_job_list (void)
 }
 
 void
-Activity::activate_schedule (void)
+Activity::activate_schedule ()
 {
   TASK_LIST list;
   int count = builder_->task_list (list);
@@ -269,7 +269,7 @@ Activity::job_ended (Job_i* /*ended_job*/)
 }
 
 void
-Activity::check_ifexit (void)
+Activity::check_ifexit ()
 {
   // All tasks have finished and all jobs have been shutdown.
   if (active_task_count_ == 0 && active_job_count_ == 0)
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 8f8ffa04ee2..34582c21a32 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -52,11 +52,11 @@ public:
   void run (int argc, ACE_TCHAR *argv[]);
 
   /// Resolve the naming service.
-  int resolve_naming_service (void);
+  int resolve_naming_service ();
 
   /// = Accessors
-  CORBA::ORB_ptr orb (void);
-  RTCORBA::Current_ptr current (void);
+  CORBA::ORB_ptr orb ();
+  RTCORBA::Current_ptr current ();
   void builder (Builder* builder);
 
   /// Returns priority if server declared model else -1
@@ -71,16 +71,16 @@ public:
 protected:
   /// = Activation methods.
   /// Activate the POA's
-  void activate_poa_list (void);
+  void activate_poa_list ();
 
   /// Activate the task list.
-  void activate_schedule (void);
+  void activate_schedule ();
 
   /// Activate the Job's
-  void activate_job_list (void);
+  void activate_job_list ();
 
   /// Check if we should process exit
-  void check_ifexit (void);
+  void check_ifexit ();
 
   /// Create a file whose name is specified in the -Started_Flag <file_name> argument at startup.
   /// This file flags that the Activity has finished its bootstrapping step.
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 820c9b284f1..d86fabcb697 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -6,7 +6,7 @@
 #include "Thread_Task.h"
 #include "Activity.h"
 
-Builder::Builder(void)
+Builder::Builder()
   :poa_count_ (0),
    poa_list_ (0),
    task_count_ (0),
@@ -17,7 +17,7 @@ Builder::Builder(void)
   ACTIVITY::instance()->builder (this);
 }
 
-Builder::~Builder(void)
+Builder::~Builder()
 {
 }
 
@@ -128,7 +128,7 @@ Builder::init (int argc, ACE_TCHAR *argv[])
 }
 
 int
-Builder::fini (void)
+Builder::fini ()
 {
   // It's only a hack for proper cleanup of this badly designed test.
   static bool already_cleaned = false;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index 7f0ac5e8ec4..cbee3186a06 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -9,13 +9,13 @@ Job_i::Job_i ()
 }
 
 const ACE_CString&
-Job_i::name (void)
+Job_i::name ()
 {
   return job_name_;
 }
 
 const ACE_CString&
-Job_i::poa (void)
+Job_i::poa ()
 {
   return POA_name_;
 }
@@ -51,7 +51,7 @@ Job_i::work (CORBA::ULong work)
 }
 
 void
-Job_i::shutdown (void)
+Job_i::shutdown ()
 {
   ACTIVITY::instance()->job_ended (this);
 }
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 7eda03d5f40..f1e532d5711 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -24,19 +24,19 @@ class Job_i : public POA_Job
 {
  public:
   /// Constructor
-  Job_i (void);
+  Job_i ();
 
   /// Init the state of this object.
   int init (ACE_Arg_Shifter& arg_shifter);
 
   /// = Accessors
-  const ACE_CString& name (void);
-  const ACE_CString& poa (void);
+  const ACE_CString& name ();
+  const ACE_CString& poa ();
 
   /// = inteface Job method implementation.
   virtual void work (CORBA::ULong work);
 
-  virtual void shutdown (void);
+  virtual void shutdown ();
  protected:
   /// The name of this Job
   ACE_CString job_name_;
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index b999f5f3283..581993d6c77 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -2,7 +2,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 
-POA_Holder::POA_Holder (void)
+POA_Holder::POA_Holder ()
   : priority_model_ (RTCORBA::CLIENT_PROPAGATED),
     server_priority_ (0)
 {
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 2e8440ba572..6e46602824b 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -25,7 +25,7 @@ class POA_Holder
 {
  public:
   /// Constructor
-  POA_Holder (void);
+  POA_Holder ();
 
   /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
   int init (ACE_Arg_Shifter& arg_shifter);
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 4bef00b9e64..e03a478974b 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -5,7 +5,7 @@
 
 #include "Task_Stats.h"
 
-Periodic_Task::Periodic_Task (void)
+Periodic_Task::Periodic_Task ()
   :barrier_ (0),
    task_priority_ (0),
    period_ (0),
@@ -86,7 +86,7 @@ Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
 }
 
 const char*
-Periodic_Task::job (void)
+Periodic_Task::job ()
 {
   return name_.c_str ();
 }
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index 1c2e9785e81..05939aaa5b2 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -32,7 +32,7 @@ class Task_Stats;
 class Periodic_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
-  Periodic_Task (void);
+  Periodic_Task ();
   ~Periodic_Task ();
 
   /// Init the state of this object.
@@ -46,7 +46,7 @@ class Periodic_Task : public ACE_Task <ACE_SYNCH>
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
-  const char* job (void);
+  const char* job ();
 
   /// Sets the Job to exec.
   void job (Job_ptr job);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index 9998b2bf3b7..f91efd34b7a 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -5,7 +5,7 @@
 #include "Task_Stats.inl"
 #endif /* __ACE_INLINE__ */
 
-Base_Time::Base_Time (void)
+Base_Time::Base_Time ()
 {
   base_time_ = ACE_OS::gethrtime ();
 }
@@ -26,14 +26,14 @@ Task_Stats::Task_Stats (size_t max_samples)
 {
 }
 
-Task_Stats::~Task_Stats (void)
+Task_Stats::~Task_Stats ()
 {
   delete[] this->time_inv_;
   delete[] this->time_exec_;
 }
 
 int
-Task_Stats::init (void)
+Task_Stats::init ()
 {
   ACE_NEW_RETURN (this->time_inv_, ACE_UINT64[this->max_samples_], -1);
   ACE_NEW_RETURN (this->time_exec_, ACE_UINT64[this->max_samples_], -1);
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 235a40dc7c9..0fa872dd9e8 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -25,7 +25,7 @@
 class Base_Time
 {
  public:
-  Base_Time (void);
+  Base_Time ();
   ACE_hrtime_t base_time_;
 };
 
@@ -43,10 +43,10 @@ class Task_Stats
   Task_Stats (size_t max_samples);
 
   /// Destructor
-  ~Task_Stats (void);
+  ~Task_Stats ();
 
   /// Init
-  int init (void);
+  int init ();
 
   /// Set the base time value.
   void base_time (ACE_hrtime_t time);
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index a9afbc7e28a..d94ab040f49 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -9,7 +9,7 @@
 #include "Task_Stats.h"
 #include "ace/Barrier.h"
 
-Thread_Task::Thread_Task (void)
+Thread_Task::Thread_Task ()
 {
 }
 
@@ -53,7 +53,7 @@ Thread_Task::activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *prio
 }
 
 int
-Thread_Task::svc (void)
+Thread_Task::svc ()
 {
   // if debugging, dump the priority that we're actually at.
   if (TAO_debug_level > 0)
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index a0d97d97da7..27b5b9727b9 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -28,7 +28,7 @@ class Thread_Task : public Periodic_Task
 {
  public:
   /// Constructor
-  Thread_Task (void);
+  Thread_Task ();
 
   /// Activate thread(s).
   virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping);