diff options
author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
---|---|---|
committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
commit | 3da59eac098c1ef9d2c98f2079185ff35c3b6105 (patch) | |
tree | 379c29e09bf55597fe6740cd163478cd1204a181 /TAO/tao/Dynamic_TP | |
parent | fe03724176dcfd20e0f9a6e493198469242be6b6 (diff) | |
download | ATCD-3da59eac098c1ef9d2c98f2079185ff35c3b6105.tar.gz |
Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'TAO/tao/Dynamic_TP')
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Config.cpp | 10 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Config.h | 10 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_ORBInitializer.h | 2 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_ORB_Loader.h | 4 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_POA_Loader.h | 4 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Task.cpp | 12 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Task.h | 10 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp | 16 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h | 16 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp | 26 | ||||
-rw-r--r-- | TAO/tao/Dynamic_TP/DTP_Thread_Pool.h | 26 |
13 files changed, 72 insertions, 72 deletions
diff --git a/TAO/tao/Dynamic_TP/DTP_Config.cpp b/TAO/tao/Dynamic_TP/DTP_Config.cpp index ddde096cb16..5577389cca4 100644 --- a/TAO/tao/Dynamic_TP/DTP_Config.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Config.cpp @@ -10,17 +10,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer (void) +TAO_DTP_Config_Registry_Installer::TAO_DTP_Config_Registry_Installer () { ACE_Service_Config::process_directive (ace_svc_desc_TAO_DTP_Config_Registry); } -TAO_DTP_Config_Registry::TAO_DTP_Config_Registry (void) +TAO_DTP_Config_Registry::TAO_DTP_Config_Registry () { } -TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry (void) +TAO_DTP_Config_Registry::~TAO_DTP_Config_Registry () { } @@ -53,11 +53,11 @@ TAO_DTP_Config_Registry::rebind (const ACE_CString& name, //------------------------------------------------------------------------- -TAO_DTP_Config::TAO_DTP_Config (void) +TAO_DTP_Config::TAO_DTP_Config () { } -TAO_DTP_Config::~TAO_DTP_Config (void) +TAO_DTP_Config::~TAO_DTP_Config () { } diff --git a/TAO/tao/Dynamic_TP/DTP_Config.h b/TAO/tao/Dynamic_TP/DTP_Config.h index 1cb1cb90ead..9b9087b19f2 100644 --- a/TAO/tao/Dynamic_TP/DTP_Config.h +++ b/TAO/tao/Dynamic_TP/DTP_Config.h @@ -52,14 +52,14 @@ struct TAO_Dynamic_TP_Export TAO_DTP_Definition class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry_Installer { public: - TAO_DTP_Config_Registry_Installer (void); + TAO_DTP_Config_Registry_Installer (); }; class TAO_Dynamic_TP_Export TAO_DTP_Config_Registry : public ACE_Service_Object { public: - TAO_DTP_Config_Registry (void); - virtual ~TAO_DTP_Config_Registry (void); + TAO_DTP_Config_Registry (); + virtual ~TAO_DTP_Config_Registry (); virtual int init (int argc, ACE_TCHAR* []); @@ -78,10 +78,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_Config : public ACE_Service_Object { public: /// Constructor. - TAO_DTP_Config (void); + TAO_DTP_Config (); /// Destructor. - virtual ~TAO_DTP_Config (void); + virtual ~TAO_DTP_Config (); /// Read a definition parameter set from the supplied args. /// There must be a -TPName argument, which, if replicated will cause the set to be ignored, unless -TPOverwrite is also set diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h index fd884660896..2bb8ff66e58 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.h @@ -42,7 +42,7 @@ class TAO_DTP_ORBInitializer , public virtual ::CORBA::LocalObject { public: - TAO_DTP_ORBInitializer (void); + TAO_DTP_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp index 06f5b83a5b5..e6d46069100 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.cpp @@ -14,12 +14,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader (void) +TAO_DTP_ORB_Loader::TAO_DTP_ORB_Loader () : initialized_ (false) { } -TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader (void) +TAO_DTP_ORB_Loader::~TAO_DTP_ORB_Loader () { } diff --git a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h index 8b81afd949f..825daa1e499 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h +++ b/TAO/tao/Dynamic_TP/DTP_ORB_Loader.h @@ -34,10 +34,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_ORB_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_DTP_ORB_Loader (void); + TAO_DTP_ORB_Loader (); /// Destructor. - virtual ~TAO_DTP_ORB_Loader (void); + virtual ~TAO_DTP_ORB_Loader (); /// Initialize the DynamicTP loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp index 4f06c6d112c..408cc1f868d 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.cpp @@ -15,11 +15,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DTP_POA_Loader::TAO_DTP_POA_Loader (void) +TAO_DTP_POA_Loader::TAO_DTP_POA_Loader () { } -TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader (void) +TAO_DTP_POA_Loader::~TAO_DTP_POA_Loader () { } diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h index a0a021149f0..99e9aa1d0ef 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Loader.h +++ b/TAO/tao/Dynamic_TP/DTP_POA_Loader.h @@ -32,10 +32,10 @@ class TAO_Dynamic_TP_Export TAO_DTP_POA_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_DTP_POA_Loader (void); + TAO_DTP_POA_Loader (); /// Destructor. - virtual ~TAO_DTP_POA_Loader (void); + virtual ~TAO_DTP_POA_Loader (); /// Initialize the DynamicTP loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp index 80a3bbd2dd2..99d6ca3609c 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp @@ -269,21 +269,21 @@ TAO_DTP_Task::clear_request (TAO::CSD::TP_Request_Handle &r) } void -TAO_DTP_Task::add_busy (void) +TAO_DTP_Task::add_busy () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_); ++this->busy_threads_; } void -TAO_DTP_Task::remove_busy (void) +TAO_DTP_Task::remove_busy () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_); --this->busy_threads_; } void -TAO_DTP_Task::add_active (void) +TAO_DTP_Task::add_active () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->aw_lock_); ++this->active_count_; @@ -303,7 +303,7 @@ TAO_DTP_Task::remove_active (bool force) } bool -TAO_DTP_Task::need_active (void) +TAO_DTP_Task::need_active () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->aw_lock_, false); return ((this->busy_threads_ == static_cast<unsigned long> (this->active_count_)) && @@ -312,14 +312,14 @@ TAO_DTP_Task::need_active (void) } bool -TAO_DTP_Task::above_minimum (void) +TAO_DTP_Task::above_minimum () { return this->min_pool_threads_ > 0 && this->active_count_ > this->min_pool_threads_; } int -TAO_DTP_Task::svc (void) +TAO_DTP_Task::svc () { this->add_busy (); if (TAO_debug_level > 4) diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h index 71c513a87da..ae858e9f443 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.h +++ b/TAO/tao/Dynamic_TP/DTP_Task.h @@ -124,12 +124,12 @@ private: /// release the request, reset the accepting flag if necessary void clear_request (TAO::CSD::TP_Request_Handle &r); - void add_busy (void); - void remove_busy (void); - void add_active (void); + void add_busy (); + void remove_busy (); + void add_active (); bool remove_active (bool); - bool need_active (void); - bool above_minimum (void); + bool need_active (); + bool above_minimum (); typedef TAO_SYNCH_MUTEX LockType; typedef TAO_Condition<LockType> ConditionType; diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp index 4fcd243675b..500efca43f4 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp @@ -27,7 +27,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::TAO_DTP_Thread_Lane_Resources_Manager TAO_DTP_Thread_Pool_Manager (orb_core)); } -TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (void) +TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager () { // Delete the default resources. delete this->default_lane_resources_; @@ -37,7 +37,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (v } int -TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void) +TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources () { TAO_ORB_Parameters *params = this->orb_core_->orb_params (); @@ -56,14 +56,14 @@ TAO_DTP_Thread_Lane_Resources_Manager::open_default_resources (void) } void -TAO_DTP_Thread_Lane_Resources_Manager::finalize (void) +TAO_DTP_Thread_Lane_Resources_Manager::finalize () { // Finalize default resources. this->default_lane_resources_->finalize (); } void -TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void) +TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor () { // Shutdown default reactors. this->default_lane_resources_->shutdown_reactor (); @@ -71,7 +71,7 @@ TAO_DTP_Thread_Lane_Resources_Manager::shutdown_reactor (void) } void -TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports (void) +TAO_DTP_Thread_Lane_Resources_Manager::close_all_transports () { // Shutdown default reactors. this->default_lane_resources_->close_all_transports (); @@ -84,19 +84,19 @@ TAO_DTP_Thread_Lane_Resources_Manager::is_collocated (const TAO_MProfile &mprofi } TAO_Thread_Lane_Resources & -TAO_DTP_Thread_Lane_Resources_Manager::lane_resources (void) +TAO_DTP_Thread_Lane_Resources_Manager::lane_resources () { return *this->default_lane_resources_; } TAO_Thread_Lane_Resources & -TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources (void) +TAO_DTP_Thread_Lane_Resources_Manager::default_lane_resources () { return *this->default_lane_resources_; } TAO_DTP_Thread_Pool_Manager & -TAO_DTP_Thread_Lane_Resources_Manager::tp_manager (void) +TAO_DTP_Thread_Lane_Resources_Manager::tp_manager () { return *this->tp_manager_; } diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h index a0558483913..f84d06c5422 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.h @@ -44,31 +44,31 @@ public: TAO_DTP_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_DTP_Thread_Lane_Resources_Manager (void); + ~TAO_DTP_Thread_Lane_Resources_Manager (); /// Finalize resources. - void finalize (void); + void finalize (); /// Open default resources. - int open_default_resources (void); + int open_default_resources (); /// Shutdown reactor. - void shutdown_reactor (void); + void shutdown_reactor (); /// Certain ORB policies such as dropping replies on shutdown /// would need cleanup of transports to wake threads up. - void close_all_transports (void); + void close_all_transports (); /// Does @a mprofile belong to us? int is_collocated (const TAO_MProfile &mprofile); /// @name Accessors // @{ - TAO_Thread_Lane_Resources &lane_resources (void); + TAO_Thread_Lane_Resources &lane_resources (); - TAO_Thread_Lane_Resources &default_lane_resources (void); + TAO_Thread_Lane_Resources &default_lane_resources (); - TAO_DTP_Thread_Pool_Manager &tp_manager (void); + TAO_DTP_Thread_Pool_Manager &tp_manager (); // @} diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index d60b328af5b..18627baba14 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -26,7 +26,7 @@ TAO_DTP_New_Leader_Generator::TAO_DTP_New_Leader_Generator ( } bool -TAO_DTP_New_Leader_Generator::no_leaders_available (void) +TAO_DTP_New_Leader_Generator::no_leaders_available () { return this->pool_.new_dynamic_thread (); } @@ -38,7 +38,7 @@ TAO_DTP_Termination_Waiter::TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &p) } int -TAO_DTP_Termination_Waiter::svc (void) +TAO_DTP_Termination_Waiter::svc () { do { @@ -61,7 +61,7 @@ TAO_DTP_Thread_Pool_Threads::TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &p } int -TAO_DTP_Thread_Pool_Threads::svc (void) +TAO_DTP_Thread_Pool_Threads::svc () { if (TAO_debug_level > 7) { @@ -169,7 +169,7 @@ TAO_DTP_Thread_Pool_Threads::run (TAO_ORB_Core &orb_core) } bool -TAO_DTP_Thread_Pool::above_minimum (void) +TAO_DTP_Thread_Pool::above_minimum () { return this->definition_.min_threads_ > 0 && (int)this->active_count_ > this->definition_.min_threads_; @@ -187,7 +187,7 @@ TAO_DTP_Thread_Pool::current_threads () const } void -TAO_DTP_Thread_Pool::add_active (void) +TAO_DTP_Thread_Pool::add_active () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); ++this->active_count_; @@ -206,7 +206,7 @@ TAO_DTP_Thread_Pool::remove_active (bool force) } int -TAO_DTP_Thread_Pool::create_initial_threads (void) +TAO_DTP_Thread_Pool::create_initial_threads () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, @@ -236,7 +236,7 @@ TAO_DTP_Thread_Pool::create_initial_threads (void) } bool -TAO_DTP_Thread_Pool::new_dynamic_thread (void) +TAO_DTP_Thread_Pool::new_dynamic_thread () { // Note that we are checking this condition below without the lock // held. @@ -393,17 +393,17 @@ TAO_DTP_Thread_Pool::TAO_DTP_Thread_Pool (TAO_DTP_Thread_Pool_Manager &manager, } void -TAO_DTP_Thread_Pool::open (void) +TAO_DTP_Thread_Pool::open () { // Nothing to do for now } -TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool (void) +TAO_DTP_Thread_Pool::~TAO_DTP_Thread_Pool () { } void -TAO_DTP_Thread_Pool::shutting_down (void) +TAO_DTP_Thread_Pool::shutting_down () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, @@ -416,7 +416,7 @@ TAO_DTP_Thread_Pool::shutting_down (void) void -TAO_DTP_Thread_Pool::wait (void) +TAO_DTP_Thread_Pool::wait () { this->waiter_.wait (); } @@ -440,7 +440,7 @@ TAO_DTP_Thread_Pool_Manager::TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core { } -TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void) +TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager () { // Delete all the pools. for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin (); @@ -451,7 +451,7 @@ TAO_DTP_Thread_Pool_Manager::~TAO_DTP_Thread_Pool_Manager (void) void -TAO_DTP_Thread_Pool_Manager::wait (void) +TAO_DTP_Thread_Pool_Manager::wait () { for (THREAD_POOLS::ITERATOR iterator = this->thread_pools_.begin (); iterator != this->thread_pools_.end (); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index fc7d32d2ff0..9dbc121e046 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -53,7 +53,7 @@ public: /// Leader/Follower class uses this method to notify the system that /// we are out of leaders. - bool no_leaders_available (void); + bool no_leaders_available (); private: /// Pool associated with this leader generator. @@ -75,7 +75,7 @@ public: TAO_DTP_Thread_Pool_Threads (TAO_DTP_Thread_Pool &pool); /// Method executed when a thread is spawned. - int svc (void); + int svc (); /// Accessor to the pool to which this thread belongs to. TAO_DTP_Thread_Pool &pool () const; @@ -102,7 +102,7 @@ public: TAO_DTP_Termination_Waiter (TAO_DTP_Thread_Pool &pool); /// Method executed when a thread is spawned. - int svc (void); + int svc (); protected: /// Pool to which this thread belongs to. @@ -129,19 +129,19 @@ public: TAO_DTP_Definition &definition); /// Destructor. - ~TAO_DTP_Thread_Pool (void); + ~TAO_DTP_Thread_Pool (); /// Open the pool. - void open (void); + void open (); /// Wait for threads to exit. - void wait (void); + void wait (); /// Mark this thread pool that we are shutting down. - void shutting_down (void); + void shutting_down (); /// Create the initial threads - only called once. - int create_initial_threads (void); + int create_initial_threads (); /// Called by the TAO_DTP_New_Leader_Generator to request a new dynamic /// thread. @@ -152,11 +152,11 @@ public: * @retval true A new thread is created * @retval false No thread could be created */ - bool new_dynamic_thread (void); + bool new_dynamic_thread (); /// Called by the run loop to determine if to expire a thread or not /// when the dynamic timeout is reached. - bool above_minimum (void); + bool above_minimum (); /// @name Accessors // @{ @@ -166,7 +166,7 @@ public: TAO_DTP_Thread_Pool_Manager &manager () const; CORBA::ULong id () const; CORBA::ULong current_threads () const; - void add_active (void); + void add_active (); bool remove_active (bool force); // @} @@ -217,10 +217,10 @@ public: TAO_DTP_Thread_Pool_Manager (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_DTP_Thread_Pool_Manager (void); + ~TAO_DTP_Thread_Pool_Manager (); /// Wait for threads to exit. - void wait (void); + void wait (); /// Create a threadpool without lanes. CORBA::ULong create_threadpool (TAO_DTP_Definition &def); |