diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 13:40:11 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-09 13:40:11 +0100 |
| commit | 900d6095f897d8c69fea522221675bdec225dbba (patch) | |
| tree | c260d476fc15fc89f0733b639c11ace3a019d462 | |
| parent | 68af84b8a645ccf8f2d45ba545ec0acf84bc8335 (diff) | |
| download | ATCD-900d6095f897d8c69fea522221675bdec225dbba.tar.gz | |
Remove redundant void arg
240 files changed, 1381 insertions, 1381 deletions
diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index b9246fc5e54..6206c824595 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Acceptor) template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); @@ -37,7 +37,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () const } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); return const_cast<PEER_ACCEPTOR &> (this->peer_acceptor_); @@ -46,7 +46,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const // Returns ACE_HANDLE of the underlying Acceptor_Strategy. template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->peer_acceptor_.get_handle (); @@ -136,14 +136,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Acceptor } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Acceptor"); this->handle_close (); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); return ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (); @@ -186,14 +186,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); return this->reactor ()->suspend_handler (this); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); return this->reactor ()->resume_handler (this); @@ -203,14 +203,14 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) // <reactor>. template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close"); return this->handle_close (); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error (void) +ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error () { ACE_TRACE ("ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_accept_error"); return 0; @@ -450,7 +450,7 @@ ACE_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_input (ACE_HANDLE listener) ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Strategy_Acceptor) template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend () { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); @@ -462,7 +462,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume () { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); @@ -474,7 +474,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); @@ -499,7 +499,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); return this->accept_strategy_->acceptor (); @@ -515,7 +515,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::operator PEER_ACCEPTOR & () c // Returns ACE_HANDLE of the underlying Acceptor_Strategy. template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->accept_strategy_->get_handle (); @@ -798,7 +798,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::activate_svc_handler } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor (void) +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor () { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Strategy_Acceptor"); ACE_OS::free ((void *) this->service_name_); @@ -850,7 +850,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) +ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini () { ACE_TRACE ("ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); return this->ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (); @@ -859,7 +859,7 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) ACE_ALLOC_HOOK_DEFINE_Tca(ACE_Oneshot_Acceptor) template <typename SVC_HANDLER, typename PEER_ACCEPTOR> void -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump (void) const +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::dump"); @@ -900,7 +900,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::open } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor () : svc_handler_ (0), restart_ (false), concurrency_strategy_ (0), @@ -928,14 +928,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::ACE_Oneshot_Acceptor } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::~ACE_Oneshot_Acceptor"); this->handle_close (); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::close"); return this->handle_close (); @@ -989,7 +989,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::handle_timeout } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::cancel"); return this->reactor () && this->reactor ()->cancel_timer (this); @@ -1179,7 +1179,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::init (int, ACE_TCHAR *[]) } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::fini"); return this->handle_close (); @@ -1213,14 +1213,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp, } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::suspend"); return this->reactor () && this->reactor ()->suspend_handler (this); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume () { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume"); return this->reactor () && this->reactor ()->resume_handler (this); @@ -1229,14 +1229,14 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::resume (void) // Returns ACE_HANDLE of the underlying peer_acceptor. template <typename SVC_HANDLER, typename PEER_ACCEPTOR> ACE_HANDLE -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle (void) const +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle () const { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::get_handle"); return this->peer_acceptor_.get_handle (); } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> PEER_ACCEPTOR & -ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor (void) const +ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor () const { ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::acceptor"); return (PEER_ACCEPTOR &) this->peer_acceptor_; diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h index da7834cc9e8..ba2c14cf431 100644 --- a/ACE/ace/Acceptor.h +++ b/ACE/ace/Acceptor.h @@ -151,26 +151,26 @@ public: int reuse_addr = 1); /// Close down the Acceptor's resources. - virtual ~ACE_Acceptor (void); + virtual ~ACE_Acceptor (); /// Return the underlying PEER_ACCEPTOR object. virtual operator PEER_ACCEPTOR &() const; /// Return the underlying PEER_ACCEPTOR object. - virtual PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor () const; /// Returns the listening acceptor's {ACE_HANDLE}. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Close down the Acceptor - virtual int close (void); + virtual int close (); /// In the event that an accept fails, this method will be called and /// the return value will be returned from handle_input(). - virtual int handle_accept_error (void); + virtual int handle_accept_error (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -225,7 +225,7 @@ protected: virtual int init (int argc, ACE_TCHAR *argv[]); /// Calls {handle_close}. - virtual int fini (void); + virtual int fini (); /// Default version returns address info in {buf}. virtual int info (ACE_TCHAR **buf, size_t) const; @@ -233,10 +233,10 @@ protected: public: // = Service management hooks. /// This method calls {Reactor::suspend}. - virtual int suspend (void); + virtual int suspend (); /// This method calls {Reactor::resume}. - virtual int resume (void); + virtual int resume (); protected: /// Concrete factory for accepting connections from clients... @@ -378,19 +378,19 @@ public: int reuse_addr = 1); /// Close down the Strategy_Acceptor's resources. - virtual ~ACE_Strategy_Acceptor (void); + virtual ~ACE_Strategy_Acceptor (); /// Return the underlying PEER_ACCEPTOR object. virtual operator PEER_ACCEPTOR &() const; /// Return the underlying PEER_ACCEPTOR object. - virtual PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor () const; /// Returns the listening acceptor's {ACE_HANDLE}. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -399,16 +399,16 @@ public: /// This method delegates to the {Scheduling_Strategy}'s {suspend} /// method. - virtual int suspend (void); + virtual int suspend (); /// This method delegates to the {Scheduling_Strategy}'s {resume} /// method. - virtual int resume (void); + virtual int resume (); protected: /// Calls {handle_close} when dynamically unlinked. - virtual int fini (void); + virtual int fini (); /// Default version returns address info in {buf}. virtual int info (ACE_TCHAR **buf, size_t) const; @@ -543,7 +543,7 @@ public: typedef typename SVC_HANDLER::stream_type stream_type; /// Constructor. - ACE_Oneshot_Acceptor (void); + ACE_Oneshot_Acceptor (); /** * Initialize the appropriate strategies for concurrency and then @@ -570,7 +570,7 @@ public: ACE_Concurrency_Strategy<SVC_HANDLER> * = 0); /// Close down the {Oneshot_Acceptor}. - virtual ~ACE_Oneshot_Acceptor (void); + virtual ~ACE_Oneshot_Acceptor (); // = Explicit factory operation. /// Create a {SVC_HANDLER}, accept the connection into the @@ -582,19 +582,19 @@ public: bool reset_new_handle = false); /// Cancel a oneshot acceptor that was started asynchronously. - virtual int cancel (void); + virtual int cancel (); /// Return the underlying {PEER_ACCEPTOR} object. virtual operator PEER_ACCEPTOR &() const; /// Return the underlying {PEER_ACCEPTOR} object. - virtual PEER_ACCEPTOR &acceptor (void) const; + virtual PEER_ACCEPTOR &acceptor () const; /// Close down the {Oneshot_Acceptor}. - virtual int close (void); + virtual int close (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -620,7 +620,7 @@ protected: // = Demultiplexing hooks. /// Returns the listening acceptor's {ACE_HANDLE}. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Perform termination activities when {this} is removed from the /// {reactor}. @@ -642,7 +642,7 @@ protected: /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int fini (void); + virtual int fini (); /// Default version returns address info in {buf}. virtual int info (ACE_TCHAR **, size_t) const; @@ -650,11 +650,11 @@ protected: // = Service management hooks. /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int suspend (void); + virtual int suspend (); /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int resume (void); + virtual int resume (); private: /** diff --git a/ACE/ace/Basic_Stats.h b/ACE/ace/Basic_Stats.h index 4cc4bd2d63b..39f54e0c73d 100644 --- a/ACE/ace/Basic_Stats.h +++ b/ACE/ace/Basic_Stats.h @@ -40,10 +40,10 @@ public: * The number of samples is pre-allocated, and cannot changes once * the class is initialized. */ - ACE_Basic_Stats (void); + ACE_Basic_Stats (); /// The number of samples received so far - ACE_UINT32 samples_count (void) const; + ACE_UINT32 samples_count () const; /// Record one sample. void sample (ACE_UINT64 value); diff --git a/ACE/ace/Basic_Stats.inl b/ACE/ace/Basic_Stats.inl index 185478ab7f8..4e34469e76e 100644 --- a/ACE/ace/Basic_Stats.inl +++ b/ACE/ace/Basic_Stats.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Basic_Stats::ACE_Basic_Stats (void) +ACE_Basic_Stats::ACE_Basic_Stats () : samples_count_ (0) , min_ (0) , min_at_ (0) @@ -13,7 +13,7 @@ ACE_Basic_Stats::ACE_Basic_Stats (void) } ACE_INLINE ACE_UINT32 -ACE_Basic_Stats::samples_count (void) const +ACE_Basic_Stats::samples_count () const { return this->samples_count_; } diff --git a/ACE/ace/Connection_Recycling_Strategy.h b/ACE/ace/Connection_Recycling_Strategy.h index 763c7e548c1..4b3f1238be2 100644 --- a/ACE/ace/Connection_Recycling_Strategy.h +++ b/ACE/ace/Connection_Recycling_Strategy.h @@ -27,10 +27,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Connection_Recycling_Strategy { public: - ACE_Connection_Recycling_Strategy (void); + ACE_Connection_Recycling_Strategy (); /// Virtual Destructor - virtual ~ACE_Connection_Recycling_Strategy (void); + virtual ~ACE_Connection_Recycling_Strategy (); /// Remove from cache. virtual int purge (const void *recycling_act) = 0; diff --git a/ACE/ace/Countdown_Time_T.cpp b/ACE/ace/Countdown_Time_T.cpp index 8a38c4de119..1327ccb4b09 100644 --- a/ACE/ace/Countdown_Time_T.cpp +++ b/ACE/ace/Countdown_Time_T.cpp @@ -21,13 +21,13 @@ ACE_Countdown_Time_T<TIME_POLICY>::ACE_Countdown_Time_T (ACE_Time_Value *max_wai } template <typename TIME_POLICY> ACE_INLINE -ACE_Countdown_Time_T<TIME_POLICY>::~ACE_Countdown_Time_T (void) +ACE_Countdown_Time_T<TIME_POLICY>::~ACE_Countdown_Time_T () { this->stop (); } template <typename TIME_POLICY> ACE_INLINE void -ACE_Countdown_Time_T<TIME_POLICY>::start (void) +ACE_Countdown_Time_T<TIME_POLICY>::start () { if (this->max_wait_time_ != 0) { @@ -38,7 +38,7 @@ ACE_Countdown_Time_T<TIME_POLICY>::start (void) } template <typename TIME_POLICY> ACE_INLINE void -ACE_Countdown_Time_T<TIME_POLICY>::stop (void) +ACE_Countdown_Time_T<TIME_POLICY>::stop () { if (this->max_wait_time_ != 0 && !this->stopped_) { diff --git a/ACE/ace/Countdown_Time_T.h b/ACE/ace/Countdown_Time_T.h index 12aab657bf1..d3817db8c44 100644 --- a/ACE/ace/Countdown_Time_T.h +++ b/ACE/ace/Countdown_Time_T.h @@ -44,21 +44,21 @@ public: /// Destructor, makes sure the max_wait_time that got passed as pointer /// to the constructor is updated with the time elapsed. - ~ACE_Countdown_Time_T (void); + ~ACE_Countdown_Time_T (); /// Cache the current time and enter a start state. - void start (void); + void start (); /// Subtract the elapsed time from max_wait_time_ and enter a stopped /// state. - void stop (void); + void stop (); /// Calls stop and then start. max_wait_time_ is modified by the /// call to stop. - void update (void); + void update (); /// Returns true if we've already been stopped, else false. - bool stopped (void) const; + bool stopped () const; /// Allows applications to control how the timer queue gets the time /// of day. diff --git a/ACE/ace/Countdown_Time_T.inl b/ACE/ace/Countdown_Time_T.inl index 319729d9c37..dce20d05642 100644 --- a/ACE/ace/Countdown_Time_T.inl +++ b/ACE/ace/Countdown_Time_T.inl @@ -2,13 +2,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename TIME_POLICY> ACE_INLINE bool -ACE_Countdown_Time_T<TIME_POLICY>::stopped (void) const +ACE_Countdown_Time_T<TIME_POLICY>::stopped () const { return stopped_; } template <typename TIME_POLICY> ACE_INLINE void -ACE_Countdown_Time_T<TIME_POLICY>::update (void) +ACE_Countdown_Time_T<TIME_POLICY>::update () { this->stop (); this->start (); diff --git a/ACE/ace/Dynamic.h b/ACE/ace/Dynamic.h index 202d000dc3f..17c16e58a90 100644 --- a/ACE/ace/Dynamic.h +++ b/ACE/ace/Dynamic.h @@ -33,25 +33,25 @@ class ACE_Export ACE_Dynamic { public: /// Constructor. - ACE_Dynamic (void); + ACE_Dynamic (); /// Destructor. - ~ACE_Dynamic (void); + ~ACE_Dynamic (); /** * Sets a flag that indicates that the object was dynamically * created. This method is usually called in operator new and then * checked and reset in the constructor. */ - void set (void); + void set (); /// @c true if we were allocated dynamically, else @c false. - bool is_dynamic (void); + bool is_dynamic (); /// Resets state flag. - void reset (void); + void reset (); - static ACE_Dynamic *instance (void); + static ACE_Dynamic *instance (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Dynamic.inl b/ACE/ace/Dynamic.inl index 795f33d2ec3..c1c44f59692 100644 --- a/ACE/ace/Dynamic.inl +++ b/ACE/ace/Dynamic.inl @@ -2,27 +2,27 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Dynamic::~ACE_Dynamic (void) +ACE_Dynamic::~ACE_Dynamic () { // ACE_TRACE ("ACE_Dynamic::~ACE_Dynamic"); } ACE_INLINE void -ACE_Dynamic::set (void) +ACE_Dynamic::set () { // ACE_TRACE ("ACE_Dynamic::set"); this->is_dynamic_ = true; } ACE_INLINE bool -ACE_Dynamic::is_dynamic (void) +ACE_Dynamic::is_dynamic () { // ACE_TRACE ("ACE_Dynamic::is_dynamic"); return this->is_dynamic_; } ACE_INLINE void -ACE_Dynamic::reset (void) +ACE_Dynamic::reset () { // ACE_TRACE ("ACE_Dynamic::reset"); this->is_dynamic_ = false; diff --git a/ACE/ace/Dynamic_Message_Strategy.h b/ACE/ace/Dynamic_Message_Strategy.h index 5d24157caf1..0602030a64a 100644 --- a/ACE/ace/Dynamic_Message_Strategy.h +++ b/ACE/ace/Dynamic_Message_Strategy.h @@ -68,38 +68,38 @@ public: unsigned long dynamic_priority_offset); /// Virtual destructor. - virtual ~ACE_Dynamic_Message_Strategy (void); + virtual ~ACE_Dynamic_Message_Strategy (); /// Updates the message's priority and returns its priority status. Priority_Status priority_status (ACE_Message_Block &mb, const ACE_Time_Value &tv); /// Get static bit field mask. - unsigned long static_bit_field_mask (void) const; + unsigned long static_bit_field_mask () const; /// Set static bit field mask. void static_bit_field_mask (unsigned long); /// Get left shift value to make room for static bit field. - unsigned long static_bit_field_shift (void) const; + unsigned long static_bit_field_shift () const; /// Set left shift value to make room for static bit field. void static_bit_field_shift (unsigned long); /// Get maximum supported priority value. - unsigned long dynamic_priority_max (void) const; + unsigned long dynamic_priority_max () const; /// Set maximum supported priority value. void dynamic_priority_max (unsigned long); /// Get offset to boundary between signed range and unsigned range. - unsigned long dynamic_priority_offset (void) const; + unsigned long dynamic_priority_offset () const; /// Set offset to boundary between signed range and unsigned range. void dynamic_priority_offset (unsigned long); /// Dump the state of the strategy. - virtual void dump (void) const; + virtual void dump () const; protected: /// Hook method for dynamic priority conversion. @@ -156,14 +156,14 @@ public: unsigned long dynamic_priority_offset = 0x200000UL); // 2^(22-1) /// Virtual destructor. - virtual ~ACE_Deadline_Message_Strategy (void); + virtual ~ACE_Deadline_Message_Strategy (); /// Dynamic priority conversion function based on time to deadline. virtual void convert_priority (ACE_Time_Value &priority, const ACE_Message_Block &mb); /// Dump the state of the strategy. - virtual void dump (void) const; + virtual void dump () const; }; /** @@ -191,14 +191,14 @@ public: unsigned long dynamic_priority_offset = 0x200000UL); // 2^(22-1) /// virtual dtor. - virtual ~ACE_Laxity_Message_Strategy (void); + virtual ~ACE_Laxity_Message_Strategy (); /// Dynamic priority conversion function based on laxity. virtual void convert_priority (ACE_Time_Value &priority, const ACE_Message_Block &mb); /// Dump the state of the strategy. - virtual void dump (void) const; + virtual void dump () const; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Dynamic_Message_Strategy.inl b/ACE/ace/Dynamic_Message_Strategy.inl index 675e0f1e491..443c43962a6 100644 --- a/ACE/ace/Dynamic_Message_Strategy.inl +++ b/ACE/ace/Dynamic_Message_Strategy.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE unsigned long -ACE_Dynamic_Message_Strategy::static_bit_field_mask (void) const +ACE_Dynamic_Message_Strategy::static_bit_field_mask () const { return static_bit_field_mask_; } @@ -16,7 +16,7 @@ ACE_Dynamic_Message_Strategy::static_bit_field_mask (unsigned long ul) // set static bit field mask ACE_INLINE unsigned long -ACE_Dynamic_Message_Strategy::static_bit_field_shift (void) const +ACE_Dynamic_Message_Strategy::static_bit_field_shift () const { return static_bit_field_shift_; } @@ -30,7 +30,7 @@ ACE_Dynamic_Message_Strategy::static_bit_field_shift (unsigned long ul) // set left shift value to make room for static bit field ACE_INLINE unsigned long -ACE_Dynamic_Message_Strategy::dynamic_priority_max (void) const +ACE_Dynamic_Message_Strategy::dynamic_priority_max () const { return dynamic_priority_max_; } @@ -49,7 +49,7 @@ ACE_Dynamic_Message_Strategy::dynamic_priority_max (unsigned long ul) // set maximum supported priority value ACE_INLINE unsigned long -ACE_Dynamic_Message_Strategy::dynamic_priority_offset (void) const +ACE_Dynamic_Message_Strategy::dynamic_priority_offset () const { return dynamic_priority_offset_; } diff --git a/ACE/ace/Hashable.h b/ACE/ace/Hashable.h index ee636b55248..d8db181c588 100644 --- a/ACE/ace/Hashable.h +++ b/ACE/ace/Hashable.h @@ -30,19 +30,19 @@ class ACE_Export ACE_Hashable { public: /// Destructor. - virtual ~ACE_Hashable (void); + virtual ~ACE_Hashable (); /// Computes and returns hash value. This "caches" the hash value to /// improve performance. - virtual unsigned long hash (void) const; + virtual unsigned long hash () const; protected: /// Protected constructor. - ACE_Hashable (void); + ACE_Hashable (); /// This is the method that actually performs the non-cached hash /// computation. - virtual unsigned long hash_i (void) const = 0; + virtual unsigned long hash_i () const = 0; protected: /// Pre-computed hash-value. diff --git a/ACE/ace/Hashable.inl b/ACE/ace/Hashable.inl index ac9af977a36..2a6d55f1388 100644 --- a/ACE/ace/Hashable.inl +++ b/ACE/ace/Hashable.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Hashable::ACE_Hashable (void) +ACE_Hashable::ACE_Hashable () : hash_value_ (0) { } diff --git a/ACE/ace/IO_Cntl_Msg.h b/ACE/ace/IO_Cntl_Msg.h index 36c683684d7..d626fd0ef70 100644 --- a/ACE/ace/IO_Cntl_Msg.h +++ b/ACE/ace/IO_Cntl_Msg.h @@ -55,31 +55,31 @@ public: // = Get/set methods /// Get command. - ACE_IO_Cntl_Cmds cmd (void); + ACE_IO_Cntl_Cmds cmd (); /// Set command. void cmd (ACE_IO_Cntl_Cmds c); /// Get count. - size_t count (void); + size_t count (); /// Set count. void count (size_t c); /// Get error. - int error (void); + int error (); /// Set error. void error (int e); /// Get return value. - int rval (void); + int rval (); /// Set return value. void rval (int r); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/IO_Cntl_Msg.inl b/ACE/ace/IO_Cntl_Msg.inl index 17f1dbcfb6e..c90b1be554d 100644 --- a/ACE/ace/IO_Cntl_Msg.inl +++ b/ACE/ace/IO_Cntl_Msg.inl @@ -11,7 +11,7 @@ ACE_IO_Cntl_Msg::ACE_IO_Cntl_Msg (ACE_IO_Cntl_Cmds c) : } ACE_INLINE ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds -ACE_IO_Cntl_Msg::cmd (void) +ACE_IO_Cntl_Msg::cmd () { return this->cmd_; } @@ -23,7 +23,7 @@ ACE_IO_Cntl_Msg::cmd (ACE_IO_Cntl_Cmds c) } ACE_INLINE size_t -ACE_IO_Cntl_Msg::count (void) +ACE_IO_Cntl_Msg::count () { return this->count_; } @@ -35,7 +35,7 @@ ACE_IO_Cntl_Msg::count (size_t c) } ACE_INLINE int -ACE_IO_Cntl_Msg::error (void) +ACE_IO_Cntl_Msg::error () { return this->error_; } @@ -47,7 +47,7 @@ ACE_IO_Cntl_Msg::error (int e) } ACE_INLINE int -ACE_IO_Cntl_Msg::rval (void) +ACE_IO_Cntl_Msg::rval () { return this->rval_; } diff --git a/ACE/ace/Malloc_Allocator.h b/ACE/ace/Malloc_Allocator.h index 81710aad54f..52df2ac9480 100644 --- a/ACE/ace/Malloc_Allocator.h +++ b/ACE/ace/Malloc_Allocator.h @@ -59,7 +59,7 @@ public: virtual void free (void *ptr); /// These methods are no-ops. - virtual int remove (void); + virtual int remove (); virtual int bind (const char *name, void *pointer, int duplicates = 0); virtual int trybind (const char *name, void *&pointer); virtual int find (const char *name, void *&pointer); @@ -73,7 +73,7 @@ public: #if defined (ACE_HAS_MALLOC_STATS) virtual void print_stats (void) const; #endif /* ACE_HAS_MALLOC_STATS */ - virtual void dump (void) const; + virtual void dump () const; private: // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!! See the @@ -103,7 +103,7 @@ public: virtual void *calloc (size_t nbytes, char initial_value = '\0'); virtual void *calloc (size_t n_elem, size_t elem_size, char initial_value = '\0'); virtual void free (void *ptr); - virtual int remove (void); + virtual int remove (); virtual int bind (const char *name, void *pointer, int duplicates = 0); virtual int trybind (const char *name, void *&pointer); virtual int find (const char *name, void *&pointer); @@ -117,11 +117,11 @@ public: #if defined (ACE_HAS_MALLOC_STATS) virtual void print_stats (void) const; #endif /* ACE_HAS_MALLOC_STATS */ - virtual void dump (void) const; + virtual void dump () const; protected: /// Don't allow direct instantiations of this class. - ACE_Static_Allocator_Base (void); + ACE_Static_Allocator_Base (); /// Pointer to the buffer. char *buffer_; diff --git a/ACE/ace/Message_Queue.h b/ACE/ace/Message_Queue.h index a88763997d0..3b0a88fe230 100644 --- a/ACE/ace/Message_Queue.h +++ b/ACE/ace/Message_Queue.h @@ -73,13 +73,13 @@ public: }; - ACE_Message_Queue_Base (void); + ACE_Message_Queue_Base (); /// Close down the message queue and release all resources. - virtual int close (void) = 0; + virtual int close () = 0; /// Close down the message queue and release all resources. - virtual ~ACE_Message_Queue_Base (void); + virtual ~ACE_Message_Queue_Base (); // = Enqueue and dequeue methods. @@ -125,23 +125,23 @@ public: // = Check if queue is full/empty. /// True if queue is full, else false. - virtual bool is_full (void) = 0; + virtual bool is_full () = 0; /// True if queue is empty, else false. - virtual bool is_empty (void) = 0; + virtual bool is_empty () = 0; // = Queue statistic methods. /// Number of total bytes on the queue, i.e., sum of the message /// block sizes. - virtual size_t message_bytes (void) = 0; + virtual size_t message_bytes () = 0; /// Number of total length on the queue, i.e., sum of the message /// block lengths. - virtual size_t message_length (void) = 0; + virtual size_t message_length () = 0; /// Number of total messages on the queue. - virtual size_t message_count (void) = 0; + virtual size_t message_count () = 0; /// New value of the number of total bytes on the queue, i.e., /// sum of the message block sizes. @@ -162,7 +162,7 @@ public: * * @retval The queue's state before this call. */ - virtual int deactivate (void) = 0; + virtual int deactivate () = 0; /** * Reactivate the queue so that threads can enqueue and dequeue @@ -170,7 +170,7 @@ public: * * @retval The queue's state before this call. */ - virtual int activate (void) = 0; + virtual int activate () = 0; /** * Pulse the queue to wake up any waiting threads. Changes the @@ -179,17 +179,17 @@ public: * * @retval The queue's state before this call. */ - virtual int pulse (void) = 0; + virtual int pulse () = 0; /// Returns the current state of the queue. - virtual int state (void); + virtual int state (); /// Returns 1 if the state of the queue is DEACTIVATED, /// and 0 if the queue's state is ACTIVATED or PULSED. - virtual int deactivated (void) = 0; + virtual int deactivated () = 0; /// Get the notification strategy for the Message_Queue - virtual ACE_Notification_Strategy *notification_strategy (void) = 0; + virtual ACE_Notification_Strategy *notification_strategy () = 0; /// Set the notification strategy for the Message_Queue virtual void notification_strategy (ACE_Notification_Strategy *s) = 0; @@ -197,7 +197,7 @@ public: // = Notification hook. /// Dump the state of an object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; private: // = Disallow copying and assignment. diff --git a/ACE/ace/Message_Queue.inl b/ACE/ace/Message_Queue.inl index 31f420e4c20..4df5d6404dc 100644 --- a/ACE/ace/Message_Queue.inl +++ b/ACE/ace/Message_Queue.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Message_Queue_Base::ACE_Message_Queue_Base (void) +ACE_Message_Queue_Base::ACE_Message_Queue_Base () { } diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index 5fb59cf6761..81e352d781a 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -34,7 +34,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcyc(ACE_Message_Queue_Ex) ACE_ALLOC_HOOK_DEFINE_Tcyc(ACE_Message_Queue_Ex_N) template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -72,7 +72,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_ } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex"); } @@ -90,7 +90,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::open (size_t // Clean up the queue if we have not already done so! template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close"); @@ -98,7 +98,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::close (void) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush"); @@ -106,7 +106,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush (void) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::flush_i"); @@ -335,7 +335,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dequeue_dead } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notify"); @@ -364,19 +364,19 @@ next (ACE_MESSAGE_TYPE *&entry) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done (void) const +ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done () const { return this->iter_.done (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance (void) +ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance () { return this->iter_.advance (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue_Ex_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const { this->iter_.dump (); } @@ -405,19 +405,19 @@ next (ACE_MESSAGE_TYPE *&entry) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done (void) const +ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::done () const { return this->iter_.done (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance (void) +ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::advance () { return this->iter_.advance (); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue_Ex_Reverse_Iterator<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dump () const { this->iter_.dump (); } @@ -437,7 +437,7 @@ ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::ACE_Messag } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N (void) +ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N () { ACE_TRACE ("ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue_Ex_N"); } @@ -542,7 +542,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::dequeue (ACE } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> ACE_Notification_Strategy * -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification_strategy"); @@ -560,7 +560,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::notification // Check if queue is empty (holds locks). template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty"); @@ -570,7 +570,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_empty (vo // Check if queue is full (holds locks). template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full"); @@ -578,7 +578,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::is_full (voi } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_mark"); @@ -594,7 +594,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::high_water_m } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_mark"); @@ -610,7 +610,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::low_water_ma } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_bytes"); @@ -618,7 +618,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_byte } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_length"); @@ -626,7 +626,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_leng } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_count"); @@ -634,7 +634,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::message_coun } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate"); @@ -642,7 +642,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivate ( } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate"); @@ -650,7 +650,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::activate (vo } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse"); @@ -658,7 +658,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::pulse (void) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated"); @@ -666,7 +666,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::deactivated } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state () { ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state"); @@ -674,7 +674,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::state (void) } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL, class TIME_POLICY> ACE_SYNCH_MUTEX_T & -ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::lock (void) +ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE, TIME_POLICY>::lock () { return this->queue_.lock (); } @@ -715,7 +715,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::next (ACE_Message_Block } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const +ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done () const { ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) @@ -723,7 +723,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void) +ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance () { ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) @@ -733,7 +733,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) #endif /* ACE_HAS_DUMP */ @@ -763,7 +763,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::next (ACE_Messag } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) const +ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done () const { ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) @@ -771,7 +771,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::done (void) cons } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void) +ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance () { ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) @@ -781,7 +781,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::advance (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) #endif /* ACE_HAS_DUMP */ @@ -796,7 +796,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue (ACE_Message_Block *&firs } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Notification_Strategy * -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy"); @@ -814,7 +814,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notification_strategy (ACE_Notifi // Check if queue is empty (does not hold locks). template <ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i"); return this->tail_ == 0; @@ -823,7 +823,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty_i (void) // Check if queue is full (does not hold locks). template <ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i"); return this->cur_bytes_ >= this->high_water_mark_; @@ -832,7 +832,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full_i (void) // Check if queue is empty (holds locks). template <ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, false); @@ -843,7 +843,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_empty (void) // Check if queue is full (holds locks). template <ACE_SYNCH_DECL, class TIME_POLICY> bool -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, false); @@ -852,7 +852,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::is_full (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0); @@ -870,7 +870,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::high_water_mark (size_t hwm) } template <ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0); @@ -888,7 +888,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::low_water_mark (size_t lwm) } template <ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0); @@ -897,7 +897,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_bytes (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0); @@ -906,7 +906,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_length (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> size_t -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::message_count"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, 0); @@ -924,7 +924,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivate () } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -942,7 +942,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::pulse () } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated"); @@ -950,7 +950,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivated (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state"); @@ -958,14 +958,14 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::state (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_SYNCH_MUTEX_T & -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::lock (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::lock () { return this->lock_; } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Time_Value_T<TIME_POLICY> -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday (void) const +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday () const { return this->time_policy_ (); } @@ -978,7 +978,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::set_time_policy (TIME_POLICY cons } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -1081,7 +1081,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm, } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue"); if (this->head_ != 0 && this->close () == -1) @@ -1095,7 +1095,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Message_Queue (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush_i (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush_i () { int number_flushed = 0; @@ -1180,7 +1180,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::deactivate_i (int pulse) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i"); int const previous_state = this->state_; @@ -1189,7 +1189,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::activate_i (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1201,7 +1201,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::flush (void) // Clean up the queue if we have not already done so! template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1); @@ -1215,7 +1215,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::close (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters () { if (this->not_full_cond_.signal () != 0) return -1; @@ -1223,7 +1223,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_enqueue_waiters (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_dequeue_waiters (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::signal_dequeue_waiters () { // Tell any blocked threads that the queue has a new item! if (this->not_empty_cond_.signal () != 0) @@ -2041,7 +2041,7 @@ ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_deadline (ACE_Message_Blo } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify (void) +ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify () { ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::notify"); @@ -2074,7 +2074,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Dynamic_Message_Queue // dtor: free message strategy and let base class dtor do the rest. template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Dynamic_Message_Queue (void) +ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Dynamic_Message_Queue () { delete &this->message_strategy_; } @@ -2260,7 +2260,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dequeue_head (ACE_Message // of the queue. template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::dump"); diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index af38d7b05cb..6bc74f3e191 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -112,10 +112,10 @@ public: /// @sa flush(). /// /// @retval The number of messages released from the queue; -1 on error. - virtual int close (void); + virtual int close (); /// Releases all resources from the message queue and marks it deactivated. - virtual ~ACE_Message_Queue (void); + virtual ~ACE_Message_Queue (); /** * Releases all resources from the message queue but does not mark it @@ -124,7 +124,7 @@ public: * * @return The number of messages flushed; -1 on error. */ - virtual int flush (void); + virtual int flush (); /** * Release all resources from the message queue but do not mark it @@ -135,7 +135,7 @@ public: * * @return The number of messages flushed. */ - virtual int flush_i (void); + virtual int flush_i (); /** @name Enqueue and dequeue methods * @@ -355,26 +355,26 @@ public: //@{ /// True if queue is full, else false. - virtual bool is_full (void); + virtual bool is_full (); /// True if queue is empty, else false. - virtual bool is_empty (void); + virtual bool is_empty (); /** * Number of total bytes on the queue, i.e., sum of the message * block sizes. */ - virtual size_t message_bytes (void); + virtual size_t message_bytes (); /** * Number of total length on the queue, i.e., sum of the message * block lengths. */ - virtual size_t message_length (void); + virtual size_t message_length (); /** * Number of total messages on the queue. */ - virtual size_t message_count (void); + virtual size_t message_count (); // = Manual changes to these stats (used when queued message blocks // change size or lengths). @@ -399,7 +399,7 @@ public: /** * Get high watermark. */ - virtual size_t high_water_mark (void); + virtual size_t high_water_mark (); /** * Set the high watermark, which determines how many bytes can be * stored in a queue before it's considered "full." @@ -409,7 +409,7 @@ public: /** * Get low watermark. */ - virtual size_t low_water_mark (void); + virtual size_t low_water_mark (); /** * Set the low watermark, which determines how many bytes must be in * the queue before supplier threads are allowed to enqueue @@ -433,13 +433,13 @@ public: * ESHUTDOWN. Returns WAS_INACTIVE if queue was inactive before the * call and WAS_ACTIVE if queue was active before the call. */ - virtual int deactivate (void); + virtual int deactivate (); /** * Reactivate the queue so that threads can enqueue and dequeue * messages again. Returns the state of the queue before the call. */ - virtual int activate (void); + virtual int activate (); /** * Pulse the queue to wake up any waiting threads. Changes the @@ -448,15 +448,15 @@ public: * * @return The queue's state before this call. */ - virtual int pulse (void); + virtual int pulse (); /// Returns the current state of the queue, which can be one of /// ACTIVATED, DEACTIVATED, or PULSED. - virtual int state (void); + virtual int state (); /// Returns true if the state of the queue is <DEACTIVATED>, /// but false if the queue's is <ACTIVATED> or <PULSED>. - virtual int deactivated (void); + virtual int deactivated (); //@} /** @name Notification strategy methods @@ -473,28 +473,28 @@ public: * guarantee that the queue will be still be non-empty by the time * the notification occurs. */ - virtual int notify (void); + virtual int notify (); /// Get the notification strategy for the <Message_Queue> - virtual ACE_Notification_Strategy *notification_strategy (void); + virtual ACE_Notification_Strategy *notification_strategy (); /// Set the notification strategy for the <Message_Queue> virtual void notification_strategy (ACE_Notification_Strategy *s); //@} /// Returns a reference to the lock used by the ACE_Message_Queue. - virtual ACE_SYNCH_MUTEX_T &lock (void); + virtual ACE_SYNCH_MUTEX_T &lock (); /// Get the current time of day according to the queue's TIME_POLICY. /// Allows users to initialize timeout values using correct time policy. - ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const; + ACE_Time_Value_T<TIME_POLICY> gettimeofday () const; /// Allows applications to control how the timer queue gets the time /// of day. void set_time_policy (TIME_POLICY const & time_policy); /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -537,10 +537,10 @@ protected: // = Check the boundary conditions (assumes locks are held). /// True if queue is full, else false. - virtual bool is_full_i (void); + virtual bool is_full_i (); /// True if queue is empty, else false. - virtual bool is_empty_i (void); + virtual bool is_empty_i (); // = Implementation of the public <activate> and <deactivate> methods. @@ -563,7 +563,7 @@ protected: virtual int deactivate_i (int pulse = 0); /// Activate the queue. - virtual int activate_i (void); + virtual int activate_i (); // = Helper methods to factor out common #ifdef code. @@ -574,10 +574,10 @@ protected: virtual int wait_not_empty_cond (ACE_Time_Value *timeout); /// Inform any threads waiting to enqueue that they can procede. - virtual int signal_enqueue_waiters (void); + virtual int signal_enqueue_waiters (); /// Inform any threads waiting to dequeue that they can procede. - virtual int signal_dequeue_waiters (void); + virtual int signal_dequeue_waiters (); /// Pointer to head of ACE_Message_Block list. ACE_Message_Block *head_; @@ -657,14 +657,14 @@ public: int next (ACE_Message_Block *&entry); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the queue. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -695,14 +695,14 @@ public: int next (ACE_Message_Block *&entry); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the queue. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -793,7 +793,7 @@ public: ACE_Notification_Strategy * = 0); /// Close down the message queue and release all resources. - virtual ~ACE_Dynamic_Message_Queue (void); + virtual ~ACE_Dynamic_Message_Queue (); /** * Detach all messages with status given in the passed flags from @@ -817,7 +817,7 @@ public: ACE_Time_Value *timeout = 0); /// Dump the state of the queue. - virtual void dump (void) const; + virtual void dump () const; /** * Just call priority enqueue method: tail enqueue semantics for dynamic @@ -1055,10 +1055,10 @@ public: /// @sa flush(). /// /// @retval The number of messages released from the queue; -1 on error. - virtual int close (void); + virtual int close (); /// Releases all resources from the message queue and marks it deactivated. - virtual ~ACE_Message_Queue_Ex (void); + virtual ~ACE_Message_Queue_Ex (); /** * Releases all resources from the message queue but does not mark it @@ -1067,7 +1067,7 @@ public: * * @return The number of messages flushed; -1 on error. */ - virtual int flush (void); + virtual int flush (); /** * Release all resources from the message queue but do not mark it @@ -1078,7 +1078,7 @@ public: * * @return The number of messages flushed. */ - virtual int flush_i (void); + virtual int flush_i (); /** @name Enqueue and dequeue methods * @@ -1258,25 +1258,25 @@ public: //@{ /// True if queue is full, else false. - virtual bool is_full (void); + virtual bool is_full (); /// True if queue is empty, else false. - virtual bool is_empty (void); + virtual bool is_empty (); /** * Number of total bytes on the queue, i.e., sum of the message * block sizes. */ - virtual size_t message_bytes (void); + virtual size_t message_bytes (); /** * Number of total length on the queue, i.e., sum of the message * block lengths. */ - virtual size_t message_length (void); + virtual size_t message_length (); /** * Number of total messages on the queue. */ - virtual size_t message_count (void); + virtual size_t message_count (); // = Manual changes to these stats (used when queued message blocks // change size or lengths). @@ -1300,7 +1300,7 @@ public: /** * Get high watermark. */ - virtual size_t high_water_mark (void); + virtual size_t high_water_mark (); /** * Set the high watermark, which determines how many bytes can be * stored in a queue before it's considered "full." @@ -1310,7 +1310,7 @@ public: /** * Get low watermark. */ - virtual size_t low_water_mark (void); + virtual size_t low_water_mark (); /** * Set the low watermark, which determines how many bytes must be in * the queue before supplier threads are allowed to enqueue @@ -1334,13 +1334,13 @@ public: * ESHUTDOWN. Returns WAS_INACTIVE if queue was inactive before the * call and WAS_ACTIVE if queue was active before the call. */ - virtual int deactivate (void); + virtual int deactivate (); /** * Reactivate the queue so that threads can enqueue and dequeue * messages again. Returns the state of the queue before the call. */ - virtual int activate (void); + virtual int activate (); /** * Pulse the queue to wake up any waiting threads. Changes the @@ -1349,15 +1349,15 @@ public: * * @retval The queue's state before this call. */ - virtual int pulse (void); + virtual int pulse (); /// Returns the current state of the queue, which can be one of /// ACTIVATED, DEACTIVATED, or PULSED. - virtual int state (void); + virtual int state (); /// Returns true if the state of the queue is DEACTIVATED, /// but false if the queue's state is ACTIVATED or PULSED. - virtual int deactivated (void); + virtual int deactivated (); //@} /** @name Notification strategy methods @@ -1374,17 +1374,17 @@ public: * guarantee that the queue will be still be non-empty by the time * the notification occurs. */ - virtual int notify (void); + virtual int notify (); /// Get the notification strategy for the <Message_Queue> - virtual ACE_Notification_Strategy *notification_strategy (void); + virtual ACE_Notification_Strategy *notification_strategy (); /// Set the notification strategy for the <Message_Queue> virtual void notification_strategy (ACE_Notification_Strategy *s); //@} /// Returns a reference to the lock used by the ACE_Message_Queue_Ex. - virtual ACE_SYNCH_MUTEX_T &lock (void); + virtual ACE_SYNCH_MUTEX_T &lock (); /// Get the current time of day according to the queue's TIME_POLICY. /// Allows users to initialize timeout @@ -1395,7 +1395,7 @@ public: void set_time_policy (TIME_POLICY const & time_policy); /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1422,14 +1422,14 @@ public: int next (ACE_MESSAGE_TYPE *&entry); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the queue. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1456,14 +1456,14 @@ public: int next (ACE_MESSAGE_TYPE *&entry); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the queue. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1514,7 +1514,7 @@ public: ACE_Notification_Strategy * ns = 0); /// Close down the message queue and release all resources. - virtual ~ACE_Message_Queue_Ex_N (void); + virtual ~ACE_Message_Queue_Ex_N (); /** * Enqueue one or more @c ACE_MESSAGE_TYPE objects at the head of the queue. diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp index 17602386045..8136364dcb6 100644 --- a/ACE/ace/Module.cpp +++ b/ACE/ace/Module.cpp @@ -22,7 +22,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Module) template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -159,7 +159,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::sibling (ACE_Task<ACE_SYNCH_USE, TIME_PO } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (void) +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module () : next_ (0) , arg_ (0) , flags_ (M_FLAGS_NOT_SET) @@ -172,7 +172,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::ACE_Module (void) } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module (void) +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module () { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Module"); diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h index 12e7f848584..dfe9afead4f 100644 --- a/ACE/ace/Module.h +++ b/ACE/ace/Module.h @@ -77,10 +77,10 @@ class ACE_Module : public ACE_Module_Base { public: /// Create an empty Module. - ACE_Module (void); + ACE_Module (); /// Shutdown the Module. - virtual ~ACE_Module (void); + virtual ~ACE_Module (); /// Create an initialized module with @a module_name as its identity /// and @a reader and @a writer as its tasks. @@ -114,7 +114,7 @@ public: // = ACE_Task manipulation routines /// Get the writer task. - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *writer (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *writer (); /** * Set the writer task. @a flags can be used to indicate that the @@ -126,7 +126,7 @@ public: void writer (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *q, int flags = M_DELETE_WRITER); /// Get the reader task. - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *reader (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *reader (); /** * Set the reader task. @a flags can be used to indicate that the @@ -142,14 +142,14 @@ public: // = Identify the module /// Get the module name. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; /// Set the module name. void name (const ACE_TCHAR *); // = Argument to the Tasks. /// Get the argument passed to the tasks. - void *arg (void) const; + void *arg () const; /// Set the argument passed to the tasks. void arg (void *); @@ -158,13 +158,13 @@ public: void link (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m); /// Get the next pointer to the module above in the stream. - ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *next (void); + ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *next (); /// Set the next pointer to the module above in the stream. virtual void next (ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *m); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Module.inl b/ACE/ace/Module.inl index 43f9dba762c..8c34f087a85 100644 --- a/ACE/ace/Module.inl +++ b/ACE/ace/Module.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE void * -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void) const +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg () const { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg"); return this->arg_; @@ -18,7 +18,7 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::arg (void *a) } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE const ACE_TCHAR * -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (void) const +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name () const { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name"); return this->name_; @@ -32,21 +32,21 @@ ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::name (const ACE_TCHAR *n) } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer (void) +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer () { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::writer"); return this->q_pair_[1]; } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader (void) +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader () { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::reader"); return this->q_pair_[0]; } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Module<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next (void) +ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next () { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE, TIME_POLICY>::next"); return this->next_; diff --git a/ACE/ace/Notification_Strategy.h b/ACE/ace/Notification_Strategy.h index f47824b76e7..a517babd68a 100644 --- a/ACE/ace/Notification_Strategy.h +++ b/ACE/ace/Notification_Strategy.h @@ -38,19 +38,19 @@ public: ACE_Notification_Strategy (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); /// Destructor. - virtual ~ACE_Notification_Strategy (void); + virtual ~ACE_Notification_Strategy (); - virtual int notify (void) = 0; + virtual int notify () = 0; virtual int notify (ACE_Event_Handler *, ACE_Reactor_Mask mask) = 0; /// Get the event handler. - ACE_Event_Handler *event_handler (void); + ACE_Event_Handler *event_handler (); /// Set the event handler. void event_handler (ACE_Event_Handler *eh); /// Get the reactor mask. - ACE_Reactor_Mask mask (void) const; + ACE_Reactor_Mask mask () const; /// Set the reactor mask. void mask (ACE_Reactor_Mask m); diff --git a/ACE/ace/Notification_Strategy.inl b/ACE/ace/Notification_Strategy.inl index f1c1598d0b4..d566c334224 100644 --- a/ACE/ace/Notification_Strategy.inl +++ b/ACE/ace/Notification_Strategy.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Event_Handler * -ACE_Notification_Strategy::event_handler (void) +ACE_Notification_Strategy::event_handler () { return eh_; } @@ -15,7 +15,7 @@ ACE_Notification_Strategy::event_handler (ACE_Event_Handler *eh) } ACE_INLINE ACE_Reactor_Mask -ACE_Notification_Strategy::mask (void) const +ACE_Notification_Strategy::mask () const { return mask_; } diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h index b5babec2d41..f21e7dd20fb 100644 --- a/ACE/ace/OS_NS_dlfcn.h +++ b/ACE/ace/OS_NS_dlfcn.h @@ -40,7 +40,7 @@ namespace ACE_OS { int dlclose (ACE_SHLIB_HANDLE handle); ACE_NAMESPACE_INLINE_FUNCTION - ACE_TCHAR *dlerror (void); + ACE_TCHAR *dlerror (); ACE_NAMESPACE_INLINE_FUNCTION ACE_SHLIB_HANDLE dlopen (const ACE_TCHAR *filename, diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 99b0109ffc0..6f804c67679 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -63,7 +63,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) } ACE_INLINE ACE_TCHAR * -ACE_OS::dlerror (void) +ACE_OS::dlerror () { ACE_OS_TRACE ("ACE_OS::dlerror"); # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index 2a1242c655e..c43a28be8d9 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -78,7 +78,7 @@ public: typedef int (*REACTOR_EVENT_HOOK)(ACE_Reactor *); /// Get pointer to a process-wide ACE_Reactor. - static ACE_Reactor *instance (void); + static ACE_Reactor *instance (); /** * Set pointer to a process-wide ACE_Reactor and return existing @@ -88,13 +88,13 @@ public: static ACE_Reactor *instance (ACE_Reactor *, bool delete_reactor = false); /// Delete the dynamically allocated Singleton - static void close_singleton (void); + static void close_singleton (); /// Name of the dll in which the dll lives. - static const ACE_TCHAR *dll_name (void); + static const ACE_TCHAR *dll_name (); /// Name of the component--ACE_Reactor in this case. - static const ACE_TCHAR *name (void); + static const ACE_TCHAR *name (); // = Singleton reactor event loop management methods. @@ -110,8 +110,8 @@ public: * * @deprecated Use ACE_Reactor::instance()->run_reactor_event_loop() instead */ - static int run_event_loop (void); - static int run_alertable_event_loop (void); + static int run_event_loop (); + static int run_alertable_event_loop (); /** * Run the event loop until the ACE_Reactor::handle_events() or @@ -136,7 +136,7 @@ public: * * @deprecated Use ACE_Reactor::instance()->end_reactor_event_loop() instead */ - static int end_event_loop (void); + static int end_event_loop (); /** * Report if the ACE_Reactor::instance()'s event loop is finished. @@ -146,7 +146,7 @@ public: * * @deprecated Use ACE_Reactor::instance()->reactor_event_loop_done() instead */ - static int event_loop_done (void); + static int event_loop_done (); /** * Resets the ACE_Reactor::end_event_loop_ static so that the @@ -157,7 +157,7 @@ public: * @deprecated Use ACE_Reactor::instance()->reset_reactor_event_loop() * instead */ - static void reset_event_loop (void); + static void reset_event_loop (); /** * The singleton reactor is used by the ACE_Service_Config. @@ -204,14 +204,14 @@ public: * will be dispatched then. If the reactor is closed or deleted without * further dispatching, the notifications will be lost. */ - int end_reactor_event_loop (void); + int end_reactor_event_loop (); /// Indicate if the Reactor's event loop has been ended. - int reactor_event_loop_done (void); + int reactor_event_loop_done (); /// Resets the ACE_Reactor::end_event_loop_ static so that the /// run_event_loop() method can be restarted. - void reset_reactor_event_loop (void); + void reset_reactor_event_loop (); /** * Create the Reactor using @a implementation. The flag @@ -226,7 +226,7 @@ public: * Any notifications that remain queued on this reactor instance are * lost. */ - virtual ~ACE_Reactor (void); + virtual ~ACE_Reactor (); /** * Initialize the ACE_Reactor to manage @a max_number_of_handles. @@ -247,10 +247,10 @@ public: int timer_queue (ACE_Timer_Queue *tq); /// Return the current ACE_Timer_Queue. - ACE_Timer_Queue *timer_queue (void) const; + ACE_Timer_Queue *timer_queue () const; /// Close down and release all resources. - int close (void); + int close (); // = Event loop drivers. @@ -498,7 +498,7 @@ public: /** * Suspend all registered handles temporarily. */ - int suspend_handlers (void); + int suspend_handlers (); /** * Resume @a handle. @@ -523,13 +523,13 @@ public: /** * Resume all registered handles. */ - int resume_handlers (void); + int resume_handlers (); /// Does the reactor allow the application to resume the handle on /// its own ie. can it pass on the control of handle resumption to /// the application. A positive value indicates that the handlers /// are application resumable. A value of 0 indicates otherwise. - int resumable_handler (void); + int resumable_handler (); // = Timer management. @@ -738,7 +738,7 @@ public: * via the notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - int max_notify_iterations (void); + int max_notify_iterations (); /** * Purge any notifications pending in this reactor for the specified @@ -788,17 +788,17 @@ public: /// Returns true if Reactor has been successfully initialized, else /// false. - int initialized (void); + int initialized (); /// Returns the current size of the Reactor's internal descriptor /// table. - size_t size (void) const; + size_t size () const; /// Returns a reference to the Reactor's internal lock. - ACE_Lock &lock (void); + ACE_Lock &lock (); /// Wake up all threads in waiting in the event loop - void wakeup_all_threads (void); + void wakeup_all_threads (); /// Transfers ownership of Reactor to the @a new_owner. int owner (ACE_thread_t new_owner, @@ -811,10 +811,10 @@ public: void requeue_position (int position); /// Get position of the owner thread. - int requeue_position (void); + int requeue_position (); /// Get the existing restart value. - bool restart (void); + bool restart (); /// Set a new value for restart and return the original value. bool restart (bool r); @@ -846,7 +846,7 @@ public: int ops); /// Get the implementation class - ACE_Reactor_Impl *implementation (void) const; + ACE_Reactor_Impl *implementation () const; /** * Returns 0, if the size of the current message has been put in @@ -858,13 +858,13 @@ public: /// Return true if we any event associations were made by the reactor /// for the handles that it waits on, false otherwise. - bool uses_event_associations (void); + bool uses_event_associations (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; /// Dump the state of the object. - void dump (void) const; + void dump () const; protected: /// Set the implementation class. diff --git a/ACE/ace/Reactor.inl b/ACE/ace/Reactor.inl index bf476306b03..809e63d5922 100644 --- a/ACE/ace/Reactor.inl +++ b/ACE/ace/Reactor.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Run the event loop until the <ACE_Reactor::handle_events> method // returns -1 or the <end_event_loop> method is invoked. ACE_INLINE int -ACE_Reactor::run_event_loop (void) +ACE_Reactor::run_event_loop () { ACE_TRACE ("ACE_Reactor::run_event_loop"); ACE_Reactor *r = ACE_Reactor::instance (); @@ -38,7 +38,7 @@ ACE_Reactor::run_event_loop (ACE_Time_Value &tv) // returns -1 or the <end_event_loop> method is invoked. ACE_INLINE int -ACE_Reactor::run_alertable_event_loop (void) +ACE_Reactor::run_alertable_event_loop () { ACE_TRACE ("ACE_Reactor::run_alertable_event_loop"); ACE_Reactor *r = ACE_Reactor::instance (); @@ -67,7 +67,7 @@ ACE_Reactor::run_alertable_event_loop (ACE_Time_Value &tv) } ACE_INLINE void -ACE_Reactor::reset_event_loop (void) +ACE_Reactor::reset_event_loop () { ACE_TRACE ("ACE_Reactor::reset_event_loop"); @@ -75,7 +75,7 @@ ACE_Reactor::reset_event_loop (void) } ACE_INLINE int -ACE_Reactor::end_event_loop (void) +ACE_Reactor::end_event_loop () { ACE_TRACE ("ACE_Reactor::end_event_loop"); ACE_Reactor::instance ()->end_reactor_event_loop (); @@ -84,14 +84,14 @@ ACE_Reactor::end_event_loop (void) } ACE_INLINE int -ACE_Reactor::event_loop_done (void) +ACE_Reactor::event_loop_done () { ACE_TRACE ("ACE_Reactor::event_loop_done"); return ACE_Reactor::instance ()->reactor_event_loop_done (); } ACE_INLINE int -ACE_Reactor::end_reactor_event_loop (void) +ACE_Reactor::end_reactor_event_loop () { ACE_TRACE ("ACE_Reactor::end_reactor_event_loop"); @@ -101,7 +101,7 @@ ACE_Reactor::end_reactor_event_loop (void) } ACE_INLINE void -ACE_Reactor::reset_reactor_event_loop (void) +ACE_Reactor::reset_reactor_event_loop () { ACE_TRACE ("ACE_Reactor::reset_reactor_event_loop"); @@ -109,13 +109,13 @@ ACE_Reactor::reset_reactor_event_loop (void) } ACE_INLINE int -ACE_Reactor::resumable_handler (void) +ACE_Reactor::resumable_handler () { return this->implementation ()->resumable_handler (); } ACE_INLINE ACE_Reactor_Impl * -ACE_Reactor::implementation (void) const +ACE_Reactor::implementation () const { return this->implementation_; } @@ -156,13 +156,13 @@ ACE_Reactor::timer_queue (ACE_Timer_Queue *tq) } ACE_INLINE ACE_Timer_Queue * -ACE_Reactor::timer_queue (void) const +ACE_Reactor::timer_queue () const { return this->implementation ()->timer_queue (); } ACE_INLINE int -ACE_Reactor::close (void) +ACE_Reactor::close () { return this->implementation ()->close (); } @@ -279,7 +279,7 @@ ACE_Reactor::suspend_handler (const ACE_Handle_Set &handles) } ACE_INLINE int -ACE_Reactor::suspend_handlers (void) +ACE_Reactor::suspend_handlers () { return this->implementation ()->suspend_handlers (); } @@ -303,7 +303,7 @@ ACE_Reactor::resume_handler (const ACE_Handle_Set &handles) } ACE_INLINE int -ACE_Reactor::resume_handlers (void) +ACE_Reactor::resume_handlers () { return this->implementation ()->resume_handlers (); } @@ -338,7 +338,7 @@ ACE_Reactor::max_notify_iterations (int iterations) } ACE_INLINE int -ACE_Reactor::max_notify_iterations (void) +ACE_Reactor::max_notify_iterations () { return this->implementation ()->max_notify_iterations (); } @@ -372,19 +372,19 @@ ACE_Reactor::handler (int signum, } ACE_INLINE int -ACE_Reactor::initialized (void) +ACE_Reactor::initialized () { return this->implementation ()->initialized (); } ACE_INLINE ACE_Lock & -ACE_Reactor::lock (void) +ACE_Reactor::lock () { return this->implementation ()->lock (); } ACE_INLINE void -ACE_Reactor::wakeup_all_threads (void) +ACE_Reactor::wakeup_all_threads () { this->implementation ()->wakeup_all_threads (); } @@ -402,7 +402,7 @@ ACE_Reactor::owner (ACE_thread_t *owner) } ACE_INLINE bool -ACE_Reactor::restart (void) +ACE_Reactor::restart () { return this->implementation ()->restart (); } @@ -420,7 +420,7 @@ ACE_Reactor::requeue_position (int position) } ACE_INLINE int -ACE_Reactor::requeue_position (void) +ACE_Reactor::requeue_position () { return this->implementation ()->requeue_position (); } @@ -458,26 +458,26 @@ ACE_Reactor::ready_ops (ACE_HANDLE handle, } ACE_INLINE int -ACE_Reactor::reactor_event_loop_done (void) +ACE_Reactor::reactor_event_loop_done () { ACE_TRACE ("ACE_Reactor::reactor_event_loop_done"); return this->implementation_->deactivated (); } ACE_INLINE size_t -ACE_Reactor::size (void) const +ACE_Reactor::size () const { return this->implementation ()->size (); } ACE_INLINE bool -ACE_Reactor::uses_event_associations (void) +ACE_Reactor::uses_event_associations () { return this->implementation ()->uses_event_associations (); } ACE_INLINE void -ACE_Reactor::dump (void) const +ACE_Reactor::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Reactor::dump"); diff --git a/ACE/ace/Reactor_Impl.h b/ACE/ace/Reactor_Impl.h index dcb18c666b4..696b7a35a0c 100644 --- a/ACE/ace/Reactor_Impl.h +++ b/ACE/ace/Reactor_Impl.h @@ -49,7 +49,7 @@ public: virtual int open (ACE_Reactor_Impl *, ACE_Timer_Queue *timer_queue = 0, int disable_notify = 0) = 0; - virtual int close (void) = 0; + virtual int close () = 0; /** * Called by a thread when it wants to unblock the Reactor_Impl. @@ -73,7 +73,7 @@ public: /// Returns the ACE_HANDLE of the notify pipe on which the reactor /// is listening for notifications so that other threads can unblock /// the Reactor_Impl - virtual ACE_HANDLE notify_handle (void) = 0; + virtual ACE_HANDLE notify_handle () = 0; /// Verify whether the buffer has dispatchable info or not. virtual int is_dispatchable (ACE_Notification_Buffer &buffer)= 0; @@ -104,7 +104,7 @@ public: * passed in via the notify queue before breaking out of its event * loop. */ - virtual int max_notify_iterations (void) = 0; + virtual int max_notify_iterations () = 0; /** * Purge any notifications pending in this reactor for the specified @@ -115,7 +115,7 @@ public: ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) = 0; /// Dump the state of an object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; }; /** @@ -127,7 +127,7 @@ class ACE_Export ACE_Reactor_Impl { public: /// Close down and release all resources. - virtual ~ACE_Reactor_Impl (void); + virtual ~ACE_Reactor_Impl (); /// Initialization. virtual int open (size_t size, @@ -151,10 +151,10 @@ public: virtual int timer_queue (ACE_Timer_Queue *tq) = 0; /// Return the current ACE_Timer_Queue. - virtual ACE_Timer_Queue *timer_queue (void) const = 0; + virtual ACE_Timer_Queue *timer_queue () const = 0; /// Close down and release all resources. - virtual int close (void) = 0; + virtual int close () = 0; // = Event loop drivers. /** @@ -209,7 +209,7 @@ public: * actively handling events. If it returns non-zero, handling_events() and * handle_alertable_events() return -1 immediately. */ - virtual int deactivated (void) = 0; + virtual int deactivated () = 0; /** * Control whether the Reactor will handle any more incoming events or not. @@ -335,7 +335,7 @@ public: virtual int suspend_handler (const ACE_Handle_Set &handles) = 0; /// Suspend all <handles> temporarily. - virtual int suspend_handlers (void) = 0; + virtual int suspend_handlers () = 0; /// Resume @a event_handler. Uses ACE_Event_Handler::get_handle() to /// get the handle. @@ -348,16 +348,16 @@ public: virtual int resume_handler (const ACE_Handle_Set &handles) = 0; /// Resume all handles. - virtual int resume_handlers (void) = 0; + virtual int resume_handlers () = 0; /// Does the reactor allow the application to resume the handle on /// its own ie. can it pass on the control of handle resumption to /// the application - virtual int resumable_handler (void) = 0; + virtual int resumable_handler () = 0; /// Return true if we any event associations were made by the reactor /// for the handles that it waits on, false otherwise. - virtual bool uses_event_associations (void) = 0; + virtual bool uses_event_associations () = 0; // If we need to reset handles returned from accept/connect. @@ -463,7 +463,7 @@ public: * via the notify queue before breaking out of its * ACE_Message_Queue::dequeue() loop. */ - virtual int max_notify_iterations (void) = 0; + virtual int max_notify_iterations () = 0; /** * Purge any notifications pending in this reactor for the specified @@ -498,17 +498,17 @@ public: /// Returns true if Reactor has been successfully initialized, else /// false. - virtual bool initialized (void) = 0; + virtual bool initialized () = 0; /// Returns the current size of the Reactor's internal descriptor /// table. - virtual size_t size (void) const = 0; + virtual size_t size () const = 0; /// Returns a reference to the Reactor's internal lock. - virtual ACE_Lock &lock (void) = 0; + virtual ACE_Lock &lock () = 0; /// Wake up all threads in waiting in the event loop - virtual void wakeup_all_threads (void) = 0; + virtual void wakeup_all_threads () = 0; /// Transfers ownership of Reactor_Impl to the @a new_owner. virtual int owner (ACE_thread_t new_owner, ACE_thread_t *old_owner = 0) = 0; @@ -517,7 +517,7 @@ public: virtual int owner (ACE_thread_t *owner) = 0; /// Get the existing restart value. - virtual bool restart (void) = 0; + virtual bool restart () = 0; /// Set a new value for restart and return the original value. virtual bool restart (bool r) = 0; @@ -526,7 +526,7 @@ public: virtual void requeue_position (int) = 0; /// Get position of the owner thread. - virtual int requeue_position (void) = 0; + virtual int requeue_position () = 0; // = Low-level wait_set mask manipulation methods. @@ -555,7 +555,7 @@ public: int ops) = 0; /// Dump the state of an object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h index 150fd55fa67..71202e0ccf7 100644 --- a/ACE/ace/Reactor_Timer_Interface.h +++ b/ACE/ace/Reactor_Timer_Interface.h @@ -31,7 +31,7 @@ class ACE_Event_Handler; class ACE_Export ACE_Reactor_Timer_Interface { public: - virtual ~ACE_Reactor_Timer_Interface (void); + virtual ~ACE_Reactor_Timer_Interface (); virtual long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, diff --git a/ACE/ace/Recyclable.h b/ACE/ace/Recyclable.h index 47d06052f96..3ffe4bed865 100644 --- a/ACE/ace/Recyclable.h +++ b/ACE/ace/Recyclable.h @@ -48,10 +48,10 @@ class ACE_Export ACE_Recyclable { public: /// Destructor. - virtual ~ACE_Recyclable (void); + virtual ~ACE_Recyclable (); /// Get the recyclable bit - ACE_Recyclable_State recycle_state (void) const; + ACE_Recyclable_State recycle_state () const; /// Set the recyclable bit void recycle_state (ACE_Recyclable_State new_state); diff --git a/ACE/ace/Recyclable.inl b/ACE/ace/Recyclable.inl index 7a7e3fda268..08892ad9251 100644 --- a/ACE/ace/Recyclable.inl +++ b/ACE/ace/Recyclable.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Recyclable_State -ACE_Recyclable::recycle_state (void) const +ACE_Recyclable::recycle_state () const { return this->recycle_state_; } diff --git a/ACE/ace/Refcountable_T.cpp b/ACE/ace/Refcountable_T.cpp index 5ffada80af7..b0d79661193 100644 --- a/ACE/ace/Refcountable_T.cpp +++ b/ACE/ace/Refcountable_T.cpp @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_LOCK> -ACE_Refcountable_T<ACE_LOCK>::~ACE_Refcountable_T (void) +ACE_Refcountable_T<ACE_LOCK>::~ACE_Refcountable_T () { } diff --git a/ACE/ace/Refcountable_T.h b/ACE/ace/Refcountable_T.h index b4916bf986c..0d7f09829ae 100644 --- a/ACE/ace/Refcountable_T.h +++ b/ACE/ace/Refcountable_T.h @@ -29,16 +29,16 @@ class ACE_Refcountable_T { public: /// Destructor. - virtual ~ACE_Refcountable_T (void); + virtual ~ACE_Refcountable_T (); /// Increment refcount - long increment (void); + long increment (); /// Decrement refcount - long decrement (void); + long decrement (); /// Returns the current refcount. - long refcount (void) const; + long refcount () const; protected: /// Protected constructor. diff --git a/ACE/ace/Refcountable_T.inl b/ACE/ace/Refcountable_T.inl index 7a901476d9a..1bbc937546e 100644 --- a/ACE/ace/Refcountable_T.inl +++ b/ACE/ace/Refcountable_T.inl @@ -11,21 +11,21 @@ ACE_Refcountable_T<ACE_LOCK>::ACE_Refcountable_T (long refcount) template <class ACE_LOCK> ACE_INLINE long -ACE_Refcountable_T<ACE_LOCK>::increment (void) +ACE_Refcountable_T<ACE_LOCK>::increment () { return ++this->refcount_; } template <class ACE_LOCK> ACE_INLINE long -ACE_Refcountable_T<ACE_LOCK>::decrement (void) +ACE_Refcountable_T<ACE_LOCK>::decrement () { return --this->refcount_; } template <class ACE_LOCK> ACE_INLINE long -ACE_Refcountable_T<ACE_LOCK>::refcount (void) const +ACE_Refcountable_T<ACE_LOCK>::refcount () const { return this->refcount_.value (); } diff --git a/ACE/ace/Service_Types.h b/ACE/ace/Service_Types.h index 998cf16ed48..af7179ed4c3 100644 --- a/ACE/ace/Service_Types.h +++ b/ACE/ace/Service_Types.h @@ -42,29 +42,29 @@ public: u_int flags = 0, ACE_Service_Object_Exterminator gobbler = 0, int stype = ACE_Service_Type::INVALID_TYPE); - virtual ~ACE_Service_Type_Impl (void); + virtual ~ACE_Service_Type_Impl (); // = Pure virtual interface (must be defined by the subclass). - virtual int suspend (void) const = 0; - virtual int resume (void) const = 0; + virtual int suspend () const = 0; + virtual int resume () const = 0; virtual int init (int argc, ACE_TCHAR *argv[]) const = 0; - virtual int fini (void) const; + virtual int fini () const; virtual int info (ACE_TCHAR **str, size_t len) const = 0; /// The pointer to the service. - void *object (void) const; + void *object () const; /// Get the name of the service. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; /// Set the name of the service. void name (const ACE_TCHAR *); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// get the service_type of this service - int service_type (void) const; + int service_type () const; /// set the service_type of this service void service_type (int stype); @@ -107,13 +107,13 @@ public: ACE_Service_Object_Exterminator gobbler = 0, int stype = ACE_Service_Type::SERVICE_OBJECT); - ~ACE_Service_Object_Type (void); + ~ACE_Service_Object_Type (); // = Implement the hooks for <ACE_Service_Objects>. - virtual int suspend (void) const; - virtual int resume (void) const; + virtual int suspend () const; + virtual int resume () const; virtual int init (int argc, ACE_TCHAR *argv[]) const; - virtual int fini (void) const; + virtual int fini () const; virtual int info (ACE_TCHAR **str, size_t len) const; private: @@ -135,23 +135,23 @@ public: u_int flags = 0, int stype = ACE_Service_Type::MODULE); - ~ACE_Module_Type (void); + ~ACE_Module_Type (); // = Implement the hooks for <ACE_Modules>. - virtual int suspend (void) const; - virtual int resume (void) const; + virtual int suspend () const; + virtual int resume () const; virtual int init (int argc, ACE_TCHAR *argv[]) const; - virtual int fini (void) const; + virtual int fini () const; virtual int info (ACE_TCHAR **str, size_t len) const; /// Get the link pointer. - ACE_Module_Type *link (void) const; + ACE_Module_Type *link () const; /// Set the link pointer. void link (ACE_Module_Type *); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -175,13 +175,13 @@ public: u_int flags = 0, int stype = ACE_Service_Type::STREAM); - ~ACE_Stream_Type (void); + ~ACE_Stream_Type (); // = Implement the hooks for <ACE_Streams>. - virtual int suspend (void) const; - virtual int resume (void) const; + virtual int suspend () const; + virtual int resume () const; virtual int init (int argc, ACE_TCHAR *argv[]) const; - virtual int fini (void) const; + virtual int fini () const; virtual int info (ACE_TCHAR **str, size_t len) const; /// Add a new ACE_Module to the top of the ACE_Stream. @@ -194,7 +194,7 @@ public: ACE_Module_Type *find (const ACE_TCHAR *module_name) const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Service_Types.inl b/ACE/ace/Service_Types.inl index cb13c1c4ec4..f32aa55c9fd 100644 --- a/ACE/ace/Service_Types.inl +++ b/ACE/ace/Service_Types.inl @@ -4,14 +4,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void * -ACE_Service_Type_Impl::object (void) const +ACE_Service_Type_Impl::object () const { ACE_TRACE ("ACE_Service_Type_Impl::object"); return this->obj_; } ACE_INLINE const ACE_TCHAR * -ACE_Service_Type_Impl::name (void) const +ACE_Service_Type_Impl::name () const { ACE_TRACE ("ACE_Service_Type_Impl::name"); return this->name_; @@ -27,7 +27,7 @@ ACE_Service_Type_Impl::name (const ACE_TCHAR *n) } ACE_INLINE int -ACE_Service_Type_Impl::service_type (void) const +ACE_Service_Type_Impl::service_type () const { return service_type_; } diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 723bc1e2749..4afcd174683 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -27,7 +27,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class SVC_HANDLER> -ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy (void) +ACE_Recycling_Strategy<SVC_HANDLER>::~ACE_Recycling_Strategy () { } @@ -47,7 +47,7 @@ ACE_Recycling_Strategy<SVC_HANDLER>::prepare_for_recycling (SVC_HANDLER *svc_han } template <class SVC_HANDLER> -ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy (void) +ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy () { ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::~ACE_Singleton_Strategy"); if (this->delete_svc_handler_) @@ -505,7 +505,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> -ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cached_Connect_Strategy (void) +ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::~ACE_Cached_Connect_Strategy () { if (this->delete_lock_) delete this->lock_; @@ -1180,19 +1180,19 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cleanup_h } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Creation_Strategy<SVC_HANDLER> * -ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::creation_strategy (void) const +ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::creation_strategy () const { return this->creation_strategy_; } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Recycling_Strategy<SVC_HANDLER> * -ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycling_strategy (void) const +ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::recycling_strategy () const { return this->recycling_strategy_; } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> ACE_Concurrency_Strategy<SVC_HANDLER> * -ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurrency_strategy (void) const +ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::concurrency_strategy () const { return this->concurrency_strategy_; } @@ -1237,7 +1237,7 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::find ( } template <class SVC_HANDLER> void -ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const +ACE_DLL_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::dump"); @@ -1245,14 +1245,14 @@ ACE_DLL_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> -ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy (void) +ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy () { ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::~ACE_Concurrency_Strategy"); } template <class SVC_HANDLER> void -ACE_Concurrency_Strategy<SVC_HANDLER>::dump (void) const +ACE_Concurrency_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Concurrency_Strategy<SVC_HANDLER>::dump"); @@ -1260,14 +1260,14 @@ ACE_Concurrency_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> -ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy (void) +ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy () { ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::~ACE_Reactive_Strategy"); } template <class SVC_HANDLER> void -ACE_Reactive_Strategy<SVC_HANDLER>::dump (void) const +ACE_Reactive_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::dump"); @@ -1275,13 +1275,13 @@ ACE_Reactive_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> -ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy (void) +ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy () { ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::~ACE_Thread_Strategy"); } template <class SVC_HANDLER> void -ACE_Thread_Strategy<SVC_HANDLER>::dump (void) const +ACE_Thread_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Thread_Strategy<SVC_HANDLER>::dump"); @@ -1289,7 +1289,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (void) +ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy () { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy"); @@ -1298,21 +1298,21 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Accept_Strategy (voi } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_HANDLE -ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle (void) const +ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle () const { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::get_handle"); return this->peer_acceptor_.get_handle (); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> ACE_PEER_ACCEPTOR & -ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor (void) const +ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor () const { ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::acceptor"); return (ACE_PEER_ACCEPTOR &) this->peer_acceptor_; } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> void -ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const +ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); @@ -1320,20 +1320,20 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy (void) +ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy () { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::~ACE_Connect_Strategy"); } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_PEER_CONNECTOR & -ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector (void) const +ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector () const { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connector"); return (ACE_PEER_CONNECTOR &) this->connector_; } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> void -ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const +ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump"); @@ -1341,13 +1341,13 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const } template <class SVC_HANDLER> -ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy (void) +ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy () { ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::~ACE_Process_Strategy"); } template <class SVC_HANDLER> void -ACE_Process_Strategy<SVC_HANDLER>::dump (void) const +ACE_Process_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::dump"); @@ -1355,27 +1355,27 @@ ACE_Process_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> -ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy (void) +ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy () { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::~ACE_Scheduling_Strategy"); } template <class SVC_HANDLER> int -ACE_Scheduling_Strategy<SVC_HANDLER>::suspend (void) +ACE_Scheduling_Strategy<SVC_HANDLER>::suspend () { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::suspend"); return -1; } template <class SVC_HANDLER> int -ACE_Scheduling_Strategy<SVC_HANDLER>::resume (void) +ACE_Scheduling_Strategy<SVC_HANDLER>::resume () { ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::resume"); return -1; } template <class SVC_HANDLER> void -ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const +ACE_Scheduling_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Scheduling_Strategy<SVC_HANDLER>::dump"); @@ -1386,21 +1386,21 @@ ACE_Scheduling_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> int -ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend (void) +ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend () { ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::suspend"); return this->reactor_->suspend_handlers (); } template <class SVC_HANDLER> int -ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume (void) +ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume () { ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::resume"); return this->reactor_->resume_handlers (); } template <class SVC_HANDLER> void -ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump (void) const +ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump"); @@ -1410,21 +1410,21 @@ ACE_Schedule_All_Reactive_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> int -ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend (void) +ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend () { ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::suspend"); return this->thr_mgr_->suspend_all (); } template <class SVC_HANDLER> int -ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume (void) +ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume () { ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::resume"); return this->thr_mgr_->resume_all (); } template <class SVC_HANDLER> void -ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const +ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump"); @@ -1434,12 +1434,12 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::dump (void) const } template <class T> -ACE_Refcounted_Hash_Recyclable<T>::~ACE_Refcounted_Hash_Recyclable (void) +ACE_Refcounted_Hash_Recyclable<T>::~ACE_Refcounted_Hash_Recyclable () { } template <class SVC_HANDLER> void -ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const +ACE_Singleton_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::dump"); @@ -1447,7 +1447,7 @@ ACE_Singleton_Strategy<SVC_HANDLER>::dump (void) const } template <class SVC_HANDLER> -ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy (void) +ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy () { ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::~ACE_Creation_Strategy"); } @@ -1467,7 +1467,7 @@ ACE_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh) } template <class SVC_HANDLER> void -ACE_Creation_Strategy<SVC_HANDLER>::dump (void) const +ACE_Creation_Strategy<SVC_HANDLER>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::dump"); diff --git a/ACE/ace/Strategies_T.h b/ACE/ace/Strategies_T.h index c505b413799..6fc19dcbede 100644 --- a/ACE/ace/Strategies_T.h +++ b/ACE/ace/Strategies_T.h @@ -54,7 +54,7 @@ public: typedef typename SVC_HANDLER::stream_type stream_type; /// Virtual Destructor - virtual ~ACE_Recycling_Strategy (void); + virtual ~ACE_Recycling_Strategy (); /// Tell the Svc_Handler something about the recycler, so that it can /// reach the recycler when necessary. @@ -96,7 +96,7 @@ public: int open (ACE_Thread_Manager * = 0, ACE_Reactor * = ACE_Reactor::instance ()); - virtual ~ACE_Creation_Strategy (void); + virtual ~ACE_Creation_Strategy (); // = Factory method. /** @@ -108,7 +108,7 @@ public: virtual int make_svc_handler (SVC_HANDLER *&sh); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -143,7 +143,7 @@ public: ACE_Thread_Manager * = 0); int open (SVC_HANDLER *, ACE_Thread_Manager * = 0); - virtual ~ACE_Singleton_Strategy (void); + virtual ~ACE_Singleton_Strategy (); // = Factory method. /// Create a Singleton SVC_HANDLER by always returning the same @@ -151,7 +151,7 @@ public: virtual int make_svc_handler (SVC_HANDLER *&); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -181,7 +181,7 @@ public: // = Intialization and termination methods. /// "Do-nothing" constructor. - ACE_DLL_Strategy (void); + ACE_DLL_Strategy (); /// Initialize the DLL strategy based upon the service's DLL /// information contained in the <svc_dll_info> string. @@ -205,7 +205,7 @@ public: virtual int make_svc_handler (SVC_HANDLER *&); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -263,10 +263,10 @@ public: virtual int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg = 0); - virtual ~ACE_Concurrency_Strategy (void); + virtual ~ACE_Concurrency_Strategy (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -311,7 +311,7 @@ public: int flags = 0); /// Destructor. - virtual ~ACE_Reactive_Strategy (void); + virtual ~ACE_Reactive_Strategy (); // = Factory method. /// Activate the @a svc_handler by registering it with the <Reactor> @@ -320,7 +320,7 @@ public: void *arg = 0); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -372,7 +372,7 @@ public: int n_threads = 1, int flags = 0); - virtual ~ACE_Thread_Strategy (void); + virtual ~ACE_Thread_Strategy (); // = Factory method. /** @@ -385,7 +385,7 @@ public: void *arg = 0); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -439,7 +439,7 @@ public: ACE_Reactor * = 0, int avoid_zombies = 0); - virtual ~ACE_Process_Strategy (void); + virtual ~ACE_Process_Strategy (); // = Factory method. /** @@ -452,7 +452,7 @@ public: void *arg = 0); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -511,12 +511,12 @@ public: bool reuse_addr = false); /// Return the underlying ACE_HANDLE of the <peer_acceptor_>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Return a reference to the <peer_acceptor_>. - virtual ACE_PEER_ACCEPTOR &acceptor (void) const; + virtual ACE_PEER_ACCEPTOR &acceptor () const; - virtual ~ACE_Accept_Strategy (void); + virtual ~ACE_Accept_Strategy (); // = Factory method. /// The default behavior delegates to the <accept> method of the @@ -524,7 +524,7 @@ public: virtual int accept_svc_handler (SVC_HANDLER *); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -563,12 +563,12 @@ public: typedef typename SVC_HANDLER::stream_type stream_type; /// Default constructor. - ACE_Connect_Strategy (void); + ACE_Connect_Strategy (); /// Return a reference to the <peer_connector_>. - virtual ACE_PEER_CONNECTOR &connector (void) const; + virtual ACE_PEER_CONNECTOR &connector () const; - virtual ~ACE_Connect_Strategy (void); + virtual ~ACE_Connect_Strategy (); // = Factory method. /// The default behavior delegates to the <connect> method of the @@ -596,7 +596,7 @@ public: int perms); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -629,18 +629,18 @@ public: ACE_Scheduling_Strategy (SVC_HANDLER * = 0); /// Destructor - virtual ~ACE_Scheduling_Strategy (void); + virtual ~ACE_Scheduling_Strategy (); // = Scheduling methods /// Suspend hook. - virtual int suspend (void); + virtual int suspend (); /// Resume hook. - virtual int resume (void); + virtual int resume (); /// Dump the state of the object. - virtual void dump (void) const; + virtual void dump () const; }; /** @@ -666,13 +666,13 @@ public: // = Scheduling methods /// Suspend hook. - virtual int suspend (void); + virtual int suspend (); /// Resume hook. - virtual int resume (void); + virtual int resume (); /// Dump the state of the object. - virtual void dump (void) const; + virtual void dump () const; protected: @@ -703,13 +703,13 @@ public: // = Scheduling methods /// Suspend hook. - virtual int suspend (void); + virtual int suspend (); /// Resume hook. - virtual int resume (void); + virtual int resume (); /// Dump the state of the object. - virtual void dump (void) const; + virtual void dump () const; protected: @@ -773,7 +773,7 @@ class ACE_Refcounted_Hash_Recyclable : public ACE_Refcountable_T<ACE_Null_Mutex { public: /// Default constructor. - ACE_Refcounted_Hash_Recyclable (void); + ACE_Refcounted_Hash_Recyclable (); /// Constructor. ACE_Refcounted_Hash_Recyclable (const T &t, @@ -781,7 +781,7 @@ public: ACE_Recyclable_State state = ACE_RECYCLABLE_UNKNOWN); /// Destructor - virtual ~ACE_Refcounted_Hash_Recyclable (void); + virtual ~ACE_Refcounted_Hash_Recyclable (); /// Compares two instances. bool operator== (const ACE_Refcounted_Hash_Recyclable<T> &rhs) const; @@ -791,7 +791,7 @@ public: protected: /// Computes and returns hash value. - u_long hash_i (void) const; + u_long hash_i () const; T t_; }; @@ -846,7 +846,7 @@ public: bool delete_lock = false); /// Destructor - virtual ~ACE_Cached_Connect_Strategy (void); + virtual ~ACE_Cached_Connect_Strategy (); /// This methods allow you to change the strategies used by the /// cached connector. @@ -936,9 +936,9 @@ public: typedef ACE_Reverse_Lock<MUTEX> REVERSE_MUTEX; // = Strategy accessors - virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const; - virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy (void) const; - virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const; + virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy () const; + virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy () const; + virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy () const; protected: diff --git a/ACE/ace/Strategies_T.inl b/ACE/ace/Strategies_T.inl index ef16da28447..8e249962d61 100644 --- a/ACE/ace/Strategies_T.inl +++ b/ACE/ace/Strategies_T.inl @@ -54,7 +54,7 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[], } template <class SVC_HANDLER> ACE_INLINE -ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (void) +ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy () { ACE_TRACE ("ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy"); } @@ -125,7 +125,7 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy (ACE_ } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> ACE_INLINE -ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy (void) +ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy () { ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Connect_Strategy"); } @@ -179,7 +179,7 @@ ACE_Schedule_All_Threaded_Strategy<SVC_HANDLER>::ACE_Schedule_All_Threaded_Strat } template <class T> ACE_INLINE -ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (void) +ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable () : ACE_Refcountable_T<ACE_Null_Mutex> (0), ACE_Hashable (), ACE_Recyclable (ACE_RECYCLABLE_UNKNOWN), @@ -199,13 +199,13 @@ ACE_Refcounted_Hash_Recyclable<T>::ACE_Refcounted_Hash_Recyclable (const T &t, } template <class T> ACE_INLINE u_long -ACE_Refcounted_Hash_Recyclable<T>::hash_i (void) const +ACE_Refcounted_Hash_Recyclable<T>::hash_i () const { return this->t_.hash (); } template <class T> ACE_INLINE T & -ACE_Refcounted_Hash_Recyclable<T>::subject (void) +ACE_Refcounted_Hash_Recyclable<T>::subject () { return this->t_; } diff --git a/ACE/ace/Stream_Modules.cpp b/ACE/ace/Stream_Modules.cpp index 4533d1b371b..2114de2f85f 100644 --- a/ACE/ace/Stream_Modules.cpp +++ b/ACE/ace/Stream_Modules.cpp @@ -14,19 +14,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Stream_Head) template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head (void) +ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head () { ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Head"); } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head (void) +ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head () { ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Head"); } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -50,7 +50,7 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::close (u_long) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc (void) +ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc () { ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::svc"); return -1; @@ -145,7 +145,7 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp, size_t leng } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini (void) +ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini () { ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini"); return 0; @@ -154,19 +154,19 @@ ACE_Stream_Head<ACE_SYNCH_USE, TIME_POLICY>::fini (void) ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Stream_Tail) template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail (void) +ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail () { ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream_Tail"); } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail (void) +ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail () { ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Stream_Tail"); } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -188,7 +188,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::close (u_long) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc (void) +ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc () { ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::svc"); return -1; @@ -289,7 +289,7 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp, size_t leng } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini (void) +ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini () { ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini"); return 0; @@ -298,19 +298,19 @@ ACE_Stream_Tail<ACE_SYNCH_USE, TIME_POLICY>::fini (void) ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Thru_Task) template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task (void) +ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task () { ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Thru_Task"); } template <ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task (void) +ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task () { ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Thru_Task"); } template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -332,7 +332,7 @@ ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::close (u_long) } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc (void) +ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc () { ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::svc"); return -1; @@ -368,7 +368,7 @@ ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::info (ACE_TCHAR **strp, } template <ACE_SYNCH_DECL, class TIME_POLICY> int -ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini (void) +ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini () { ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_USE, TIME_POLICY>::fini"); return 0; diff --git a/ACE/ace/Stream_Modules.h b/ACE/ace/Stream_Modules.h index 1760e3b89e7..e3b12d8e06c 100644 --- a/ACE/ace/Stream_Modules.h +++ b/ACE/ace/Stream_Modules.h @@ -50,24 +50,24 @@ class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY> { public: /// Construction - ACE_Stream_Head (void); + ACE_Stream_Head (); /// Destruction - virtual ~ACE_Stream_Head (void); + virtual ~ACE_Stream_Head (); // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); + virtual int svc (); // = Dynamic linking hooks virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); + virtual int fini (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -88,24 +88,24 @@ class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY> { public: /// Construction - ACE_Stream_Tail (void); + ACE_Stream_Tail (); /// Destruction - virtual ~ACE_Stream_Tail (void); + virtual ~ACE_Stream_Tail (); // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); + virtual int svc (); // = Dynamic linking hooks virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); + virtual int fini (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -127,24 +127,24 @@ class ACE_Thru_Task : public ACE_Task<ACE_SYNCH_USE, TIME_POLICY> { public: /// Construction - ACE_Thru_Task (void); + ACE_Thru_Task (); /// Destruction - virtual ~ACE_Thru_Task (void); + virtual ~ACE_Thru_Task (); // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0); - virtual int svc (void); + virtual int svc (); // = Dynamic linking hooks virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **info_string, size_t length) const; - virtual int fini (void); + virtual int fini (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp index 1774e0188da..c5779be5420 100644 --- a/ACE/ace/Svc_Handler.cpp +++ b/ACE/ace/Svc_Handler.cpp @@ -98,7 +98,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::operator delete (void *p, #endif /* ACE_HAS_NEW_NOTHROW */ template <typename PEER_STREAM, typename SYNCH_TRAITS> void -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy (void) +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy () { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::destroy"); @@ -191,7 +191,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::open (void *) // Perform termination activities. template <typename PEER_STREAM, typename SYNCH_TRAITS> void -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown (void) +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown () { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::shutdown"); @@ -228,7 +228,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::cleanup_hint (void **act_holder) } template <typename PEER_STREAM, typename SYNCH_TRAITS> void -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump"); @@ -250,7 +250,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const } template <typename PEER_STREAM, typename SYNCH_TRAITS> PEER_STREAM & -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer () const { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer"); return (PEER_STREAM &) this->peer_; @@ -259,7 +259,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::peer (void) const // Extract the underlying I/O descriptor. template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_HANDLE -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle () const { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::get_handle"); return this->peer_.get_handle (); @@ -275,7 +275,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::set_handle (ACE_HANDLE h) } template <typename PEER_STREAM, typename SYNCH_TRAITS> -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler (void) +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler () { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Svc_Handler"); @@ -329,7 +329,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::init (int /* argc */, } template <typename PEER_STREAM, typename SYNCH_TRAITS> int -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini (void) +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini () { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::fini"); return -1; @@ -362,7 +362,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (ACE_Recyclable_State } template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Recyclable_State -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle_state () const { if (this->recycler ()) return this->recycler ()->recycle_state (this->recycling_act_); @@ -380,14 +380,14 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (ACE_Connection_Recycling_S } template <typename PEER_STREAM, typename SYNCH_TRAITS> ACE_Connection_Recycling_Strategy * -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler () const { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycler"); return this->recycler_; } template <typename PEER_STREAM, typename SYNCH_TRAITS> const void * -ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act (void) const +ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act () const { ACE_TRACE ("ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycling_act"); return this->recycling_act_; @@ -402,7 +402,7 @@ ACE_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::recycle (void *) } template <typename PEER_STREAM, typename SYNCH_TRAITS> -ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler (void) +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::~ACE_Buffered_Svc_Handler () { this->flush (); } @@ -455,7 +455,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::put (ACE_Message_Block *mb, // Flush the buffer. template <typename PEER_STREAM, typename SYNCH_TRAITS> int -ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void) +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush () { ACE_GUARD_RETURN (typename SYNCH_TRAITS::MUTEX, m, this->msg_queue ()->lock (), -1); @@ -463,7 +463,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush (void) } template <typename PEER_STREAM, typename SYNCH_TRAITS> int -ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void) +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i () { ACE_Message_Queue_Iterator<SYNCH_TRAITS> iterator (*this->msg_queue ()); ACE_Message_Block *mblk = 0; @@ -488,7 +488,7 @@ ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::flush_i (void) } template <typename PEER_STREAM, typename SYNCH_TRAITS> void -ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump (void) const +ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Buffered_Svc_Handler<PEER_STREAM, SYNCH_TRAITS>::dump"); diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h index 15ef09f795c..e1cfef9a878 100644 --- a/ACE/ace/Svc_Handler.h +++ b/ACE/ace/Svc_Handler.h @@ -83,7 +83,7 @@ public: ACE_Reactor *reactor = ACE_Reactor::instance ()); /// Destructor. - virtual ~ACE_Svc_Handler (void); + virtual ~ACE_Svc_Handler (); /// Activate the client handler. This is typically called by the /// ACE_Acceptor or ACE_Connector, which passes "this" in as the @@ -115,7 +115,7 @@ public: * will have no effect (and the accessor will return * ACE_RECYCLABLE_UNKNOWN). */ - virtual ACE_Recyclable_State recycle_state (void) const; + virtual ACE_Recyclable_State recycle_state () const; virtual int recycle_state (ACE_Recyclable_State new_state); /** @@ -132,7 +132,7 @@ public: /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int fini (void); + virtual int fini (); /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. @@ -155,14 +155,14 @@ public: const void *); /// Get the underlying handle associated with the <peer_>. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Set the underlying handle associated with the <peer_>. virtual void set_handle (ACE_HANDLE); /// Returns the underlying PEER_STREAM. Used by /// <ACE_Acceptor::accept> and <ACE_Connector::connect> factories. - PEER_STREAM &peer (void) const; + PEER_STREAM &peer () const; /// Overloaded new operator. This method unobtrusively records if a /// <Svc_Handler> is allocated dynamically, which allows it to clean @@ -191,7 +191,7 @@ public: * whether or not the object was allocated dynamically, and can act * accordingly (i.e., deleting it if it was allocated dynamically). */ - virtual void destroy (void); + virtual void destroy (); /** * This really should be private so that users are forced to call @@ -212,10 +212,10 @@ public: #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */ /// Close down the descriptor and unregister from the Reactor - void shutdown (void); + void shutdown (); /// Dump the state of an object. - void dump (void) const; + void dump () const; public: @@ -232,10 +232,10 @@ public: const void *recycling_act); /// Get the recycler. - virtual ACE_Connection_Recycling_Strategy *recycler (void) const; + virtual ACE_Connection_Recycling_Strategy *recycler () const; /// Get the recycling act. - virtual const void *recycling_act (void) const; + virtual const void *recycling_act () const; /** * Upcall made by the recycler when it is about to recycle the @@ -295,7 +295,7 @@ public: ACE_Time_Value *relative_timeout = 0); /// Destructor, which calls <flush>. - virtual ~ACE_Buffered_Svc_Handler (void); + virtual ~ACE_Buffered_Svc_Handler (); /** * Insert the ACE_Message_Block chain rooted at @a message_block @@ -309,7 +309,7 @@ public: /// Flush the ACE_Message_Queue, which writes all the queued /// ACE_Message_Blocks to the <PEER_STREAM>. - virtual int flush (void); + virtual int flush (); /// This method is not currently implemented -- this is where the /// integration with the <Reactor> would occur. @@ -317,13 +317,13 @@ public: const void *); /// Dump the state of an object. - void dump (void) const; + void dump () const; protected: /// Implement the flush operation on the ACE_Message_Queue, which /// writes all the queued ACE_Message_Blocks to the <PEER_STREAM>. /// Assumes that the caller holds the lock. - virtual int flush_i (void); + virtual int flush_i (); /// Maximum size the <Message_Queue> can be before we have to flush /// the buffer. diff --git a/ACE/ace/Synch_Options.h b/ACE/ace/Synch_Options.h index 171f1e24c15..c0b2ff754e8 100644 --- a/ACE/ace/Synch_Options.h +++ b/ACE/ace/Synch_Options.h @@ -100,14 +100,14 @@ public: void operator= (unsigned long option); /// Returns the "magic cookie" argument. - const void *arg (void) const; + const void *arg () const; /// Set the "magic cookie" argument. void arg (const void *); /// Returns a reference to the ACE_Time_Value. This value only makes /// sense if (*this)[USE_TIMEOUT] is true. - const ACE_Time_Value &timeout (void) const; + const ACE_Time_Value &timeout () const; /// Set the timeout value. This method does not alter the options; in /// particular, it doesn't add USE_TIMEOUT to the options when a non-zero @@ -119,7 +119,7 @@ public: * This should be used with care, e.g., the timeout pointer should not * be stored in a manner that will lead to dangling pointers. */ - const ACE_Time_Value *time_value (void) const; + const ACE_Time_Value *time_value () const; // = Static data members (singletons) @@ -134,7 +134,7 @@ public: static ACE_Synch_Options asynch; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Task.h b/ACE/ace/Task.h index 51218fe04e6..92a6e788f41 100644 --- a/ACE/ace/Task.h +++ b/ACE/ace/Task.h @@ -68,7 +68,7 @@ public: ACE_Task_Base (ACE_Thread_Manager * = 0); /// Destructor. - virtual ~ACE_Task_Base (void); + virtual ~ACE_Task_Base (); // These methods should be overridden by subclasses if you'd like to // provide <Task>-specific initialization and termination behavior. @@ -97,7 +97,7 @@ public: * close(0) will be also called when a thread associated with the * ACE_Task instance exits. */ - virtual int module_closed (void); + virtual int module_closed (); // = Immediate and deferred processing methods, respectively. @@ -110,7 +110,7 @@ public: virtual int put (ACE_Message_Block *, ACE_Time_Value * = 0); /// Run by a daemon thread to handle deferred processing. - virtual int svc (void); + virtual int svc (); // = Active object activation method. /** @@ -193,7 +193,7 @@ public: * @retval 0 Success. * @retval -1 Failure (consult errno for further information). */ - virtual int wait (void); + virtual int wait (); // = Suspend/resume a Task. @@ -201,34 +201,34 @@ public: // since they are inherently error-prone to use. They are only here // for (the rare) applications that know how to use them correctly. /// Suspend a task. - virtual int suspend (void); + virtual int suspend (); /// Resume a suspended task. - virtual int resume (void); + virtual int resume (); /// Get the current group id. - int grp_id (void) const; + int grp_id () const; /// Set the current group id. void grp_id (int); /// Get the thread manager associated with this Task. - ACE_Thread_Manager *thr_mgr (void) const; + ACE_Thread_Manager *thr_mgr () const; /// Set the thread manager associated with this Task. void thr_mgr (ACE_Thread_Manager *); /// True if queue is a reader, else false. - int is_reader (void) const; + int is_reader () const; /// True if queue is a writer, else false. - int is_writer (void) const; + int is_writer () const; /** * Returns the number of threads currently running within a task. * If we're a passive object this value is 0, else it's greater than * 0. */ - size_t thr_count (void) const; + size_t thr_count () const; /** * Returns the thread ID of the thread whose exit caused this object's @@ -246,7 +246,7 @@ public: * is not yet known; for example, if no threads are active, or if * multiple threads are active. */ - ACE_thread_t last_thread (void) const; + ACE_thread_t last_thread () const; /// Routine that runs the service routine as a daemon thread. static ACE_THR_FUNC_RETURN svc_run (void *); diff --git a/ACE/ace/Task.inl b/ACE/ace/Task.inl index 2d585d13b27..0481db6faeb 100644 --- a/ACE/ace/Task.inl +++ b/ACE/ace/Task.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Get the current group id. ACE_INLINE int -ACE_Task_Base::grp_id (void) const +ACE_Task_Base::grp_id () const { ACE_TRACE ("ACE_Task_Base::grp_id"); return this->grp_id_; @@ -25,7 +25,7 @@ ACE_Task_Base::grp_id (int identifier) } ACE_INLINE ACE_Thread_Manager * -ACE_Task_Base::thr_mgr (void) const +ACE_Task_Base::thr_mgr () const { ACE_TRACE ("ACE_Task_Base::thr_mgr"); return this->thr_mgr_; @@ -39,14 +39,14 @@ ACE_Task_Base::thr_mgr (ACE_Thread_Manager *thr_mgr) } ACE_INLINE int -ACE_Task_Base::is_reader (void) const +ACE_Task_Base::is_reader () const { ACE_TRACE ("ACE_Task_Base::is_reader"); return (ACE_BIT_ENABLED (this->flags_, ACE_Task_Flags::ACE_READER)); } ACE_INLINE int -ACE_Task_Base::is_writer (void) const +ACE_Task_Base::is_writer () const { ACE_TRACE ("ACE_Task_Base::is_writer"); return (ACE_BIT_DISABLED (this->flags_, ACE_Task_Flags::ACE_READER)); @@ -54,7 +54,7 @@ ACE_Task_Base::is_writer (void) const // Return the count of the current number of threads. ACE_INLINE size_t -ACE_Task_Base::thr_count (void) const +ACE_Task_Base::thr_count () const { ACE_TRACE ("ACE_Task_Base::thr_count"); ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0)); @@ -64,7 +64,7 @@ ACE_Task_Base::thr_count (void) const // Return the thread ID of the last thread to exit svc(). ACE_INLINE ACE_thread_t -ACE_Task_Base::last_thread (void) const +ACE_Task_Base::last_thread () const { ACE_TRACE ("ACE_Task_Base::last_thread"); return this->last_thread_id_; diff --git a/ACE/ace/Task_T.cpp b/ACE/ace/Task_T.cpp index b28dd2ccefc..eb4363119cb 100644 --- a/ACE/ace/Task_T.cpp +++ b/ACE/ace/Task_T.cpp @@ -19,7 +19,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tyc(ACE_Task) template <ACE_SYNCH_DECL, class TIME_POLICY> void -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump (void) const +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::dump"); @@ -66,7 +66,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::ACE_Task (ACE_Thread_Manager *thr_man, } template<ACE_SYNCH_DECL, class TIME_POLICY> -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task (void) +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task () { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task"); if (this->delete_msg_queue_) @@ -78,7 +78,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::~ACE_Task (void) } template<ACE_SYNCH_DECL, class TIME_POLICY> ACE_Task<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling (void) +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling () { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling"); if (this->mod_ == 0) @@ -88,7 +88,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::sibling (void) } template<ACE_SYNCH_DECL, class TIME_POLICY> const ACE_TCHAR * -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name (void) const +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name () const { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name"); if (this->mod_ == 0) @@ -98,7 +98,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::name (void) const } template<ACE_SYNCH_DECL, class TIME_POLICY> ACE_Module<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module (void) const +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module () const { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::module"); return this->mod_; diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index 69611755870..708afff2256 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -54,17 +54,17 @@ public: ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *mq = 0); /// Destructor. - virtual ~ACE_Task (void); + virtual ~ACE_Task (); /// Gets the message queue associated with this task. - ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *msg_queue (void); + ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *msg_queue (); /// Sets the message queue associated with this task. void msg_queue (ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> *); /// Get the current time of day according to the queue's TIME_POLICY. /// Allows users to initialize timeout values using correct time policy. - ACE_Time_Value_T<TIME_POLICY> gettimeofday (void) const; + ACE_Time_Value_T<TIME_POLICY> gettimeofday () const; /// Allows applications to control how the timer queue gets the time /// of day. @@ -120,21 +120,21 @@ public: // Should be protected: // = ACE_Task utility routines to identify names et al. /// Return the name of the enclosing Module if there's one associated /// with the Task, else returns 0. - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; // = Pointers to next ACE_Task_Base (if ACE is part of an ACE_Stream). /// Get next Task pointer. - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next (); /// Set next Task pointer. void next (ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *); /// Return the Task's sibling if there's one associated with the /// Task's Module, else returns 0. - ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (void); + ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *sibling (); /// Return the Task's Module if there is one, else returns 0. - ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module (void) const; + ACE_Module<ACE_SYNCH_USE, TIME_POLICY> *module () const; /** * Flush the task's queue, i.e., free all of the enqueued @@ -162,7 +162,7 @@ public: // Should be protected: ACE_Task<ACE_SYNCH_USE, TIME_POLICY> *next_; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Task_T.inl b/ACE/ace/Task_T.inl index 99de01addef..6df293af94a 100644 --- a/ACE/ace/Task_T.inl +++ b/ACE/ace/Task_T.inl @@ -56,7 +56,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (ACE_Message_Queue<ACE_SYNCH_USE } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (void) +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue () { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue"); return this->msg_queue_; @@ -64,7 +64,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::msg_queue (void) template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_Time_Value_T<TIME_POLICY> -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday (void) const +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::gettimeofday () const { if (this->msg_queue_ != 0) return this->msg_queue_->gettimeofday (); @@ -88,7 +88,7 @@ ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::reply (ACE_Message_Block *mb, ACE_Time_Val } template <ACE_SYNCH_DECL, class TIME_POLICY> ACE_INLINE ACE_Task<ACE_SYNCH_USE, TIME_POLICY> * -ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next (void) +ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next () { ACE_TRACE ("ACE_Task<ACE_SYNCH_USE, TIME_POLICY>::next"); return this->next_; diff --git a/ACE/ace/Vector_T.cpp b/ACE/ace/Vector_T.cpp index 3cbec049a46..393ea530c63 100644 --- a/ACE/ace/Vector_T.cpp +++ b/ACE/ace/Vector_T.cpp @@ -44,7 +44,7 @@ void ACE_Vector<T, DEFAULT_SIZE>::push_back (const T& elem) } template <class T, size_t DEFAULT_SIZE> -void ACE_Vector<T, DEFAULT_SIZE>::dump (void) const +void ACE_Vector<T, DEFAULT_SIZE>::dump () const { } diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index d88cb53d3f5..e132dd9851c 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -99,7 +99,7 @@ public: * * @return Current buffer size of the vector */ - size_t capacity (void) const; + size_t capacity () const; /** * Returns the vector's dynamic size / actual current size of the @@ -109,13 +109,13 @@ public: * * @return Dynamic size / actual current size of the vector. */ - size_t size (void) const; + size_t size () const; /** * Clears out the vector. It does not reallocate the vector's * buffer, it is just sets the vector's dynamic size to 0. */ - void clear (void); + void clear (); /** * Resizes the vector to the new capacity. If the vector's current @@ -151,7 +151,7 @@ public: * vector. The vector's buffer does not get reallocated for * performance. */ - void pop_back (void); + void pop_back (); /** * This function dumps the content of the vector. TO BE MOVED out @@ -167,7 +167,7 @@ public: * * This function calls T::dump() for each element of the vector. */ - void dump (void) const; + void dump () const; // = Compare operators @@ -236,13 +236,13 @@ public: /// Move forward by one element in the vector. Returns 0 when all the /// items in the vector have been seen, else 1. - int advance (void); + int advance (); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl index 103bb93beec..9079375a5d6 100644 --- a/ACE/ace/Vector_T.inl +++ b/ACE/ace/Vector_T.inl @@ -18,25 +18,25 @@ ACE_Vector<T, DEFAULT_SIZE>::~ACE_Vector () } template <class T, size_t DEFAULT_SIZE> ACE_INLINE -size_t ACE_Vector<T, DEFAULT_SIZE>::capacity (void) const +size_t ACE_Vector<T, DEFAULT_SIZE>::capacity () const { return curr_max_size_; } template <class T, size_t DEFAULT_SIZE> ACE_INLINE -size_t ACE_Vector<T, DEFAULT_SIZE>::size (void) const +size_t ACE_Vector<T, DEFAULT_SIZE>::size () const { return length_; } template <class T, size_t DEFAULT_SIZE> ACE_INLINE -void ACE_Vector<T, DEFAULT_SIZE>::clear (void) +void ACE_Vector<T, DEFAULT_SIZE>::clear () { length_ = 0; } template <class T, size_t DEFAULT_SIZE> ACE_INLINE -void ACE_Vector<T, DEFAULT_SIZE>::pop_back (void) +void ACE_Vector<T, DEFAULT_SIZE>::pop_back () { if (length_ > 0) { @@ -76,7 +76,7 @@ ACE_Vector<T, DEFAULT_SIZE>::swap (ACE_Vector &rhs) // **************************************************************** template <class T, size_t DEFAULT_SIZE> ACE_INLINE void -ACE_Vector_Iterator<T, DEFAULT_SIZE>::dump (void) const +ACE_Vector_Iterator<T, DEFAULT_SIZE>::dump () const { // ACE_TRACE ("ACE_Vector_Iterator<T>::dump"); } @@ -90,7 +90,7 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::ACE_Vector_Iterator (ACE_Vector<T, DEFAULT } template <class T, size_t DEFAULT_SIZE> ACE_INLINE int -ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance (void) +ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance () { // ACE_TRACE ("ACE_Vector_Iterator<T>::advance"); @@ -105,7 +105,7 @@ ACE_Vector_Iterator<T, DEFAULT_SIZE>::advance (void) } template <class T, size_t DEFAULT_SIZE> ACE_INLINE int -ACE_Vector_Iterator<T, DEFAULT_SIZE>::done (void) const +ACE_Vector_Iterator<T, DEFAULT_SIZE>::done () const { ACE_TRACE ("ACE_Vector_Iterator<T>::done"); diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h index d5c4415de3c..1f1f1d095ac 100644 --- a/TAO/tao/Acceptor_Filter.h +++ b/TAO/tao/Acceptor_Filter.h @@ -44,7 +44,7 @@ class TAO_Acceptor; class TAO_Export TAO_Acceptor_Filter { public: - virtual ~TAO_Acceptor_Filter (void); + virtual ~TAO_Acceptor_Filter (); /** * Populate @a mprofile with profiles. Profiles are created for diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 771982dd41e..dc0124ae18a 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -60,10 +60,10 @@ class TAO_Export TAO_Acceptor_Registry { public: /// Default constructor. - TAO_Acceptor_Registry (void); + TAO_Acceptor_Registry (); /// Default destructor. - ~TAO_Acceptor_Registry (void); + ~TAO_Acceptor_Registry (); /// Initialize all registered acceptors. Return -1 on error. int open (TAO_ORB_Core *orb_core, @@ -72,10 +72,10 @@ public: bool ignore_address); /// Close all open acceptors. - int close_all (void); + int close_all (); /// Returns the total number of endpoints in all of its acceptors. - size_t endpoint_count (void); + size_t endpoint_count (); /// Check if there is at least one profile in @a mprofile that /// corresponds to a collocated object. @@ -85,8 +85,8 @@ public: TAO_Acceptor *get_acceptor (CORBA::ULong tag); // = Iterator. - TAO_AcceptorSetIterator begin (void); - TAO_AcceptorSetIterator end (void); + TAO_AcceptorSetIterator begin (); + TAO_AcceptorSetIterator end (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry &)) diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index c4b68cd521f..6209d77710e 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -35,7 +35,7 @@ namespace TAO { public: - virtual ~TAO_Allocator (void) {} + virtual ~TAO_Allocator () {} virtual handler_type *allocate () = 0; virtual void release (handler_type *ptr) = 0; diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index dd1395d764d..fdd7343bbaf 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO public: Any_Basic_Impl_T (CORBA::TypeCode_ptr, const T & val); - virtual ~Any_Basic_Impl_T (void); + virtual ~Any_Basic_Impl_T (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, @@ -50,7 +50,7 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; + virtual const void *value () const; static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr); private: diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 8fd342a90ef..4e35dc18586 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -69,8 +69,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -84,10 +84,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 2750c37ab74..11c76119774 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -65,8 +65,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -81,9 +81,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i ( void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; + virtual CORBA::TypeCode_ptr content_type_i ( ) const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index b159728edb8..e269498b648 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -79,8 +79,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -95,15 +95,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} private: diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ca07c546f93..ada4e29eacb 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -70,11 +70,11 @@ public: * Why are we clumping everything in one method. Answer is we need * atomicity? */ - bool try_dispatch_reply (void); + bool try_dispatch_reply (); protected: /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher_Base (void); + virtual ~TAO_Asynch_Reply_Dispatcher_Base (); private: void operator= (const TAO_Asynch_Reply_Dispatcher_Base &); diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index 13ffed795ee..d1e26eedb8b 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -29,10 +29,10 @@ public: TAO_Reply_Dispatcher* rd, TAO_Transport_Mux_Strategy* tms); - ~TAO_Bind_Dispatcher_Guard (void); + ~TAO_Bind_Dispatcher_Guard (); /// Returns 0 if successful and non-zero otherwise. - int unbind_dispatcher (void); + int unbind_dispatcher (); /// State information enum TAO_Bind_Dispatcher_Status @@ -44,7 +44,7 @@ public: }; /// Get status - TAO_Bind_Dispatcher_Status status (void) const; + TAO_Bind_Dispatcher_Status status () const; /// Set status void status (TAO_Bind_Dispatcher_Status status); diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl index 3068dfd7608..f38bc197f40 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.inl +++ b/TAO/tao/Bind_Dispatcher_Guard.inl @@ -22,13 +22,13 @@ TAO_Bind_Dispatcher_Guard::status (TAO_Bind_Dispatcher_Status s) } ACE_INLINE TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Status -TAO_Bind_Dispatcher_Guard::status (void) const +TAO_Bind_Dispatcher_Guard::status () const { return this->status_; } ACE_INLINE int -TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void) +TAO_Bind_Dispatcher_Guard::unbind_dispatcher () { int const retval = this->tms_->unbind_dispatcher (this->request_id_); diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index bed4622609c..723de777a9e 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -39,7 +39,7 @@ namespace TAO typedef alloc_type ALLOC_TYPE; TAO_Buffer_Allocator (alloc_type *allocator); - virtual handler_type *allocate (void); + virtual handler_type *allocate (); virtual void release (handler_type *ptr); private: alloc_type* allocator_; diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp index e047a890c89..2b3bd726512 100644 --- a/TAO/tao/Cache_Entries_T.cpp +++ b/TAO/tao/Cache_Entries_T.cpp @@ -25,7 +25,7 @@ namespace TAO } template <typename TRANSPORT_TYPE> - Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T () { if (this->transport_) this->transport_->remove_reference (); diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h index a4762e34cc8..ed391738a38 100644 --- a/TAO/tao/Cache_Entries_T.h +++ b/TAO/tao/Cache_Entries_T.h @@ -65,7 +65,7 @@ namespace TAO typedef TRANSPORT_TYPE transport_type; /// Constructor. - Cache_IntId_T (void); + Cache_IntId_T (); /// Constructor. Cache_IntId_T (transport_type *transport); @@ -74,7 +74,7 @@ namespace TAO Cache_IntId_T (const Cache_IntId_T & rhs); /// Destructor. - ~Cache_IntId_T (void); + ~Cache_IntId_T (); /// Assignment operator (does copy memory). Cache_IntId_T& operator= (const Cache_IntId_T &rhs); @@ -86,16 +86,16 @@ namespace TAO bool operator!= (const Cache_IntId_T &rhs) const; /// Return the underlying transport - transport_type *transport (void); + transport_type *transport (); /// Return the underlying transport - const transport_type *transport (void) const; + const transport_type *transport () const; /// Set recycle_state. void recycle_state (Cache_Entries_State new_state); /// Get recycle_state. - Cache_Entries_State recycle_state (void) const; + Cache_Entries_State recycle_state () const; /// Relinquish ownership of the TAO_Transport object associated with /// this Cache_IntId_T. @@ -106,10 +106,10 @@ namespace TAO * This method really only exists to get around inadequacies * in the Transport_Cache_Map_Manager interface. */ - transport_type *relinquish_transport (void); + transport_type *relinquish_transport (); /// Get the connected flag - bool is_connected (void) const; + bool is_connected () const; /// Set the connected flag void is_connected (bool connected); @@ -144,7 +144,7 @@ namespace TAO typedef TRANSPORT_DESCRIPTOR_TYPE transport_descriptor_type; /// Constructor. - Cache_ExtId_T (void); + Cache_ExtId_T (); /// Constructor. explicit Cache_ExtId_T (transport_descriptor_type *prop); @@ -153,7 +153,7 @@ namespace TAO Cache_ExtId_T (const Cache_ExtId_T & rhs); /// Destructor. - ~Cache_ExtId_T (void); + ~Cache_ExtId_T (); // = Assignment and comparison operators. /// Assignment operator (does copy memory). @@ -167,24 +167,24 @@ namespace TAO /// hash function is required in order for this class to be usable by /// ACE_Hash_Map_Manager_Ex. - u_long hash (void) const; + u_long hash () const; /// Make a deep copy of the underlying pointer - void duplicate (void); + void duplicate (); /// Return the index value - CORBA::ULong index (void) const; + CORBA::ULong index () const; /// Set the index value. This calls should not be used by any users /// but for the TAO_Transport_Cache_Manager class. void index (CORBA::ULong index); /// Increment the index value - void incr_index (void); + void incr_index (); // = Accessors /// Get the underlying the property pointer - transport_descriptor_type *property (void) const; + transport_descriptor_type *property () const; private: /// A property object that we represent. diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl index 1b4121eef81..411c7d0e0ff 100644 --- a/TAO/tao/Cache_Entries_T.inl +++ b/TAO/tao/Cache_Entries_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { template <typename TRANSPORT_TYPE> ACE_INLINE - Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T () : transport_ (0), recycle_state_ (ENTRY_UNKNOWN), is_connected_ (false) @@ -37,21 +37,21 @@ namespace TAO template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::transport () { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE const typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) const + Cache_IntId_T<TRANSPORT_TYPE>::transport () const { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE bool - Cache_IntId_T<TRANSPORT_TYPE>::is_connected (void) const + Cache_IntId_T<TRANSPORT_TYPE>::is_connected () const { return this->is_connected_; } @@ -64,14 +64,14 @@ namespace TAO } template <typename TRANSPORT_TYPE> ACE_INLINE Cache_Entries_State - Cache_IntId_T<TRANSPORT_TYPE>::recycle_state (void) const + Cache_IntId_T<TRANSPORT_TYPE>::recycle_state () const { return this->recycle_state_; } template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport () { // Yield ownership of the TAO_Transport object. transport_type *val = this->transport_; @@ -98,7 +98,7 @@ namespace TAO /*******************************************************/ template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T () : transport_property_ (0), is_delete_ (false), index_ (0) @@ -116,7 +116,7 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T () { if (this->is_delete_) delete this->transport_property_; @@ -173,13 +173,13 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE u_long - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash () const { return (this->transport_property_->hash () + this->index_); } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate () { transport_descriptor_type *prop = 0; @@ -199,7 +199,7 @@ namespace TAO template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE CORBA::ULong - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index () const { return this->index_; } @@ -212,14 +212,14 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index () { ++this->index_; } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE typename Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::transport_descriptor_type * - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property () const { return this->transport_property_; } diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 6ff11c9df61..e59d0ee66ee 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -58,16 +58,16 @@ class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object public: /// Destructor - virtual ~TAO_Client_Strategy_Factory (void); + virtual ~TAO_Client_Strategy_Factory (); /// Create the correct client request muxing strategy. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport) = 0; /// Create the correct lock for request muxing strategy. - virtual ACE_Lock *create_transport_mux_strategy_lock (void) = 0; + virtual ACE_Lock *create_transport_mux_strategy_lock () = 0; /// Return the size of the reply dispatcher table - virtual int reply_dispatcher_table_size (void) const = 0; + virtual int reply_dispatcher_table_size () const = 0; /// Create the correct client wait_for_reply strategy. virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport) = 0; @@ -83,20 +83,20 @@ public: }; /// Return the selected connection strategy option. - virtual Connect_Strategy connect_strategy (void) const = 0; + virtual Connect_Strategy connect_strategy () const = 0; /// Does the client allow any form of callback? - virtual int allow_callback (void) = 0; + virtual int allow_callback () = 0; /// Cleanup options for wait strategy. /** * Only applicable to RW wait strategy */ - virtual bool use_cleanup_options (void) const = 0; + virtual bool use_cleanup_options () const = 0; /// Return the parameters used to optionally retry invocation /// after an exception occurs. - virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const = 0; + virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const = 0; /// Return the value to be used as the default sync scope for the ORB virtual Messaging::SyncScope sync_scope () const = 0; diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 0d7a1fd63c4..0b8c59e41b5 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -51,10 +51,10 @@ public: /// A default constructor. Since no lock is provided by the user, /// one will be created internally. - TAO_Condition (void); + TAO_Condition (); /// Implicitly destroy the condition variable. - ~TAO_Condition (void); + ~TAO_Condition (); // = Lock accessors. /** @@ -66,7 +66,7 @@ public: int wait (const ACE_Time_Value *abstime); /// Block on condition. - int wait (void); + int wait (); /** * Block on condition or until absolute time-of-day has passed. If @@ -79,17 +79,17 @@ public: int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0); /// Signal one waiting thread. - int signal (void); + int signal (); /// Signal *all* waiting threads. - int broadcast (void); + int broadcast (); // = Utility methods. /// Explicitly destroy the condition variable. - int remove (void); + int remove (); /// Returns a reference to the underlying mutex_; - MUTEX *mutex (void); + MUTEX *mutex (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index dc790a99e80..845b8222ffb 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -42,10 +42,10 @@ public: TAO_Connection_Purging_Strategy (int cache_maximum); /// The destructor - virtual ~TAO_Connection_Purging_Strategy (void); + virtual ~TAO_Connection_Purging_Strategy (); /// Return the maximum number of cache entries - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// Sub-classes must implement these methods virtual void update_item (TAO_Transport& transport) = 0; diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h index 7bb4e8abba6..47ff70e4865 100644 --- a/TAO/tao/GIOP_Fragmentation_Strategy.h +++ b/TAO/tao/GIOP_Fragmentation_Strategy.h @@ -38,10 +38,10 @@ class TAO_Export TAO_GIOP_Fragmentation_Strategy { public: /// Constructor - TAO_GIOP_Fragmentation_Strategy (void) {} + TAO_GIOP_Fragmentation_Strategy () {} /// Destructor. - virtual ~TAO_GIOP_Fragmentation_Strategy (void); + virtual ~TAO_GIOP_Fragmentation_Strategy (); /// Fragment the (potentially partially) encoded GIOP message. /** diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index f726e620176..73faaaa4a49 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -54,7 +54,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - ~TAO_GIOP_Message_Base (void); + ~TAO_GIOP_Message_Base (); /// Initialize the underlying state object based on the @a major and /// @a minor revision numbers @@ -121,13 +121,13 @@ public: const CORBA::Exception &x); /// Header length - size_t header_length (void) const; + size_t header_length () const; /// The header length of a fragment size_t fragment_header_length ( const TAO_GIOP_Message_Version& giop_version) const; - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Consolidate fragmented message with associated fragments, being /// stored within this class. If reliable transport is used (like @@ -149,7 +149,7 @@ public: int discard_fragmented_message (const TAO_Queued_Data *cancel_request); /// Outgoing GIOP message fragmentation strategy. - TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void); + TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (); /// Is the messaging object ready for processing BiDirectional /// request/response? diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 78a429daa0a..7a901a16a41 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -46,7 +46,7 @@ class TAO_ServerRequest; class TAO_GIOP_Message_Generator_Parser { public: - virtual ~TAO_GIOP_Message_Generator_Parser (void); + virtual ~TAO_GIOP_Message_Generator_Parser (); /// Write the request header in to @a msg virtual bool write_request_header ( @@ -93,15 +93,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const = 0; - virtual CORBA::Octet minor_version (void) const = 0; + virtual CORBA::Octet major_version () const = 0; + virtual CORBA::Octet minor_version () const = 0; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const = 0; + virtual size_t fragment_header_length () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 936913a0b27..b4c277bb3d2 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -75,11 +75,11 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index 23f5c33822c..b63749b7a5d 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -34,7 +34,7 @@ class TAO_GIOP_Message_Generator_Parser_11 { public: /// Our minor version - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet minor_version () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index b188879bdfb..8bfb114ce92 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -77,15 +77,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; private: /// Marshall the TargetSpecification diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 8245ff6842b..0619ff42814 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -39,7 +39,7 @@ class TAO_Export TAO_GIOP_Message_State { public: /// Constructor - TAO_GIOP_Message_State (void); + TAO_GIOP_Message_State (); /// Parse the message header. /// @@ -50,27 +50,27 @@ public: int parse_message_header (ACE_Message_Block &incoming); /// Return the message size - CORBA::ULong message_size (void) const; + CORBA::ULong message_size () const; /// Return the message size - CORBA::ULong payload_size (void) const; + CORBA::ULong payload_size () const; /// Return the byte order information - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Return the message type - GIOP::MsgType message_type (void) const; + GIOP::MsgType message_type () const; /// Return the more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; void more_fragments (CORBA::Boolean fragment); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Return the compressed information - CORBA::Boolean compressed (void) const; + CORBA::Boolean compressed () const; private: /// Parse the message header. diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index f15092f2e8a..f85484f38a0 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -59,7 +59,7 @@ class TAO_Root_POA; class TAO_Export TAO_IORInterceptor_Adapter { public: - virtual ~TAO_IORInterceptor_Adapter (void); + virtual ~TAO_IORInterceptor_Adapter (); virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor) = 0; @@ -68,7 +68,7 @@ public: PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; /// Call the IORInterceptor::establish_components() method on all /// registered IORInterceptors. diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index 2ad553aad59..fd128efea0c 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -55,15 +55,15 @@ public: TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core); /// Destructor. - ~TAO_Incoming_Message_Queue (void); + ~TAO_Incoming_Message_Queue (); /// Adding and deleting a node from the queue. - TAO_Queued_Data *dequeue_head (void); - TAO_Queued_Data *dequeue_tail (void); + TAO_Queued_Data *dequeue_head (); + TAO_Queued_Data *dequeue_tail (); int enqueue_tail (TAO_Queued_Data *nd); /// Return the length of the queue.. - CORBA::ULong queue_length (void) const; + CORBA::ULong queue_length () const; private: diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 68e9bc4d40b..9f2304da7f4 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -111,7 +111,7 @@ namespace TAO TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, bool has_in_args = true); - virtual ~Invocation_Adapter (void); + virtual ~Invocation_Adapter (); /// Invoke the target, and used by the generated code. /** @@ -231,7 +231,7 @@ namespace TAO bool get_timeout (TAO_Stub *stub, ACE_Time_Value &val); /// Helper method that extracts TAO_Stub from the target object. - TAO_Stub *get_stub (void) const; + TAO_Stub *get_stub () const; /// Helper method that takes care of setting the profiles within /// the stub object if the target gets forwarded @@ -245,7 +245,7 @@ namespace TAO private: /// Don't allow default initializations - Invocation_Adapter (void); + Invocation_Adapter (); // Prevent copying Invocation_Adapter (Invocation_Adapter const &); diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index ed3b08b2b17..f1ab26afb16 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -29,7 +29,7 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () { } -TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) +TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler () { this->transport_->remove_reference (); @@ -86,7 +86,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, } void -TAO_AMH_Response_Handler::_tao_rh_init_reply (void) +TAO_AMH_Response_Handler::_tao_rh_init_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -126,7 +126,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) } void -TAO_AMH_Response_Handler::_tao_rh_send_reply (void) +TAO_AMH_Response_Handler::_tao_rh_send_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -311,7 +311,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, } void -TAO_AMH_Response_Handler::_remove_ref (void) +TAO_AMH_Response_Handler::_remove_ref () { if (--this->refcount_ == 0) { diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 703728eba77..a7fbfbcbe69 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -74,7 +74,7 @@ public: * Releases the transport and in case of an error, sends the appropriate * exception back to the client */ - virtual ~TAO_AMH_Response_Handler (void); + virtual ~TAO_AMH_Response_Handler (); /** * Stores necessary information from a TAO_Server_Request onto the heap @@ -84,17 +84,17 @@ public: /// @name Mutators for refcount //@{ - virtual void _remove_ref (void); + virtual void _remove_ref (); //@} protected: /// Sets up the various parameters in anticipation of returning a reply /// to the client. return/OUT/INOUT arguments are marshalled into the /// Output stream after this method has been called. - void _tao_rh_init_reply (void); + void _tao_rh_init_reply (); /// Sends the marshalled reply back to the client. - void _tao_rh_send_reply (void); + void _tao_rh_send_reply (); /// Send back an exception to the client. void _tao_rh_send_exception (const CORBA::Exception &ex); diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp index f2781a1b81e..284ad831305 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.cpp +++ b/TAO/tao/Messaging/AMH_Skeletons.cpp @@ -22,7 +22,7 @@ #include "tao/TAO_Server_Request.h" void -_is_a_amh_Upcall_Command::execute (void) +_is_a_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -83,7 +83,7 @@ TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request, #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_amh_Upcall_Command::execute (void) +_non_existent_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -163,7 +163,7 @@ TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request, } void -_get_component_amh_Upcall_Command::execute (void) +_get_component_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -214,7 +214,7 @@ TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request, void -_repository_id_amh_Upcall_Command::execute (void) +_repository_id_amh_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h index 3157a9c6793..fa6aa742f03 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.h +++ b/TAO/tao/Messaging/AMH_Skeletons.h @@ -61,7 +61,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -89,7 +89,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -116,7 +116,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -144,7 +144,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index d47234ebb0d..ff0302be5d1 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -120,7 +120,7 @@ TAO_AMI_Arguments_Converter_Impl::handle_corba_exception ( // Initialization and registration of dynamic service object. int -TAO_AMI_Arguments_Converter_Impl::Initializer (void) +TAO_AMI_Arguments_Converter_Impl::Initializer () { return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_AMI_Arguments_Converter_Impl); diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h index 6f0ebd8cb1f..59a5ead3ebc 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h @@ -58,7 +58,7 @@ public: CORBA::Exception *exception); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index c6af67798b7..7175889b3a4 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -94,7 +94,7 @@ namespace TAO private: /// Don't allow default initializations - Asynch_Invocation_Adapter (void); + Asynch_Invocation_Adapter (); Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &); Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &); diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 31e20589456..a85a96033e8 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -23,7 +23,7 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher ( } // Destructor. -TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void) +TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher () { } @@ -147,7 +147,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) } void -TAO_Asynch_Reply_Dispatcher::connection_closed (void) +TAO_Asynch_Reply_Dispatcher::connection_closed () { try { @@ -196,7 +196,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) // AMI Timeout Handling Begin void -TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) +TAO_Asynch_Reply_Dispatcher::reply_timed_out () { try { diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 392487aa8a4..9ecb3b3abb5 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -42,17 +42,17 @@ public: ACE_Allocator *allocator); /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher (void); + virtual ~TAO_Asynch_Reply_Dispatcher (); /// @name The Reply Dispatcher methods //@{ virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); - virtual void connection_closed (void); + virtual void connection_closed (); //@} /// Inform that the reply timed out - virtual void reply_timed_out (void); + virtual void reply_timed_out (); /// Install the timeout handler long schedule_timer (CORBA::ULong request_id, diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp index f6f4993050e..ed468eb16fa 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp @@ -31,7 +31,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff } CORBA::PolicyType -TAO_Buffering_Constraint_Policy::policy_type (void) +TAO_Buffering_Constraint_Policy::policy_type () { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; } @@ -53,7 +53,7 @@ TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val) TAO_Buffering_Constraint_Policy * -TAO_Buffering_Constraint_Policy::clone (void) const +TAO_Buffering_Constraint_Policy::clone () const { TAO_Buffering_Constraint_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -63,13 +63,13 @@ TAO_Buffering_Constraint_Policy::clone (void) const } TAO::BufferingConstraint -TAO_Buffering_Constraint_Policy::buffering_constraint (void) +TAO_Buffering_Constraint_Policy::buffering_constraint () { return this->buffering_constraint_; } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::copy (void) +TAO_Buffering_Constraint_Policy::copy () { TAO_Buffering_Constraint_Policy* servant = 0; ACE_NEW_THROW_EX (servant, @@ -80,12 +80,12 @@ TAO_Buffering_Constraint_Policy::copy (void) } void -TAO_Buffering_Constraint_Policy::destroy (void) +TAO_Buffering_Constraint_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const +TAO_Buffering_Constraint_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT; } diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.h b/TAO/tao/Messaging/Buffering_Constraint_Policy.h index 63e207ab560..f65dc35667f 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.h +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.h @@ -54,22 +54,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_Buffering_Constraint_Policy *clone (void) const; + virtual TAO_Buffering_Constraint_Policy *clone () const; // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (void); + virtual TAO::BufferingConstraint buffering_constraint (); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index ee9cbf65964..d8ebe3a5c3d 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -32,13 +32,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( } TimeBase::TimeT -TAO_ConnectionTimeoutPolicy::relative_expiry (void) +TAO_ConnectionTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_ConnectionTimeoutPolicy::policy_type (void) +TAO_ConnectionTimeoutPolicy::policy_type () { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; } @@ -119,7 +119,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val) } TAO_ConnectionTimeoutPolicy * -TAO_ConnectionTimeoutPolicy::clone (void) const +TAO_ConnectionTimeoutPolicy::clone () const { TAO_ConnectionTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -129,7 +129,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_ConnectionTimeoutPolicy::copy (void) +TAO_ConnectionTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -143,12 +143,12 @@ TAO_ConnectionTimeoutPolicy::copy (void) } void -TAO_ConnectionTimeoutPolicy::destroy (void) +TAO_ConnectionTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_ConnectionTimeoutPolicy::_tao_cached_type (void) const +TAO_ConnectionTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_CONNECTION_TIMEOUT; } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 839d5024450..02a182a3a54 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -64,22 +64,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_ConnectionTimeoutPolicy *clone (void) const; + virtual TAO_ConnectionTimeoutPolicy *clone () const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index d96e916f00c..12378b020b4 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ExceptionHolder::ExceptionHolder (void) : + ExceptionHolder::ExceptionHolder () : data_ (0), count_ (0), char_translator_ (0), @@ -47,7 +47,7 @@ namespace TAO this->count_ = exceptions_count; } - void ExceptionHolder::raise_exception (void) + void ExceptionHolder::raise_exception () { TAO_InputCDR _tao_in ((const char*) this->marshaled_exception ().get_buffer (), this->marshaled_exception ().length (), @@ -138,7 +138,7 @@ namespace TAO } CORBA::ValueBase* - ExceptionHolder::_copy_value (void) + ExceptionHolder::_copy_value () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, @@ -156,7 +156,7 @@ namespace TAO } CORBA::ValueBase * - ExceptionHolderFactory::create_for_unmarshal (void) + ExceptionHolderFactory::create_for_unmarshal () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index f60bc86a0b0..0a1bda88ebb 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -45,7 +45,7 @@ namespace TAO public virtual ::CORBA::DefaultValueRefCountBase { public: - ExceptionHolder (void); + ExceptionHolder (); ExceptionHolder ( ::CORBA::Boolean is_system_exception, @@ -59,16 +59,16 @@ namespace TAO void set_exception_data (::TAO::Exception_Data* data, ::CORBA::ULong exceptions_count); - virtual void raise_exception (void); + virtual void raise_exception (); virtual void raise_exception_with_list ( const ::Dynamic::ExceptionList & exc_list); - virtual CORBA::ValueBase* _copy_value (void); + virtual CORBA::ValueBase* _copy_value (); protected: - virtual ~ExceptionHolder (void); + virtual ~ExceptionHolder (); private: TAO::Exception_Data* data_; @@ -88,7 +88,7 @@ namespace TAO public virtual CORBA::ValueFactoryBase { public: - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; } diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index afc92538ba0..afa6ebef8a8 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Messaging_Initializer::init (void) +TAO_Messaging_Initializer::init () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Messaging_Loader); } diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index d9520e92332..7a3aa49b9a0 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -33,7 +33,7 @@ class TAO_Messaging_Export TAO_Messaging_Initializer { public: /// Used to force the initialisation of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index bd25ad2d9e2..4b17c72cfa3 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Messaging_Loader::TAO_Messaging_Loader (void) +TAO_Messaging_Loader::TAO_Messaging_Loader () : initialized_ (false) { } -TAO_Messaging_Loader::~TAO_Messaging_Loader (void) +TAO_Messaging_Loader::~TAO_Messaging_Loader () { } diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index aa9b3247527..8229dd7a1c8 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -29,10 +29,10 @@ class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_Messaging_Loader (void); + TAO_Messaging_Loader (); /// Destructor. - virtual ~TAO_Messaging_Loader (void); + virtual ~TAO_Messaging_Loader (); /// Initialize the Messaging loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index a3aadf66749..6bb83e9eee6 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -34,13 +34,13 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( } TimeBase::TimeT -TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (void) +TAO_RelativeRoundtripTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_RelativeRoundtripTimeoutPolicy::policy_type (void) +TAO_RelativeRoundtripTimeoutPolicy::policy_type () { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; } @@ -121,7 +121,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val) } TAO_RelativeRoundtripTimeoutPolicy * -TAO_RelativeRoundtripTimeoutPolicy::clone (void) const +TAO_RelativeRoundtripTimeoutPolicy::clone () const { TAO_RelativeRoundtripTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -131,7 +131,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (void) +TAO_RelativeRoundtripTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -145,12 +145,12 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void) } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (void) +TAO_RelativeRoundtripTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type (void) const +TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT; } @@ -200,7 +200,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (void) +TAO_Sync_Scope_Policy::policy_type () { return Messaging::SYNC_SCOPE_POLICY_TYPE; } @@ -268,7 +268,7 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val) } TAO_Sync_Scope_Policy * -TAO_Sync_Scope_Policy::clone (void) const +TAO_Sync_Scope_Policy::clone () const { TAO_Sync_Scope_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -278,13 +278,13 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (void) +TAO_Sync_Scope_Policy::synchronization () { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (void) +TAO_Sync_Scope_Policy::copy () { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, @@ -295,11 +295,11 @@ TAO_Sync_Scope_Policy::copy (void) } void -TAO_Sync_Scope_Policy::destroy (void) +TAO_Sync_Scope_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Sync_Scope_Policy::_tao_cached_type (void) const +TAO_Sync_Scope_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_SYNC_SCOPE; } diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index ba8ad68fcc5..27901cb7115 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -57,22 +57,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; + virtual TAO_RelativeRoundtripTimeoutPolicy *clone () const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute @@ -117,22 +117,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_Sync_Scope_Policy *clone (void) const; + virtual TAO_Sync_Scope_Policy *clone () const; // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (void); + virtual Messaging::SyncScope synchronization (); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); // Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index c31dbb46898..58bbe6fdbf3 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -51,11 +51,11 @@ public: TAO_Muxed_TMS (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Muxed_TMS (void); + virtual ~TAO_Muxed_TMS (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); // = Please read the documentation in the TAO_Transport_Mux_Strategy // class. @@ -66,10 +66,10 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); virtual int reply_timed_out (CORBA::ULong request_id); - virtual bool idle_after_send (void); - virtual bool idle_after_reply (void); - virtual void connection_closed (void); - virtual bool has_request (void); + virtual bool idle_after_send (); + virtual bool idle_after_reply (); + virtual void connection_closed (); + virtual bool has_request (); private: void operator= (const TAO_Muxed_TMS &); @@ -97,7 +97,7 @@ private: /// Table of <Request ID, Reply Dispatcher> pairs. REQUEST_DISPATCHER_TABLE dispatcher_table_; - int clear_cache_i (void); + int clear_cache_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 8c6057e6e3a..27fc4c656d2 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -50,7 +50,7 @@ namespace TAO { public: /// Destructor - virtual ~Object_Proxy_Broker (void); + virtual ~Object_Proxy_Broker (); virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, const char *logical_type_id) = 0; diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h index 484ccbd5925..6cab6a91408 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.h +++ b/TAO/tao/Pluggable_Messaging_Utils.h @@ -41,7 +41,7 @@ class TAO_Export TAO_Pluggable_Reply_Params_Base { public: /// Constructor. - TAO_Pluggable_Reply_Params_Base (void); + TAO_Pluggable_Reply_Params_Base (); /// The IOP service context list. IOP::ServiceContextList svc_ctx_; @@ -66,17 +66,17 @@ public: * a service context list and would like to pass on their contents * without a copy. */ - IOP::ServiceContextList &service_context_notowned (void); + IOP::ServiceContextList &service_context_notowned (); void service_context_notowned (IOP::ServiceContextList *svc); /// A flag that indicates if there is any data is going to get /// marshalled in the reply CORBA::Boolean argument_flag_; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; void reply_status (GIOP::ReplyStatusType status); - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; void locate_reply_status (GIOP::LocateStatusType status); protected: diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index 98aaebff6f1..d370f8a7255 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -36,7 +36,7 @@ class TAO_Policy_Current_Impl { public: - TAO_Policy_Current_Impl (void); + TAO_Policy_Current_Impl (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 383f423fe73..88fa02f2182 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -50,12 +50,12 @@ class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Acceptor_Filter_Factory(void); + virtual ~TAO_Acceptor_Filter_Factory(); virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index a37e2fcaee5..c2107759a9a 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -57,7 +57,7 @@ public: const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters); /// Destructor. - ~TAO_Active_Object_Map (void); + ~TAO_Active_Object_Map (); /// Must be used with UNIQUE_ID policy. int @@ -179,11 +179,11 @@ public: /// Size of the map. size_t - current_size (void); + current_size (); /// Can be used with any policy. static size_t - system_id_size (void); + system_id_size (); /// Set the system id size. static void @@ -302,7 +302,7 @@ class TAO_Id_Uniqueness_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Uniqueness_Strategy (void); + virtual ~TAO_Id_Uniqueness_Strategy (); /// Must be used with UNIQUE_ID policy. virtual int @@ -461,7 +461,7 @@ class TAO_Lifespan_Strategy public: /// Virtual destructor. - virtual ~TAO_Lifespan_Strategy (void); + virtual ~TAO_Lifespan_Strategy (); /// Can be used with any policy. virtual int @@ -533,7 +533,7 @@ class TAO_Id_Assignment_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Assignment_Strategy (void); + virtual ~TAO_Id_Assignment_Strategy (); /// Must be used with SYSTEM_ID policy. virtual int @@ -620,7 +620,7 @@ class TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Hint_Strategy (void); + virtual ~TAO_Id_Hint_Strategy (); /// Find the user id from the system id. virtual int @@ -642,7 +642,7 @@ public: /// How big is the hint generated by this strategy? virtual size_t - hint_size (void) = 0; + hint_size () = 0; /// Get the system id associated with this entry. virtual int @@ -663,7 +663,7 @@ public: TAO_Active_Hint_Strategy (CORBA::ULong map_size); /// Virtual destructor. - virtual ~TAO_Active_Hint_Strategy (void); + virtual ~TAO_Active_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -680,7 +680,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, @@ -705,7 +705,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_No_Hint_Strategy (void); + virtual ~TAO_No_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -722,7 +722,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index 8fc2c4504d8..45429d8b0e8 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_Active_Object_Map_Entry { /// Default constructor. - TAO_Active_Object_Map_Entry (void); + TAO_Active_Object_Map_Entry (); /// User id. PortableServer::ObjectId user_id_; diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index ab9d9e0e694..634f04ef1e3 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -34,13 +34,13 @@ namespace TAO class In_Basic_SArgument_T : public InArgument { public: - In_Basic_SArgument_T (void); + In_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S arg (void) const; + S arg () const; private: S x_; @@ -56,14 +56,14 @@ namespace TAO class Inout_Basic_SArgument_T : public InoutArgument { public: - Inout_Basic_SArgument_T (void); + Inout_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Basic_SArgument_T : public OutArgument { public: - Out_Basic_SArgument_T (void); + Out_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -101,13 +101,13 @@ namespace TAO class Ret_Basic_SArgument_T : public RetArgument { public: - Ret_Basic_SArgument_T (void); + Ret_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h index 384db9dc465..656de9a53d2 100644 --- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h +++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter : { public: - virtual ~Collocated_Arguments_Converter (void); + virtual ~Collocated_Arguments_Converter (); virtual void convert_request (TAO_ServerRequest & server_request, TAO::Argument * const args[], diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 572842ebe02..fa862566239 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -210,13 +210,13 @@ namespace TAO // ----------------------------------------------------- TAO::Collocated_Object_Proxy_Broker * -the_tao_collocated_object_proxy_broker (void) +the_tao_collocated_object_proxy_broker () { static TAO::Collocated_Object_Proxy_Broker the_broker; return &the_broker; } -TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void) +TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory () { return the_tao_collocated_object_proxy_broker (); } diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index 45c29fc8f13..fcd7e2f0db8 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -66,7 +66,7 @@ namespace TAO /// This function is used to access the unique instance of strategized /// proxy broker. All the CORBA::Object share the proxy broker. -TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void); +TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 18de6b7250e..4b13c32be55 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -35,13 +35,13 @@ namespace TAO public: explicit Creation_Time (const ACE_Time_Value &creation_time); - Creation_Time (void); + Creation_Time (); void creation_time (const void *creation_time); - const void *creation_time (void) const; + const void *creation_time () const; - static CORBA::ULong creation_time_length (void); + static CORBA::ULong creation_time_length (); bool operator== (const Creation_Time &rhs) const; @@ -76,7 +76,7 @@ namespace TAO { public: - Temporary_Creation_Time (void); + Temporary_Creation_Time (); void creation_time (const void *creation_time); diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index 7c4a1d1412e..ec9ae61a7a8 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) +TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter () { } diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index 5e811e4f16e..c440b985c5d 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Acceptor_Filter { public: - TAO_Default_Acceptor_Filter (void); + TAO_Default_Acceptor_Filter (); /// Populate @a mprofile with all available endpoints. virtual int fill_profile (const TAO::ObjectKey &object_key, diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index 1c852f9d8a4..84c6d9f06a2 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -12,7 +12,7 @@ TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( { } -TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) +TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator () { } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index ec83ebed582..ff020b8af2d 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) +TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 20abb7509be..a77043c28d2 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Default_Servant_Dispatcher : public TAO_Servant_Dispatcher { public: - virtual ~TAO_Default_Servant_Dispatcher (void); + virtual ~TAO_Default_Servant_Dispatcher (); /// Pre_invoke remote request. void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 7d0b27b8cc1..44889cf37be 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -56,7 +56,7 @@ namespace TAO //@} /// Retrieve underlying argument. - S const & arg (void) const; + S const & arg () const; private: @@ -79,7 +79,7 @@ namespace TAO public: /// Constructor. - Inout_Fixed_Size_SArgument_T (void); + Inout_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -97,7 +97,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -118,7 +118,7 @@ namespace TAO public: /// Constructor. - Out_Fixed_Size_SArgument_T (void); + Out_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -135,7 +135,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -157,7 +157,7 @@ namespace TAO public: /// Constructor. - Ret_Fixed_Size_SArgument_T (void); + Ret_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -174,7 +174,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 449065c15c2..21f763b3aa6 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - IdAssignmentPolicy::copy (void) + IdAssignmentPolicy::copy () { IdAssignmentPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - IdAssignmentPolicy::destroy (void) + IdAssignmentPolicy::destroy () { } ::PortableServer::IdAssignmentPolicyValue - IdAssignmentPolicy::value (void) + IdAssignmentPolicy::value () { return value_; } CORBA::PolicyType - IdAssignmentPolicy::policy_type (void) + IdAssignmentPolicy::policy_type () { return ::PortableServer::ID_ASSIGNMENT_POLICY_ID; } TAO_Cached_Policy_Type - IdAssignmentPolicy::_tao_cached_type (void) const + IdAssignmentPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_ASSIGNMENT; } TAO_Policy_Scope - IdAssignmentPolicy::_tao_scope (void) const + IdAssignmentPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index aa56af91575..100a129d208 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -12,12 +12,12 @@ namespace TAO } void - IdAssignmentStrategy::strategy_cleanup(void) + IdAssignmentStrategy::strategy_cleanup() { } char - IdAssignmentStrategy::key_type_length (void) const + IdAssignmentStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index 88bcfce0eee..dca18216db1 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -32,21 +32,21 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); /** * Returns the key type the says which specific policy we have */ - virtual char id_assignment_key_type (void) const = 0; + virtual char id_assignment_key_type () const = 0; /** * Returns the length of the id_assignment type */ - char key_type_length (void) const; + char key_type_length () const; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); - virtual bool has_system_id (void) const = 0; + virtual bool has_system_id () const = 0; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index dd95809054b..30d87e69e9f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -8,13 +8,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategySystem::id_assignment_key_type (void) const + IdAssignmentStrategySystem::id_assignment_key_type () const { return 'S'; } bool - IdAssignmentStrategySystem::has_system_id (void) const + IdAssignmentStrategySystem::has_system_id () const { return true; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index e57fc043e30..7ee2acb36f4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 57685cf2f83..622dbd3f4ef 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -7,13 +7,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategyUser::id_assignment_key_type (void) const + IdAssignmentStrategyUser::id_assignment_key_type () const { return 'U'; } bool - IdAssignmentStrategyUser::has_system_id (void) const + IdAssignmentStrategyUser::has_system_id () const { return false; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index 7740e89ee86..c64be097bce 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index aedf4a9b876..ce0297809b5 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - IdUniquenessPolicy::copy (void) + IdUniquenessPolicy::copy () { IdUniquenessPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - IdUniquenessPolicy::destroy (void) + IdUniquenessPolicy::destroy () { } ::PortableServer::IdUniquenessPolicyValue - IdUniquenessPolicy::value (void) + IdUniquenessPolicy::value () { return value_; } CORBA::PolicyType - IdUniquenessPolicy::policy_type (void) + IdUniquenessPolicy::policy_type () { return ::PortableServer::ID_UNIQUENESS_POLICY_ID; } TAO_Cached_Policy_Type - IdUniquenessPolicy::_tao_cached_type (void) const + IdUniquenessPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_UNIQUENESS; } TAO_Policy_Scope - IdUniquenessPolicy::_tao_scope (void) const + IdUniquenessPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index 210d3284ddb..b3372d94343 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -41,7 +41,7 @@ namespace TAO PortableServer::Servant s, bool &w) = 0; - virtual bool allow_multiple_activations (void) const = 0; + virtual bool allow_multiple_activations () const = 0; virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index fde3e6c68e2..170d4a18643 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -13,7 +13,7 @@ namespace TAO } void - IdUniquenessStrategyMultiple::strategy_cleanup (void) + IdUniquenessStrategyMultiple::strategy_cleanup () { } @@ -28,7 +28,7 @@ namespace TAO } bool - IdUniquenessStrategyMultiple::allow_multiple_activations (void) const + IdUniquenessStrategyMultiple::allow_multiple_activations () const { return true; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index b64983f446b..5b1c7ba96eb 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -33,13 +33,13 @@ namespace TAO public: virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &w); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 89a795db50f..30563653abf 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -7,7 +7,7 @@ namespace TAO { namespace Portable_Server { - IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) : + IdUniquenessStrategyUnique::IdUniquenessStrategyUnique () : poa_ (0) { } @@ -22,7 +22,7 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_cleanup ( - void) + ) { poa_ = 0; } @@ -42,7 +42,7 @@ namespace TAO } bool - IdUniquenessStrategyUnique::allow_multiple_activations (void) const + IdUniquenessStrategyUnique::allow_multiple_activations () const { return false; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index fe25b407ce8..ba910f7dc0f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -31,17 +31,17 @@ namespace TAO : public IdUniquenessStrategy { public: - IdUniquenessStrategyUnique (void); + IdUniquenessStrategyUnique (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &wait_occurred_restart_call); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index a21645d1b04..359f2b7f26b 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -6,7 +6,7 @@ namespace TAO { namespace Portable_Server { - ImR_Client_Adapter::~ImR_Client_Adapter (void) + ImR_Client_Adapter::~ImR_Client_Adapter () { } } diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index b3113da36a9..5f183ef335c 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -52,7 +52,7 @@ namespace TAO public ACE_Service_Object { public: - virtual ~ImR_Client_Adapter (void); + virtual ~ImR_Client_Adapter (); /// ImplRepo helper method, notify the ImplRepo on startup virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0; diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index a2429e9d9a0..ee97fc016db 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -17,7 +17,7 @@ namespace TAO } CORBA::Policy_ptr - ImplicitActivationPolicy::copy (void) + ImplicitActivationPolicy::copy () { ImplicitActivationPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -28,30 +28,30 @@ namespace TAO } void - ImplicitActivationPolicy::destroy (void) + ImplicitActivationPolicy::destroy () { } ::PortableServer::ImplicitActivationPolicyValue - ImplicitActivationPolicy::value (void) + ImplicitActivationPolicy::value () { return value_; } CORBA::PolicyType - ImplicitActivationPolicy::policy_type (void) + ImplicitActivationPolicy::policy_type () { return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; } TAO_Cached_Policy_Type - ImplicitActivationPolicy::_tao_cached_type (void) const + ImplicitActivationPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION; } TAO_Policy_Scope - ImplicitActivationPolicy::_tao_scope (void) const + ImplicitActivationPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index 41e8002c1c9..3bc68da0d7e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO } void - ImplicitActivationStrategy::strategy_cleanup (void) + ImplicitActivationStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 70f1731d28d..491df8cf702 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -30,9 +30,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - virtual bool allow_implicit_activation (void) const = 0; + virtual bool allow_implicit_activation () const = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 30859b6a30e..98c308606d8 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -8,7 +8,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyExplicit::allow_implicit_activation () const { return false; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 19c1dfb44ff..05846df574a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -31,7 +31,7 @@ namespace TAO public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 0be943ee21c..989dd133b88 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -9,7 +9,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyImplicit::allow_implicit_activation () const { return true; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 06d74edcd93..68d0a997130 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -33,7 +33,7 @@ namespace TAO : public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index c7ccba1f38c..b48962042fc 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void) +TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator () : counter_ (0) { } diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index e9d7a4bcd43..04c9a86b4ce 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - LifespanPolicy::copy (void) + LifespanPolicy::copy () { LifespanPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - LifespanPolicy::destroy (void) + LifespanPolicy::destroy () { } ::PortableServer::LifespanPolicyValue - LifespanPolicy::value (void) + LifespanPolicy::value () { return value_; } CORBA::PolicyType - LifespanPolicy::policy_type (void) + LifespanPolicy::policy_type () { return ::PortableServer::LIFESPAN_POLICY_ID; } TAO_Cached_Policy_Type - LifespanPolicy::_tao_cached_type (void) const + LifespanPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_LIFESPAN; } TAO_Policy_Scope - LifespanPolicy::_tao_scope (void) const + LifespanPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index c87eec3b84e..e331e653adb 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -26,13 +26,13 @@ namespace TAO } void - LifespanStrategy::strategy_cleanup (void) + LifespanStrategy::strategy_cleanup () { poa_ = 0; } CORBA::ULong - LifespanStrategy::key_type_length (void) const + LifespanStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index da64516525c..6aaa52a0bdf 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -33,17 +33,17 @@ namespace TAO : public Policy_Strategy { public: - LifespanStrategy (void); + LifespanStrategy (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); void create (const char *name, const TAO::ObjectKey &key); - virtual void notify_startup (void) = 0; + virtual void notify_startup () = 0; - virtual void notify_shutdown (void) = 0; + virtual void notify_shutdown () = 0; /** * Validate the passed object key if it belongs to this POA. @@ -53,12 +53,12 @@ namespace TAO /** * Returns the length of the key type */ - virtual CORBA::ULong key_length (void) const = 0; + virtual CORBA::ULong key_length () const = 0; - CORBA::ULong key_type_length (void) const; + CORBA::ULong key_type_length () const; /// Do we have set persistent or not, - virtual CORBA::Boolean is_persistent (void) const = 0; + virtual CORBA::Boolean is_persistent () const = 0; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0; @@ -68,7 +68,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0; /// Check the state of the POA. - virtual void check_state (void) = 0; + virtual void check_state () = 0; virtual ::PortableServer::LifespanPolicyValue type () const = 0; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 2ccf947ccf9..62f681a6f18 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -31,13 +31,13 @@ namespace TAO } char - LifespanStrategyPersistent::key_type (void) const + LifespanStrategyPersistent::key_type () const { return 'P'; } CORBA::Boolean - LifespanStrategyPersistent::is_persistent (void) const + LifespanStrategyPersistent::is_persistent () const { return true; } @@ -59,7 +59,7 @@ namespace TAO } void - LifespanStrategyPersistent::notify_startup (void) + LifespanStrategyPersistent::notify_startup () { if (this->use_imr_) { @@ -104,7 +104,7 @@ namespace TAO } void - LifespanStrategyPersistent::notify_shutdown (void) + LifespanStrategyPersistent::notify_shutdown () { ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( @@ -122,7 +122,7 @@ namespace TAO } void - LifespanStrategyPersistent::check_state (void) + LifespanStrategyPersistent::check_state () { this->poa_->tao_poa_manager().check_state (); } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 62d56f94e17..03d2075f81d 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -36,15 +36,15 @@ namespace TAO virtual void strategy_init(TAO_Root_POA *poa); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -53,7 +53,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index a701ad0398c..268ea7b3546 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -19,17 +19,17 @@ namespace TAO } void - LifespanStrategyTransient::notify_startup (void) + LifespanStrategyTransient::notify_startup () { } void - LifespanStrategyTransient::notify_shutdown (void) + LifespanStrategyTransient::notify_shutdown () { } CORBA::Boolean - LifespanStrategyTransient::is_persistent (void) const + LifespanStrategyTransient::is_persistent () const { return false; } @@ -44,7 +44,7 @@ namespace TAO } CORBA::ULong - LifespanStrategyTransient::key_length (void) const + LifespanStrategyTransient::key_length () const { CORBA::ULong keylength = sizeof (char); @@ -77,13 +77,13 @@ namespace TAO } char - LifespanStrategyTransient::key_type (void) const + LifespanStrategyTransient::key_type () const { return 'T'; } void - LifespanStrategyTransient::check_state (void) + LifespanStrategyTransient::check_state () { if (this->poa_->tao_poa_manager ().get_state_i () == PortableServer::POAManager::INACTIVE) diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index a3ef34c46fa..161994e964a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -31,17 +31,17 @@ namespace TAO : public LifespanStrategy { public: - LifespanStrategyTransient (void); + LifespanStrategyTransient (); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -50,7 +50,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp index b143ac6a441..50efd1ee5af 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp +++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void) +TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook() { } @@ -25,7 +25,7 @@ TAO_Network_Priority_Hook::set_dscp_codepoint ( } int -TAO_Network_Priority_Hook::initialize (void) +TAO_Network_Priority_Hook::initialize () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Network_Priority_Hook); diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h index 756e587e26d..29e4cfb2834 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.h +++ b/TAO/tao/PortableServer/Network_Priority_Hook.h @@ -39,7 +39,7 @@ class TAO_PortableServer_Export TAO_Network_Priority_Hook : public ACE_Service_Object { public: - virtual ~TAO_Network_Priority_Hook(void); + virtual ~TAO_Network_Priority_Hook(); virtual void update_network_priority (TAO_Root_POA& poa, TAO_POA_Policy_Set& poa_policy_set); @@ -49,7 +49,7 @@ public: TAO_Root_POA& poa); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index e00befdbd1d..58bb91a3936 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -43,7 +43,7 @@ namespace TAO this->object_adapter_.lock ().release (); } - Non_Servant_Upcall::~Non_Servant_Upcall (void) + Non_Servant_Upcall::~Non_Servant_Upcall () { // Reacquire the Object Adapter lock. this->object_adapter_.lock ().acquire (); diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index c05b50db449..75041660593 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -53,9 +53,9 @@ namespace TAO Non_Servant_Upcall (::TAO_Root_POA &poa); /// Destructor. - ~Non_Servant_Upcall (void); + ~Non_Servant_Upcall (); - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; protected: diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index e499d3aa1b0..0411ff7be0b 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ORT_Adapter_Factory::~ORT_Adapter_Factory (void) + ORT_Adapter_Factory::~ORT_Adapter_Factory () { } } diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index 3e018602d4a..d2d1df23f1e 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -55,7 +55,7 @@ namespace TAO * line option. Apparently the compiler generated * destructor is inlined. */ - virtual ~ORT_Adapter_Factory (void); + virtual ~ORT_Adapter_Factory (); /// Create a new adapter, in case not possible to allocate, returns 0 virtual TAO::ORT_Adapter * create () = 0; diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 781a60c24b4..b8cd2a2d059 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -292,7 +292,7 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies) #endif } -TAO_Object_Adapter::~TAO_Object_Adapter (void) +TAO_Object_Adapter::~TAO_Object_Adapter () { delete this->hint_strategy_; delete this->persistent_poa_name_map_; @@ -552,7 +552,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, } void -TAO_Object_Adapter::open (void) +TAO_Object_Adapter::open () { // Add in the default POA policies to the default list. this->init_default_policies (this->default_poa_policies ()); @@ -691,7 +691,7 @@ TAO_Object_Adapter::check_close (int wait_for_completion) } int -TAO_Object_Adapter::priority (void) const +TAO_Object_Adapter::priority () const { return 0; } @@ -828,13 +828,13 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, } const char * -TAO_Object_Adapter::name (void) const +TAO_Object_Adapter::name () const { return TAO_OBJID_ROOTPOA; } CORBA::Object_ptr -TAO_Object_Adapter::root (void) +TAO_Object_Adapter::root () { return CORBA::Object::_duplicate (this->root_); } @@ -935,7 +935,7 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp) // **************************************************************** -TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void) +TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy () { } @@ -950,7 +950,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map { } -TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) +TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy () { } @@ -1023,7 +1023,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa ( return result; } -TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) +TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy () { } @@ -1114,7 +1114,7 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const } TAO_Object_Adapter::poa_name_iterator & -TAO_Object_Adapter::poa_name_iterator::operator++ (void) +TAO_Object_Adapter::poa_name_iterator::operator++ () { for (this->last_separator_ = this->position_; ; @@ -1140,7 +1140,7 @@ TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name ( } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::begin (void) const +TAO_Object_Adapter::iteratable_poa_name::begin () const { return iterator (1, this->folded_name_.length (), @@ -1148,7 +1148,7 @@ TAO_Object_Adapter::iteratable_poa_name::begin (void) const } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::end (void) const +TAO_Object_Adapter::iteratable_poa_name::end () const { return iterator (0, this->folded_name_.length (), @@ -1156,7 +1156,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete () { // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of @@ -1173,7 +1173,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw () { // Non-exception throwing version. try diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index cad8ead9956..56563f63655 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -46,7 +46,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr arg (void) const; + S_ptr arg () const; private: S_var x_; @@ -64,14 +64,14 @@ namespace TAO class Inout_Object_SArgument_T : public InoutArgument { public: - Inout_Object_SArgument_T (void); + Inout_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; @@ -90,13 +90,13 @@ namespace TAO class Out_Object_SArgument_T : public OutArgument { public: - Out_Object_SArgument_T (void); + Out_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_out arg (void); + S_out arg (); private: S_var x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Object_SArgument_T : public RetArgument { public: - Ret_Object_SArgument_T (void); + Ret_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 51d1022d3cb..1caafb83961 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Operation_Table::~TAO_Operation_Table (void) +TAO_Operation_Table::~TAO_Operation_Table () { } /**************************************************************/ -TAO::Operation_Skeletons::Operation_Skeletons (void) +TAO::Operation_Skeletons::Operation_Skeletons () : skel_ptr (0) , thruPOA_skel_ptr (0) , direct_skel_ptr (0) diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index bd3e39f380d..11d78518daa 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -79,7 +79,7 @@ namespace TAO */ struct TAO_PortableServer_Export Operation_Skeletons { - Operation_Skeletons (void); + Operation_Skeletons (); /// Remote skeleton pointer TAO_Skeleton skel_ptr; @@ -123,7 +123,7 @@ public: virtual int bind (const char *opname, const TAO::Operation_Skeletons skel_ptr) = 0; - virtual ~TAO_Operation_Table (void); + virtual ~TAO_Operation_Table (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index bff7610bab2..a36d050310a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void) +TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 87c23bce8ea..fa04e2fd156 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -40,7 +40,7 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable public: /// Do nothing destructor. - virtual ~TAO_Binary_Search_OpTable (void); + virtual ~TAO_Binary_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 5f8f5eda365..95e5d4d8ba3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -50,7 +50,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( } } -TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void) +TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable () { // Initialize an iterator. We need to go thru each entry and free // up storage allocated to hold the external ids. In this case, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index 611950d5a64..c2c421691f2 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -49,7 +49,7 @@ public: ACE_Allocator *alloc); /// Destructor - ~TAO_Dynamic_Hash_OpTable (void); + ~TAO_Dynamic_Hash_OpTable (); /// See the documentation in the base class for details. virtual int bind (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 58505e0f0ca..4baed2dea0a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -27,7 +27,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void) +TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 380a76e7503..4fa853eca8b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable { public: /// Destructor. - ~TAO_Linear_Search_OpTable (void); + ~TAO_Linear_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index 37f9429bb4d..3156673cb9b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Do nothing destructor. -TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void) +TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 5365cd0aebf..b89d8f511ea 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable public: /// Do nothing destructor. - virtual ~TAO_Perfect_Hash_OpTable (void); + virtual ~TAO_Perfect_Hash_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index d3c8c4c30a9..f1cdd220590 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -39,7 +39,7 @@ TAO_POA_Manager::TAO_POA_Manager ( #endif -TAO_POA_Manager::~TAO_POA_Manager (void) +TAO_POA_Manager::~TAO_POA_Manager () { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) poa_manager_factory_._remove_ref (); @@ -47,13 +47,13 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } char * -TAO_POA_Manager::get_id (void) +TAO_POA_Manager::get_id () { return CORBA::string_dup (this->id_.in ()); } void -TAO_POA_Manager::activate_i (void) +TAO_POA_Manager::activate_i () { // This operation changes the state of the POA manager to active. If // issued while the POA manager is in the inactive state, the @@ -301,7 +301,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa) } void -TAO_POA_Manager::check_state (void) +TAO_POA_Manager::check_state () { if (state_ == PortableServer::POAManager::ACTIVE) { @@ -367,7 +367,7 @@ TAO_POA_Manager::check_state (void) } CORBA::ORB_ptr -TAO_POA_Manager::_get_orb (void) +TAO_POA_Manager::_get_orb () { return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 1cba969df80..a589b63c4d0 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -59,7 +59,7 @@ class TAO_PortableServer_Export TAO_POA_Manager : friend class TAO_Object_Adapter; public: - void activate (void); + void activate (); #if (TAO_HAS_MINIMUM_POA == 0) @@ -72,9 +72,9 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (void); + PortableServer::POAManager::State get_state (); - char *get_id (void); + char *get_id (); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -85,21 +85,21 @@ public: const char * id); #endif - ~TAO_POA_Manager (void); + ~TAO_POA_Manager (); /// Check the state of this POA manager - void check_state (void); + void check_state (); PortableServer::POAManager::State get_state_i (); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - CORBA::PolicyList& get_policies (void); + CORBA::PolicyList& get_policies (); #endif protected: - void activate_i (void); + void activate_i (); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); @@ -116,7 +116,7 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - ACE_Lock &lock (void); + ACE_Lock &lock (); int remove_poa (TAO_Root_POA *poa); @@ -147,7 +147,7 @@ private : * given process. * @note: The id_ has the ownership of the memory allocated in this method. */ - char* generate_manager_id (void) const; + char* generate_manager_id () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index bc1b2cb69c7..afd7c87df6a 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -14,7 +14,7 @@ TAO_POAManager_Factory::TAO_POAManager_Factory (TAO_Object_Adapter &object_adapt { } -TAO_POAManager_Factory::~TAO_POAManager_Factory (void) +TAO_POAManager_Factory::~TAO_POAManager_Factory () { this->remove_all_poamanagers (); } @@ -74,7 +74,7 @@ TAO_POAManager_Factory::create_POAManager ( } ::PortableServer::POAManagerFactory::POAManagerSeq * -TAO_POAManager_Factory::list (void) +TAO_POAManager_Factory::list () { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong> @@ -122,7 +122,7 @@ TAO_POAManager_Factory::find (const char * id) } void -TAO_POAManager_Factory::remove_all_poamanagers (void) +TAO_POAManager_Factory::remove_all_poamanagers () { for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin (); iterator != this->poamanager_set_.end (); diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h index 6335b0838dc..319fffaef87 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.h +++ b/TAO/tao/PortableServer/POAManagerFactory.h @@ -43,17 +43,17 @@ class TAO_PortableServer_Export TAO_POAManager_Factory : public: TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter); - virtual ~TAO_POAManager_Factory (void); + virtual ~TAO_POAManager_Factory (); virtual ::PortableServer::POAManager_ptr create_POAManager ( const char * id, const ::CORBA::PolicyList & policies); - virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void); + virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (); virtual ::PortableServer::POAManager_ptr find (const char * id); - void remove_all_poamanagers (void); + void remove_all_poamanagers (); int remove_poamanager (::PortableServer::POAManager_ptr poamanager); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 24061bd8238..9660fdfede2 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -35,7 +35,7 @@ namespace TAO } - Cached_Policies::~Cached_Policies (void) + Cached_Policies::~Cached_Policies () { } diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index 506f938fb96..cdb6a81c23c 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -13,7 +13,7 @@ namespace TAO namespace Portable_Server { PortableServer::POA_ptr - POA_Current::get_POA (void) + POA_Current::get_POA () { POA_Current_Impl *impl = this->implementation (); @@ -23,7 +23,7 @@ namespace TAO } PortableServer::ObjectId * - POA_Current::get_object_id (void) + POA_Current::get_object_id () { POA_Current_Impl *impl = this->implementation (); @@ -33,7 +33,7 @@ namespace TAO } PortableServer::Servant - POA_Current::get_servant (void) + POA_Current::get_servant () { POA_Current_Impl *impl = this->implementation (); @@ -43,7 +43,7 @@ namespace TAO } CORBA::Object_ptr - POA_Current::get_reference (void) + POA_Current::get_reference () { POA_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ namespace TAO } POA_Current_Impl * - POA_Current::implementation (void) + POA_Current::implementation () { return static_cast <POA_Current_Impl *> (TAO_TSS_Resources::instance ()->poa_current_impl_); diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index e90680b9141..3c014c7ece7 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -45,14 +45,14 @@ namespace TAO * Can raise the @c NoContext exception if this function is * not invoked in the context of an upcall. */ - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Returns the object id of the current request being invoked. Can * raise the @c NoContext exception if this function is not * invoked in the context of an upcall. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * This operation returns a locally manufactured reference to the object @@ -63,17 +63,17 @@ namespace TAO * Object::is_equivalent operation to compare the two references may not * necessarily return true. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /// Returns the class that implements this interface. - POA_Current_Impl *implementation (void); + POA_Current_Impl *implementation (); /// Sets the thread-specific pointer to the new POA Current state, /// returning a pointer to the existing POA Current state. diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index a3d4e509474..22c8c91e7a6 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -15,7 +15,7 @@ namespace TAO { namespace Portable_Server { - POA_Current_Impl::POA_Current_Impl (void) + POA_Current_Impl::POA_Current_Impl () : poa_ (0), object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_), object_key_ (0), @@ -46,13 +46,13 @@ namespace TAO } POA_Current_Impl * - POA_Current_Impl::previous (void) const + POA_Current_Impl::previous () const { return this->previous_current_impl_; } void - POA_Current_Impl::teardown (void) + POA_Current_Impl::teardown () { if (this->setup_done_) { @@ -62,13 +62,13 @@ namespace TAO } PortableServer::POA_ptr - POA_Current_Impl::get_POA (void) + POA_Current_Impl::get_POA () { return PortableServer::POA::_duplicate (this->poa_); } PortableServer::ObjectId * - POA_Current_Impl::get_object_id (void) + POA_Current_Impl::get_object_id () { PortableServer::ObjectId *objid = 0; @@ -80,19 +80,19 @@ namespace TAO } CORBA::Object_ptr - POA_Current_Impl::get_reference (void) + POA_Current_Impl::get_reference () { return this->poa_->id_to_reference (this->object_id_); } PortableServer::Servant - POA_Current_Impl::get_servant (void) + POA_Current_Impl::get_servant () { return this->servant_; } TAO_ORB_Core & - POA_Current_Impl::orb_core (void) const + POA_Current_Impl::orb_core () const { return this->poa_->orb_core (); diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 9b0df5c9089..8f155ed5ebc 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::TAO_POA_Policy_Set () : impl_ (TAO_POLICY_POA_SCOPE) { } @@ -22,7 +22,7 @@ TAO_POA_Policy_Set::TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs) { } -TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::~TAO_POA_Policy_Set () { } diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index ec0a774404f..1acd9e71912 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -34,9 +34,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa) = 0; - virtual void strategy_cleanup(void) = 0; + virtual void strategy_cleanup() = 0; - virtual ~Policy_Strategy (void) {}; + virtual ~Policy_Strategy () {}; }; } } diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index dc55e7b8e14..42268bcdfec 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_POA_Initializer::init (void) +TAO_POA_Initializer::init () { ACE_Service_Config::process_directive ( ace_svc_desc_IdAssignmentStrategySystem); diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index fad1bcc1272..d95abb8b3ca 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -30,12 +30,12 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, { } -TAO_Regular_POA::~TAO_Regular_POA (void) +TAO_Regular_POA::~TAO_Regular_POA () { } void -TAO_Regular_POA::remove_from_parent_i (void) +TAO_Regular_POA::remove_from_parent_i () { // Remove POA from the parent if (this->parent_ != 0) @@ -49,13 +49,13 @@ TAO_Regular_POA::remove_from_parent_i (void) } CORBA::Boolean -TAO_Regular_POA::root (void) const +TAO_Regular_POA::root () const { return (parent_ == 0); } char -TAO_Regular_POA::root_key_type (void) +TAO_Regular_POA::root_key_type () { if (this->parent_ != 0) { diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 3ba38c4130e..9da69970431 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -47,16 +47,16 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Regular_POA (void); + virtual ~TAO_Regular_POA (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); protected: - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); /// The parent of this POA, be aware that in case this pointer is nill, /// we are a parent. This can be achieved by deriving from this Regular_POA diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 8145883a4cc..a180a70a1c6 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - RequestProcessingPolicy::copy (void) + RequestProcessingPolicy::copy () { RequestProcessingPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - RequestProcessingPolicy::destroy (void) + RequestProcessingPolicy::destroy () { } ::PortableServer::RequestProcessingPolicyValue - RequestProcessingPolicy::value (void) + RequestProcessingPolicy::value () { return value_; } CORBA::PolicyType - RequestProcessingPolicy::policy_type (void) + RequestProcessingPolicy::policy_type () { return ::PortableServer::REQUEST_PROCESSING_POLICY_ID; } TAO_Cached_Policy_Type - RequestProcessingPolicy::_tao_cached_type (void) const + RequestProcessingPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_REQUEST_PROCESSING; } TAO_Policy_Scope - RequestProcessingPolicy::_tao_scope (void) const + RequestProcessingPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 7cd378aa737..f564757c699 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy (void) + RequestProcessingStrategy::RequestProcessingStrategy () : poa_ (0) { } @@ -35,7 +35,7 @@ namespace TAO } void - RequestProcessingStrategy::strategy_cleanup(void) + RequestProcessingStrategy::strategy_cleanup() { poa_ = 0; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 80613323d41..5378d1739a4 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -48,7 +48,7 @@ namespace TAO : public Policy_Strategy { public: - RequestProcessingStrategy (void); + RequestProcessingStrategy (); virtual void strategy_init(TAO_Root_POA *poa); @@ -56,18 +56,18 @@ namespace TAO TAO_Root_POA *poa, ::PortableServer::ServantRetentionPolicyValue); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - virtual PortableServer::ServantManager_ptr get_servant_manager (void) = 0; + virtual PortableServer::ServantManager_ptr get_servant_manager () = 0; virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr) = 0; virtual void set_servant (PortableServer::Servant servant) = 0; - virtual PortableServer::Servant get_servant (void) = 0; + virtual PortableServer::Servant get_servant () = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 7827a2189b3..9a77833ffe3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -19,7 +19,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - RequestProcessingStrategyAOMOnly::get_servant_manager (void) + RequestProcessingStrategyAOMOnly::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -39,7 +39,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyAOMOnly::get_servant (void) + RequestProcessingStrategyAOMOnly::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 0ef178c71ce..28718985f5f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -36,18 +36,18 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyAOMOnly (void); + RequestProcessingStrategyAOMOnly (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - get_servant_manager (void); + get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); void set_servant (PortableServer::Servant servant); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 201a95b1eb2..b8661b7fd00 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -18,19 +18,19 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void) + RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant () : default_servant_ (0) { } void - RequestProcessingStrategyDefaultServant::strategy_cleanup(void) + RequestProcessingStrategyDefaultServant::strategy_cleanup() { this->default_servant_ = 0; } PortableServer::ServantManager_ptr - RequestProcessingStrategyDefaultServant::get_servant_manager (void) + RequestProcessingStrategyDefaultServant::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -43,7 +43,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyDefaultServant::get_servant (void) + RequestProcessingStrategyDefaultServant::get_servant () { // This operation returns the default servant associated with the // POA. diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 20ed35f5a4f..e0c9f62f970 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -37,15 +37,15 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyDefaultServant (void); + RequestProcessingStrategyDefaultServant (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 52082c26dd2..85cd906d642 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -17,13 +17,13 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) : + RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator () : etherealize_objects_ (true) { } void - RequestProcessingStrategyServantActivator::strategy_cleanup (void) + RequestProcessingStrategyServantActivator::strategy_cleanup () { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -36,7 +36,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantActivator::get_servant_manager (void) + RequestProcessingStrategyServantActivator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 6ffe7776b8b..c7675ae80a0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantActivator (void); + RequestProcessingStrategyServantActivator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index e83bd3afe65..01458939b75 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -17,12 +17,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void) + RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator () { } void - RequestProcessingStrategyServantLocator::strategy_cleanup(void) + RequestProcessingStrategyServantLocator::strategy_cleanup() { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -35,7 +35,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantLocator::get_servant_manager (void) + RequestProcessingStrategyServantLocator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index f5306029f20..9cff43232f2 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantLocator (void); + RequestProcessingStrategyServantLocator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 73981faf582..6454c9ff55b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -14,12 +14,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void) + RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager () { } PortableServer::Servant - RequestProcessingStrategyServantManager::get_servant (void) + RequestProcessingStrategyServantManager::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 8ef06661724..420d9441072 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -33,9 +33,9 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyServantManager (void); + RequestProcessingStrategyServantManager (); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 972d5057fbc..fa97cf8d535 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -318,13 +318,13 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, aps_cleanup_guard._retn (); } -TAO_Root_POA::~TAO_Root_POA (void) +TAO_Root_POA::~TAO_Root_POA () { this->poa_manager_._remove_ref(); } void -TAO_Root_POA::complete_destruction_i (void) +TAO_Root_POA::complete_destruction_i () { bool doing_complete_destruction = this->waiting_destruction_ != false; @@ -739,7 +739,7 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) } PortableServer::POAList * -TAO_Root_POA::the_children (void) +TAO_Root_POA::the_children () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -793,7 +793,7 @@ TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects, } void -TAO_Root_POA::remove_from_parent_i (void) +TAO_Root_POA::remove_from_parent_i () { // The root poa has no parent, so this is a noop } @@ -976,7 +976,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child) } PortableServer::POAList * -TAO_Root_POA::the_children_i (void) +TAO_Root_POA::the_children_i () { PortableServer::POAList_var children; CORBA::ULong child_current = static_cast <CORBA::ULong> @@ -1000,7 +1000,7 @@ TAO_Root_POA::the_children_i (void) } PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name_i (void) +TAO_Root_POA::adapter_name_i () { // The adapter name is the sequence of names starting from the // RootPOA to the one whose name is requested. The name of the @@ -1278,7 +1278,7 @@ TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id) } CORBA::Boolean -TAO_Root_POA::is_persistent (void) const +TAO_Root_POA::is_persistent () const { return active_policy_strategies_.lifespan_strategy()->is_persistent (); } @@ -1539,7 +1539,7 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, } CORBA::OctetSeq * -TAO_Root_POA::id (void) +TAO_Root_POA::id () { CORBA::OctetSeq *id = 0; ACE_NEW_THROW_EX (id, @@ -1905,13 +1905,13 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key, } TAO_Object_Adapter & -TAO_Root_POA::object_adapter (void) +TAO_Root_POA::object_adapter () { return *this->object_adapter_; } CORBA::Object_ptr -TAO_Root_POA::invoke_key_to_object (void) +TAO_Root_POA::invoke_key_to_object () { PortableServer::ObjectId_var &system_id = *this->key_to_object_params_.system_id_; @@ -2045,7 +2045,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } void -TAO_Root_POA::establish_components (void) +TAO_Root_POA::establish_components () { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); @@ -2233,7 +2233,7 @@ TAO_Root_POA::find_servant_priority ( } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter_i (void) +TAO_Root_POA::ORT_adapter_i () { if ((this->ort_adapter_factory_) && (this->ort_adapter_ == 0)) { @@ -2272,7 +2272,7 @@ TAO_Root_POA::ORT_adapter_i (void) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr -TAO_Root_POA::the_activator (void) +TAO_Root_POA::the_activator () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ()); @@ -2294,7 +2294,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr -TAO_Root_POA::get_servant_manager (void) +TAO_Root_POA::get_servant_manager () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); @@ -2314,14 +2314,14 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr) } PortableServer::Servant -TAO_Root_POA::get_servant_i (void) +TAO_Root_POA::get_servant_i () { return this->active_policy_strategies_.request_processing_strategy()-> get_servant (); } PortableServer::Servant -TAO_Root_POA::get_servant (void) +TAO_Root_POA::get_servant () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -2374,7 +2374,7 @@ TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant, } bool -TAO_Root_POA::has_system_id (void) const +TAO_Root_POA::has_system_id () const { return this->active_policy_strategies_.id_assignment_strategy ()-> has_system_id (); @@ -2402,14 +2402,14 @@ TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant } bool -TAO_Root_POA::allow_implicit_activation (void) const +TAO_Root_POA::allow_implicit_activation () const { return this->active_policy_strategies_.implicit_activation_strategy ()-> allow_implicit_activation (); } bool -TAO_Root_POA::allow_multiple_activations (void) const +TAO_Root_POA::allow_multiple_activations () const { return this->active_policy_strategies_.id_uniqueness_strategy ()-> allow_multiple_activations (); @@ -2425,7 +2425,7 @@ TAO_Root_POA::post_invoke_servant_cleanup( } CORBA::Short -TAO_Root_POA::server_priority (void) const +TAO_Root_POA::server_priority () const { return this->cached_policies_.server_priority (); } @@ -2440,19 +2440,19 @@ TAO_Root_POA::is_servant_active ( } TAO::Portable_Server::Cached_Policies& -TAO_Root_POA::cached_policies (void) +TAO_Root_POA::cached_policies () { return this->cached_policies_; } TAO_Network_Priority_Hook* -TAO_Root_POA::network_priority_hook (void) +TAO_Root_POA::network_priority_hook () { return this->network_priority_hook_; } TAO::Portable_Server::Cached_Policies::PriorityModel -TAO_Root_POA::priority_model (void) const +TAO_Root_POA::priority_model () const { return cached_policies_.priority_model (); } @@ -2483,13 +2483,13 @@ TAO_Root_POA::validate_lifespan ( } CORBA::Boolean -TAO_Root_POA::root (void) const +TAO_Root_POA::root () const { return true; } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter (void) +TAO_Root_POA::ORT_adapter () { if (this->ort_adapter_ != 0) return this->ort_adapter_; @@ -2507,7 +2507,7 @@ TAO_Root_POA::ORT_adapter (void) } CORBA::Policy * -TAO_Root_POA::server_protocol (void) +TAO_Root_POA::server_protocol () { return 0; } @@ -2529,7 +2529,7 @@ TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id } CORBA::ULong -TAO_Root_POA::waiting_servant_deactivation (void) const +TAO_Root_POA::waiting_servant_deactivation () const { return this->active_policy_strategies_.servant_retention_strategy ()-> waiting_servant_deactivation (); @@ -2549,13 +2549,13 @@ TAO_Root_POA::get_policy (CORBA::PolicyType policy) } void -TAO_Root_POA::check_state (void) +TAO_Root_POA::check_state () { this->active_policy_strategies_.lifespan_strategy ()->check_state (); } const char * -TAO_Root_POA::ort_adapter_factory_name (void) +TAO_Root_POA::ort_adapter_factory_name () { return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str(); } @@ -2567,27 +2567,27 @@ TAO_Root_POA::imr_client_adapter_name (const char *name) } const char * -TAO_Root_POA::imr_client_adapter_name (void) +TAO_Root_POA::imr_client_adapter_name () { return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str(); } PortableServer::POAManager_ptr -TAO_Root_POA::the_POAManager (void) +TAO_Root_POA::the_POAManager () { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr -TAO_Root_POA::the_POAManagerFactory (void) +TAO_Root_POA::the_POAManagerFactory () { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); } #endif CORBA::ORB_ptr -TAO_Root_POA::_get_orb (void) +TAO_Root_POA::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } @@ -2604,14 +2604,14 @@ TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ = TAO_POA_Static_Resources::instance (); void -TAO_POA_Static_Resources::fini (void) +TAO_POA_Static_Resources::fini () { delete TAO_POA_Static_Resources::instance_; TAO_POA_Static_Resources::instance_ = 0; } TAO_POA_Static_Resources* -TAO_POA_Static_Resources::instance (void) +TAO_POA_Static_Resources::instance () { if (TAO_POA_Static_Resources::instance_ == 0) { @@ -2628,7 +2628,7 @@ TAO_POA_Static_Resources::instance (void) return TAO_POA_Static_Resources::instance_; } -TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) +TAO_POA_Static_Resources::TAO_POA_Static_Resources () : ort_adapter_factory_name_ ("ORT_Adapter_Factory"), imr_client_adapter_name_ ("ImR_Client_Adapter") { diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp index 6ccba4791cb..bcda45a6750 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.cpp +++ b/TAO/tao/PortableServer/SUpcall_commands.cpp @@ -16,7 +16,7 @@ #include "tao/Object.h" void -_is_a_thru_poa_Upcall_Command::execute (void) +_is_a_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -35,7 +35,7 @@ _is_a_thru_poa_Upcall_Command::execute (void) } void -_is_a_Upcall_Command::execute (void) +_is_a_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -50,7 +50,7 @@ _is_a_Upcall_Command::execute (void) #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_thru_poa_Upcall_Command::execute (void) +_non_existent_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -62,7 +62,7 @@ _non_existent_thru_poa_Upcall_Command::execute (void) } void -_non_existent_Upcall_Command::execute (void) +_non_existent_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -74,7 +74,7 @@ _non_existent_Upcall_Command::execute (void) # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) void -_get_component_thru_poa_Upcall_Command::execute (void) +_get_component_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -86,7 +86,7 @@ _get_component_thru_poa_Upcall_Command::execute (void) } void -_get_component_Upcall_Command::execute (void) +_get_component_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::CORBA::Object>::ret_val *> (this->args_[0])->arg (); @@ -99,7 +99,7 @@ _get_component_Upcall_Command::execute (void) void -_repository_id_thru_poa_Upcall_Command::execute (void) +_repository_id_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( @@ -111,7 +111,7 @@ _repository_id_thru_poa_Upcall_Command::execute (void) } void -_repository_id_Upcall_Command::execute(void ) +_repository_id_Upcall_Command::execute( ) { TAO::SArg_Traits< char *>::ret_arg_type retval = static_cast<TAO::SArg_Traits< char *>::ret_val *> (this->args_[0])->arg (); diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h index d68ee481d18..e7ed10c074b 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.h +++ b/TAO/tao/PortableServer/SUpcall_commands.h @@ -52,7 +52,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -77,7 +77,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -105,7 +105,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -129,7 +129,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -157,7 +157,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -182,7 +182,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -209,7 +209,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -234,7 +234,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index c716959b96f..6c7eb85a171 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ServantRetentionPolicy::copy (void) + ServantRetentionPolicy::copy () { ServantRetentionPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ServantRetentionPolicy::destroy (void) + ServantRetentionPolicy::destroy () { } ::PortableServer::ServantRetentionPolicyValue - ServantRetentionPolicy::value (void) + ServantRetentionPolicy::value () { return this->value_; } CORBA::PolicyType - ServantRetentionPolicy::policy_type (void) + ServantRetentionPolicy::policy_type () { return ::PortableServer::SERVANT_RETENTION_POLICY_ID; } TAO_Cached_Policy_Type - ServantRetentionPolicy::_tao_cached_type (void) const + ServantRetentionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_SERVANT_RETENTION; } TAO_Policy_Scope - ServantRetentionPolicy::_tao_scope (void) const + ServantRetentionPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 436eb6a185d..eb54dc6520a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -37,7 +37,7 @@ namespace TAO : public Policy_Strategy { public: - virtual CORBA::ULong waiting_servant_deactivation (void) const = 0; + virtual CORBA::ULong waiting_servant_deactivation () const = 0; virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call) = 0; @@ -81,7 +81,7 @@ namespace TAO const PortableServer::ObjectId &id, bool indirect) = 0; - virtual void deactivate_all_objects (void) = 0; + virtual void deactivate_all_objects () = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant) = 0; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 2ace6f13b39..e4e39fbe4bd 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -24,7 +24,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) : + ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () : poa_ (0), sys_id_count_ (0) { @@ -37,7 +37,7 @@ namespace TAO } void - ServantRetentionStrategyNonRetain::strategy_cleanup (void) + ServantRetentionStrategyNonRetain::strategy_cleanup () { poa_ = 0; } @@ -129,13 +129,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyNonRetain::waiting_servant_deactivation () const { return 0; } void - ServantRetentionStrategyNonRetain::deactivate_all_objects (void) + ServantRetentionStrategyNonRetain::deactivate_all_objects () { } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 837e0868b5a..49879c3a222 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -33,13 +33,13 @@ namespace TAO : public ServantRetentionStrategy { public: - ServantRetentionStrategyNonRetain (void); + ServantRetentionStrategyNonRetain (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual PortableServer::ObjectId * @@ -86,7 +86,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 8c5d451f874..b92e56025cc 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -26,7 +26,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) : + ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () : ServantRetentionStrategyNonRetain (), active_object_map_ (), waiting_servant_deactivation_ (0) @@ -61,7 +61,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::strategy_cleanup (void) + ServantRetentionStrategyRetain::strategy_cleanup () { } @@ -433,13 +433,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyRetain::waiting_servant_deactivation () const { return waiting_servant_deactivation_; } void - ServantRetentionStrategyRetain::deactivate_all_objects (void) + ServantRetentionStrategyRetain::deactivate_all_objects () { // If the etherealize_objects parameter is TRUE, the POA has the // RETAIN policy, and a servant manager is registered with the POA, @@ -963,7 +963,7 @@ namespace TAO ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type(void) const + ServantRetentionStrategyRetain::type() const { return ::PortableServer::RETAIN; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 500629cf1c0..46d47061731 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -32,13 +32,13 @@ namespace TAO : public ServantRetentionStrategyNonRetain { public: - ServantRetentionStrategyRetain (void); + ServantRetentionStrategyRetain (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call); @@ -85,7 +85,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 9bd8738a623..8a9f6f3cb7b 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -79,12 +79,12 @@ TAO_ServantBase::operator= (const TAO_ServantBase &rhs) return *this; } -TAO_ServantBase::~TAO_ServantBase (void) +TAO_ServantBase::~TAO_ServantBase () { } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (void) +TAO_ServantBase::_default_POA () { CORBA::Object_var object = TAO_ORB_Core_instance ()->root_poa (); @@ -434,13 +434,13 @@ TAO_ServantBase::_is_a (const char *logical_type_id) #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean -TAO_ServantBase::_non_existent (void) +TAO_ServantBase::_non_existent () { return false; } CORBA::InterfaceDef_ptr -TAO_ServantBase::_get_interface (void) +TAO_ServantBase::_get_interface () { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -459,13 +459,13 @@ TAO_ServantBase::_get_interface (void) #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Object_ptr -TAO_ServantBase::_get_component (void) +TAO_ServantBase::_get_component () { return CORBA::Object::_nil (); } #endif char * -TAO_ServantBase::_repository_id (void) +TAO_ServantBase::_repository_id () { return CORBA::string_dup (this->_interface_repository_id ()); } @@ -493,7 +493,7 @@ TAO_ServantBase::_find (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (void) +TAO_ServantBase::_create_stub () { TAO_Stub *stub = 0; @@ -645,13 +645,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( } void -TAO_ServantBase::_add_ref (void) +TAO_ServantBase::_add_ref () { ++this->ref_count_; } void -TAO_ServantBase::_remove_ref (void) +TAO_ServantBase::_remove_ref () { CORBA::ULong const new_count = --this->ref_count_; @@ -662,7 +662,7 @@ TAO_ServantBase::_remove_ref (void) } CORBA::ULong -TAO_ServantBase::_refcount_value (void) const +TAO_ServantBase::_refcount_value () const { #if defined (ACE_HAS_CPP11) return this->ref_count_; diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index fe0524cd9d1..722af63e3c9 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) +TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index bf48fea7dc4..ced50eec720 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -48,7 +48,7 @@ namespace PortableServer class TAO_PortableServer_Export TAO_Servant_Dispatcher { public: - virtual ~TAO_Servant_Dispatcher (void); + virtual ~TAO_Servant_Dispatcher (); /// Pre_invoke remote request. virtual void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index e08ac1ae707..e77ac5fb31a 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -179,7 +179,7 @@ namespace TAO } void - Servant_Upcall::pre_invoke_collocated_request (void) + Servant_Upcall::pre_invoke_collocated_request () { this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request ( this->poa (), @@ -188,14 +188,14 @@ namespace TAO } void - Servant_Upcall::post_invoke (void) + Servant_Upcall::post_invoke () { this->object_adapter_->servant_dispatcher_->post_invoke ( this->poa (), this->pre_invoke_state_); } - Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void) + Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State () : state_ (NO_ACTION_REQUIRED), original_native_priority_ (0), original_CORBA_priority_ (0) @@ -225,13 +225,13 @@ namespace TAO return this->poa_; } - Servant_Upcall::~Servant_Upcall (void) + Servant_Upcall::~Servant_Upcall () { this->upcall_cleanup (); } void - Servant_Upcall::upcall_cleanup (void) + Servant_Upcall::upcall_cleanup () { this->post_invoke (); @@ -292,14 +292,14 @@ namespace TAO } void - Servant_Upcall::post_invoke_servant_cleanup (void) + Servant_Upcall::post_invoke_servant_cleanup () { this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (), *this); } void - Servant_Upcall::single_threaded_poa_setup (void) + Servant_Upcall::single_threaded_poa_setup () { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -317,7 +317,7 @@ namespace TAO } void - Servant_Upcall::single_threaded_poa_cleanup (void) + Servant_Upcall::single_threaded_poa_cleanup () { #if (TAO_HAS_MINIMUM_POA == 0) // Since the servant lock was acquired, we must release it. @@ -328,7 +328,7 @@ namespace TAO } void - Servant_Upcall::increment_servant_refcount (void) + Servant_Upcall::increment_servant_refcount () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -336,7 +336,7 @@ namespace TAO } void - Servant_Upcall::servant_cleanup (void) + Servant_Upcall::servant_cleanup () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -369,7 +369,7 @@ namespace TAO } void - Servant_Upcall::poa_cleanup (void) + Servant_Upcall::poa_cleanup () { // Decrease <poa->outstanding_requests_> now that the upcall // is complete. diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index 710cf1f494f..3e217820af9 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -38,13 +38,13 @@ namespace TAO class In_Special_Basic_SArgument_T : public InArgument { public: - In_Special_Basic_SArgument_T (void); + In_Special_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -63,14 +63,14 @@ namespace TAO class Inout_Special_Basic_SArgument_T : public InoutArgument { public: - Inout_Special_Basic_SArgument_T (void); + Inout_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -89,13 +89,13 @@ namespace TAO class Out_Special_Basic_SArgument_T : public OutArgument { public: - Out_Special_Basic_SArgument_T (void); + Out_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Special_Basic_SArgument_T : public RetArgument { public: - Ret_Special_Basic_SArgument_T (void); + Ret_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index dc03abc1ed4..575067c77bf 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -8,7 +8,7 @@ namespace TAO { namespace Portable_Server { - StrategyFactory::~StrategyFactory (void) + StrategyFactory::~StrategyFactory () { } } /* namespace Portable_Server */ diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index fac77d9bff8..ac0b08687ae 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -31,7 +31,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~StrategyFactory (void); + virtual ~StrategyFactory (); }; } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index c7f2869db2b..38dbb7e1f15 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ThreadPolicy::copy (void) + ThreadPolicy::copy () { ThreadPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ThreadPolicy::destroy (void) + ThreadPolicy::destroy () { } ::PortableServer::ThreadPolicyValue - ThreadPolicy::value (void) + ThreadPolicy::value () { return value_; } CORBA::PolicyType - ThreadPolicy::policy_type (void) + ThreadPolicy::policy_type () { return ::PortableServer::THREAD_POLICY_ID; } TAO_Cached_Policy_Type - ThreadPolicy::_tao_cached_type (void) const + ThreadPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_THREAD; } TAO_Policy_Scope - ThreadPolicy::_tao_scope (void) const + ThreadPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index 7b36ab1a869..647081f0660 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -12,7 +12,7 @@ namespace TAO } void - ThreadStrategy::strategy_cleanup (void) + ThreadStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 29b9ab8bafa..14488287a2b 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -37,7 +37,7 @@ namespace TAO virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual ::PortableServer::ThreadPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 8e19dc77413..457e761bf06 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -33,13 +33,13 @@ namespace TAO class In_UB_String_SArgument_T : public InArgument { public: - In_UB_String_SArgument_T (void); + In_UB_String_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const * arg (void) const; + S const * arg () const; private: S_var x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_UB_String_SArgument_T : public InoutArgument { public: - Inout_UB_String_SArgument_T (void); + Inout_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -78,13 +78,13 @@ namespace TAO class Out_UB_String_SArgument_T : public OutArgument { public: - Out_UB_String_SArgument_T (void); + Out_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -100,13 +100,13 @@ namespace TAO class Ret_UB_String_SArgument_T : public RetArgument { public: - Ret_UB_String_SArgument_T (void); + Ret_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index 52dc05020e2..b1133c9f623 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Upcall_Command::~Upcall_Command (void) +TAO::Upcall_Command::~Upcall_Command () { } diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index a353331aa48..07773260e03 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -38,7 +38,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_Var_Size_SArgument_T : public InoutArgument { public: - Inout_Var_Size_SArgument_T (void); + Inout_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Var_Size_SArgument_T : public OutArgument { public: - Out_Var_Size_SArgument_T (void); + Out_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; @@ -102,13 +102,13 @@ namespace TAO class Ret_Var_Size_SArgument_T : public RetArgument { public: - Ret_Var_Size_SArgument_T (void); + Ret_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 98848a61bc4..22902e6fafe 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -73,7 +73,7 @@ namespace TAO TAO_Stub *stub, bool block = true); - ~Profile_Transport_Resolver (void); + ~Profile_Transport_Resolver (); /// Method where the bunch of the action takes place. /** @@ -95,16 +95,16 @@ namespace TAO void profile (TAO_Profile *pfile); /// Accessor for profile. - TAO_Profile *profile (void) const; + TAO_Profile *profile () const; /// Accessor for TAO_Stub - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor for the target in use - CORBA::Object *object (void) const; + CORBA::Object *object () const; /// Accessor for the transport reserved for this invocation. - TAO_Transport *transport (void) const; + TAO_Transport *transport () const; /// See if the transport cache has an available transport and /// use that one rather than trying to connect via the connector. @@ -115,12 +115,12 @@ namespace TAO /// Accessor to indicate whether we should block while /// establishing a connection. - bool blocked_connect (void) const; + bool blocked_connect () const; //@} /// Signal to let the resolver know that the transport has been /// released back to the cache. - void transport_released (void) const; + void transport_released () const; /// This is a callback method used by the endpoint selectors to /// delegate the responsibility of reserving a transport from the @@ -139,15 +139,15 @@ namespace TAO /// This method wraps a call to the orb core to see if parallel /// connection attempts are even desired. This is controlled by /// the -ORBUseParallelConnects 1|0 commandline option. - bool use_parallel_connect (void) const; + bool use_parallel_connect () const; /// Initialize the inconsistent policy list that this object has /// cached. - void init_inconsistent_policies (void); + void init_inconsistent_policies (); - CORBA::PolicyList *inconsistent_policies (void) const; + CORBA::PolicyList *inconsistent_policies () const; - CORBA::PolicyList *steal_inconsistent_policies (void); + CORBA::PolicyList *steal_inconsistent_policies (); private: /// Helper method to access get the connection timeout from the diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index e7edfa9bc9d..3a8c76a844f 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -40,7 +40,7 @@ class TAO_Export TAO_IIOP_Protocol_Properties { public: - TAO_IIOP_Protocol_Properties (void); + TAO_IIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -55,7 +55,7 @@ class TAO_Export TAO_UIOP_Protocol_Properties { public: - TAO_UIOP_Protocol_Properties (void); + TAO_UIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -65,7 +65,7 @@ class TAO_Export TAO_SHMIOP_Protocol_Properties { public: - TAO_SHMIOP_Protocol_Properties (void); + TAO_SHMIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -81,7 +81,7 @@ class TAO_Export TAO_DIOP_Protocol_Properties { public: - TAO_DIOP_Protocol_Properties (void); + TAO_DIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -94,7 +94,7 @@ class TAO_Export TAO_SCIOP_Protocol_Properties { public: - TAO_SCIOP_Protocol_Properties (void); + TAO_SCIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -109,7 +109,7 @@ class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Protocols_Hooks (void); + virtual ~TAO_Protocols_Hooks (); /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core) = 0; @@ -152,7 +152,7 @@ public: virtual void client_protocol_properties_at_orb_level ( TAO_SCIOP_Protocol_Properties &protocol_properties) = 0; - virtual CORBA::Long get_dscp_codepoint (void) = 0; + virtual CORBA::Long get_dscp_codepoint () = 0; virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean &is_client_propagated, diff --git a/TAO/tao/Queued_Data.h b/TAO/tao/Queued_Data.h index e7654cd1f75..ee3b6969cc2 100644 --- a/TAO/tao/Queued_Data.h +++ b/TAO/tao/Queued_Data.h @@ -69,34 +69,34 @@ public: /// Consolidate this fragments chained message blocks into one. /// @return -1 if consolidation failed, eg out or memory, otherwise 0 - int consolidate (void); + int consolidate (); /// Get missing data - size_t missing_data (void) const; + size_t missing_data () const; /// Set missing data void missing_data (size_t data); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Get byte_order - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Get more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; /// Get message type - GIOP::MsgType msg_type (void) const; + GIOP::MsgType msg_type () const; /// Get next - TAO_Queued_Data *next (void) const; + TAO_Queued_Data *next () const; /// Set next void next (TAO_Queued_Data* qd); /// Get message block - ACE_Message_Block *msg_block (void) const; + ACE_Message_Block *msg_block () const; /// Set message block void msg_block (ACE_Message_Block *mb); @@ -105,7 +105,7 @@ public: void state (const TAO_GIOP_Message_State& state); /// Get the state - const TAO_GIOP_Message_State& state (void) const; + const TAO_GIOP_Message_State& state () const; private: diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 949bf0dfccd..b08cd76ed77 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -60,7 +60,7 @@ public: TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0); /// Destructor. - virtual ~TAO_Reply_Dispatcher (void); + virtual ~TAO_Reply_Dispatcher (); /** * Dispatch the reply. Return 1 on sucess, -1 on error. @@ -74,7 +74,7 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) = 0; /// Inform that the reply timed out - virtual void reply_timed_out (void) = 0; + virtual void reply_timed_out () = 0; /** * The used for the pending reply has been closed. @@ -84,12 +84,12 @@ public: * the exception, it would a matter of simply adding a boolean * argument to this function. */ - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Get the locate reply status. - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; static void intrusive_add_ref (TAO_Reply_Dispatcher*); static void intrusive_remove_ref (TAO_Reply_Dispatcher*); diff --git a/TAO/tao/Reply_Dispatcher.inl b/TAO/tao/Reply_Dispatcher.inl index 14e89c247a8..c00cb49c567 100644 --- a/TAO/tao/Reply_Dispatcher.inl +++ b/TAO/tao/Reply_Dispatcher.inl @@ -3,13 +3,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE GIOP::LocateStatusType -TAO_Reply_Dispatcher::locate_reply_status (void) const +TAO_Reply_Dispatcher::locate_reply_status () const { return this->locate_reply_status_; } ACE_INLINE GIOP::ReplyStatusType -TAO_Reply_Dispatcher::reply_status (void) const +TAO_Reply_Dispatcher::reply_status () const { return this->reply_status_; } diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 391955d8752..0637182898c 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -178,7 +178,7 @@ namespace TAO /// The destructor calls Invocation_Base::invoke_status with the /// right invoke status, which is useful for PI's. - ~Reply_Guard (void); + ~Reply_Guard (); /// Mutator to set the invocation status. void set_status (Invocation_Status s); diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl index 607b714ce43..c595d17a7c0 100644 --- a/TAO/tao/Synch_Invocation.inl +++ b/TAO/tao/Synch_Invocation.inl @@ -12,7 +12,7 @@ namespace TAO } ACE_INLINE - Reply_Guard::~Reply_Guard (void) + Reply_Guard::~Reply_Guard () { #if TAO_HAS_INTERCEPTORS == 1 this->invocation_->invoke_status (this->status_); diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index 3339d41b47a..645a612fe9c 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -47,13 +47,13 @@ class TAO_Export TAO_TSS_Resources public: /// Constructor - TAO_TSS_Resources (void); + TAO_TSS_Resources (); /// Destructor - ~TAO_TSS_Resources (void); + ~TAO_TSS_Resources (); /// Return a singleton instance of this class. - static TAO_TSS_Resources * instance (void); + static TAO_TSS_Resources * instance (); private: diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 1ae4954e843..eed52ccf519 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -55,7 +55,7 @@ public: TAO_New_Leader_Generator *new_leader_generator = 0); /// Destructor. - ~TAO_Thread_Lane_Resources (void); + ~TAO_Thread_Lane_Resources (); /// Does @a mprofile belong to us? int is_collocated (const TAO_MProfile &mprofile); @@ -65,94 +65,94 @@ public: bool ignore_address); /// Finalize resources. - void finalize (void); + void finalize (); /// Shutdown the 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 (); /// @name Accessors //@{ - TAO_Acceptor_Registry &acceptor_registry (void); + TAO_Acceptor_Registry &acceptor_registry (); /** * @note Returning a pointer helps to return 0 in case of * exceptions. */ - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the transport cache - TAO::Transport_Cache_Manager &transport_cache (void); + TAO::Transport_Cache_Manager &transport_cache (); - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * incoming CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the incoming * CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in incoming CDR streams. This allocator is global, and has locks. */ - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the buffers used in the * Transport object. This allocator has locks. */ - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * outgoing CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the outgoing * CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in the outgoing CDR streams. This allocator is global, and has * locks. */ - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the AMH response handlers * This allocator is global. */ - ACE_Allocator *amh_response_handler_allocator (void); + ACE_Allocator *amh_response_handler_allocator (); /** * Allocator is intended for allocating the AMI response handlers * This allocator is global. */ - ACE_Allocator *ami_response_handler_allocator (void); + ACE_Allocator *ami_response_handler_allocator (); //@} private: /// Checks if the acceptor registry has been created. - int has_acceptor_registry_been_created (void) const; + int has_acceptor_registry_been_created () const; /// Helper to get the resource factory in the ORB_Core - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); private: /// ORB_Core related to this thread lane. diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index a67e1f104e3..eb9f72a05f6 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -43,30 +43,30 @@ public: TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Thread_Lane_Resources_Manager (void); + virtual ~TAO_Thread_Lane_Resources_Manager (); /// Finalize resources. - virtual void finalize (void) = 0; + virtual void finalize () = 0; /// Open default resources. - virtual int open_default_resources (void) = 0; + virtual int open_default_resources () = 0; /// Shutdown reactor. - virtual void shutdown_reactor (void) = 0; + virtual void shutdown_reactor () = 0; /// Cleanup transports to wake threads up waiting on those sockets. - virtual void close_all_transports (void) = 0; + virtual void close_all_transports () = 0; /// Does @a mprofile belong to us? virtual int is_collocated (const TAO_MProfile& mprofile) = 0; /// @name Accessors // @{ - virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &lane_resources () = 0; - virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &default_lane_resources () = 0; - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); // @} private: @@ -94,7 +94,7 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory { public: /// Virtual destructor. - virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void); + virtual ~TAO_Thread_Lane_Resources_Manager_Factory (); /// Factory method. virtual TAO_Thread_Lane_Resources_Manager * diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index f97848540da..4b3c84d069d 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -321,7 +321,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - virtual ~TAO_Transport (void); + virtual ~TAO_Transport (); /// Return the protocol tag. /** @@ -329,10 +329,10 @@ public: * protocol. New protocol tags can be obtained free of charge from * the OMG, check the documents in corbafwd.h for more details. */ - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Access the ORB that owns this connection. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Get the TAO_Tranport_Mux_Strategy used by this object. /** @@ -345,7 +345,7 @@ public: * connection is more efficient and reduces the possibilities of * priority inversions. */ - TAO_Transport_Mux_Strategy *tms (void) const; + TAO_Transport_Mux_Strategy *tms () const; /// Return the TAO_Wait_Strategy used by this object. /** @@ -355,7 +355,7 @@ public: * multiple events concurrently or using the Leader/Followers * protocol. */ - TAO_Wait_Strategy *wait_strategy (void) const; + TAO_Wait_Strategy *wait_strategy () const; enum Drain_Result_Enum { @@ -388,7 +388,7 @@ public: Drain_Result handle_output (TAO::Transport::Drain_Constraints const & c); /// Get the bidirectional flag - int bidirectional_flag (void) const; + int bidirectional_flag () const; /// Set the bidirectional flag void bidirectional_flag (int flag); @@ -397,7 +397,7 @@ public: void cache_map_entry (TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry); /// Get the Cache Map entry - TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void); + TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (); /// Set and Get the identifier for this transport instance. /** @@ -405,29 +405,29 @@ public: * the <code>this</code> pointer for the instance on which * it's called. */ - size_t id (void) const; + size_t id () const; void id (size_t id); /** * Methods dealing with the role of the connection, e.g., CLIENT or SERVER. * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions. */ - TAO::Connection_Role opened_as (void) const; + TAO::Connection_Role opened_as () const; void opened_as (TAO::Connection_Role); /// Get and Set the purging order. The purging strategy uses the set /// version to set the purging order. - unsigned long purging_order (void) const; + unsigned long purging_order () const; void purging_order(unsigned long value); /// Check if there are messages pending in the queue /** * @return true if the queue is empty */ - bool queue_is_empty (void); + bool queue_is_empty (); /// Register with the reactor via the wait strategy - bool register_if_necessary (void); + bool register_if_necessary (); /// Added event handler to the handlers set. @@ -465,10 +465,10 @@ public: * thread-per-connection mode. In that case putting the connection * in the Reactor would produce unpredictable results anyway. */ - virtual int register_handler (void); + virtual int register_handler (); /// Remove the handler from the reactor. - virtual int remove_handler (void); + virtual int remove_handler (); /// Write the complete Message_Block chain to the connection. /** @@ -553,14 +553,14 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. - bool idle_after_send (void); + bool idle_after_send (); /// Request is sent and the reply is received. Idle the transport /// now. - bool idle_after_reply (void); + bool idle_after_reply (); /// Call the implementation method after obtaining the lock. - virtual void close_connection (void); + virtual void close_connection (); //@} /** @name Template methods @@ -594,18 +594,18 @@ public: * * @note The methods are not made const with a reason. */ - virtual bool post_connect_hook (void); + virtual bool post_connect_hook (); /// Memory management routines. /** * Forwards to event handler. */ - ACE_Event_Handler::Reference_Count add_reference (void); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count remove_reference (); /// Return the messaging object that is used to format the data that /// needs to be sent. - TAO_GIOP_Message_Base * messaging_object (void); + TAO_GIOP_Message_Base * messaging_object (); /** @name Template methods * @@ -633,36 +633,36 @@ public: * * @todo This method has to be renamed to event_handler() */ - virtual ACE_Event_Handler * event_handler_i (void) = 0; + virtual ACE_Event_Handler * event_handler_i () = 0; /// Is this transport really connected - bool is_connected (void) const; + bool is_connected () const; /// Was a connection seen as closed during a read - bool connection_closed_on_read (void) const; + bool connection_closed_on_read () const; /// Perform all the actions when this transport get opened bool post_open (size_t id); /// do what needs to be done when closing the transport - void pre_close (void); + void pre_close (); /// Get the connection handler for this transport - TAO_Connection_Handler * connection_handler (void); + TAO_Connection_Handler * connection_handler (); /// Accessor for the output CDR stream - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Accessor for synchronizing Transport OutputCDR access - TAO_SYNCH_MUTEX &output_cdr_lock (void); + TAO_SYNCH_MUTEX &output_cdr_lock (); /// Can the transport be purged? - bool can_be_purged (void); + bool can_be_purged (); virtual void set_bidir_context_info (TAO_Operation_Details &opdetails); protected: - virtual TAO_Connection_Handler * connection_handler_i (void) = 0; + virtual TAO_Connection_Handler * connection_handler_i () = 0; public: /// This is a request for the transport object to write a @@ -828,13 +828,13 @@ public: TAO::Transport::Drain_Constraints const & dc); /// Cache management - int purge_entry (void); + int purge_entry (); /// Cache management - int make_idle (void); + int make_idle (); /// Cache management - int update_transport (void); + int update_transport (); /// The timeout callback, invoked when any of the timers related to /// this transport expire. @@ -856,16 +856,16 @@ public: int handle_timeout (const ACE_Time_Value ¤t_time, const void* act); /// Accessor to recv_buffer_size_ - size_t recv_buffer_size (void) const; + size_t recv_buffer_size () const; /// Accessor to sent_byte_count_ - size_t sent_byte_count (void) const; + size_t sent_byte_count () const; /// CodeSet Negotiation - Get the char codeset translator factory - TAO_Codeset_Translator_Base *char_translator (void) const; + TAO_Codeset_Translator_Base *char_translator () const; /// CodeSet Negotiation - Get the wchar codeset translator factory - TAO_Codeset_Translator_Base *wchar_translator (void) const; + TAO_Codeset_Translator_Base *wchar_translator () const; /// CodeSet negotiation - Set the char codeset translator factory void char_translator (TAO_Codeset_Translator_Base *); @@ -893,14 +893,14 @@ public: /// Notify all the components inside a Transport when the underlying /// connection is closed. - void send_connection_closed_notifications (void); + void send_connection_closed_notifications (); /// Transport statistics - TAO::Transport::Stats* stats (void) const; + TAO::Transport::Stats* stats () const; private: /// Helper method that returns the Transport Cache Manager. - TAO::Transport_Cache_Manager &transport_cache_manager (void); + TAO::Transport_Cache_Manager &transport_cache_manager (); /// Send some of the data in the queue. /** @@ -919,7 +919,7 @@ private: * * @return true if the queue is empty */ - bool queue_is_empty_i (void) const; + bool queue_is_empty_i () const; /// A helper routine used in drain_queue_i() Drain_Result drain_queue_helper (int &iovcnt, iovec iov[], @@ -936,10 +936,10 @@ private: friend class TAO_Thread_Per_Connection_Handler; /// Schedule handle_output() callbacks - int schedule_output_i (void); + int schedule_output_i (); /// Cancel handle_output() callbacks - int cancel_output_i (void); + int cancel_output_i (); /// Cleanup the queue. /** @@ -979,11 +979,11 @@ private: ACE_Time_Value *max_wait_time); /// Check if the flush timer is still pending - int flush_timer_pending (void) const; + int flush_timer_pending () const; /// The flush timer expired or was explicitly cancelled, mark it as /// not pending - void reset_flush_timer (void); + void reset_flush_timer (); /// Print out error messages if the event handler is not valid void report_invalid_event_handler (const char *caller); @@ -1026,25 +1026,25 @@ private: * This call prepares a new handler for the notify call and sends a * notify () call to the reactor. */ - int notify_reactor (void); + int notify_reactor (); protected: /* * Same as notify_reactor above but does NOT first check for a * registered TAO_Wait_Strategy. */ - int notify_reactor_now (void); + int notify_reactor_now (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &)) ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &)) /// Assume the lock is held - void send_connection_closed_notifications_i (void); + void send_connection_closed_notifications_i (); /// Allocate a partial message block and store it in our /// partial_message_ data member. - void allocate_partial_message_block (void); + void allocate_partial_message_block (); /** * Return true if blocking I/O should be used for sending synchronous @@ -1251,15 +1251,15 @@ namespace TAO virtual ~Stats (); void messages_sent (size_t message_length); - CORBA::LongLong messages_sent (void) const; - CORBA::LongLong bytes_sent (void) const; + CORBA::LongLong messages_sent () const; + CORBA::LongLong bytes_sent () const; void messages_received (size_t message_length); - CORBA::LongLong messages_received (void) const; - CORBA::LongLong bytes_received (void) const; + CORBA::LongLong messages_received () const; + CORBA::LongLong bytes_received () const; void opened_since (const ACE_Time_Value& tv); - const ACE_Time_Value& opened_since (void) const; + const ACE_Time_Value& opened_since () const; private: /// Mutex guarding the internal state of the statistics diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index 1d8ba921d3f..87d660aa4c9 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -76,10 +76,10 @@ public: TAO_Acceptor (CORBA::ULong tag); /// Destructor - virtual ~TAO_Acceptor (void); + virtual ~TAO_Acceptor (); /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Set the amount of time to delay accepting new connections in the /// event that we encounter an error that may be transient. @@ -104,7 +104,7 @@ public: const char *options = 0) = 0; /// Closes the acceptor - virtual int close (void) = 0; + virtual int close () = 0; /** * Create the corresponding profile for this endpoint. @@ -125,7 +125,7 @@ public: * is used for determining how many profiles will be generated * for this acceptor. */ - virtual CORBA::ULong endpoint_count (void) = 0; + virtual CORBA::ULong endpoint_count () = 0; /** * This method fetches the @a key from the @a profile. Protocols that @@ -173,7 +173,7 @@ public: { } - virtual int handle_accept_error (void) + virtual int handle_accept_error () { return this->acceptor_->handle_accept_error (this); } diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index 868bd41cd97..ab7a56adf36 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -73,7 +73,7 @@ namespace TAO } template <typename TT, typename TRDT, typename PSTRAT> - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T () { delete this->cache_lock_; this->cache_lock_ = 0; @@ -561,7 +561,7 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> int - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge () { typedef ACE_Unbounded_Set<transport_type*> transport_set_type; transport_set_type transports_to_be_closed; diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index a61759c9398..7cc7c188264 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -101,7 +101,7 @@ namespace TAO const char *orbid); /// Destructor - ~Transport_Cache_Manager_T (void); + ~Transport_Cache_Manager_T (); /// Add the transport to the cache. /** @@ -122,7 +122,7 @@ namespace TAO size_t & busy_count); /// Remove entries from the cache depending upon the strategy. - int purge (void); + int purge (); /// Purge the entry from the Cache Map int purge_entry (HASH_MAP_ENTRY *& entry); @@ -158,13 +158,13 @@ namespace TAO bool blockable_client_transports (Connection_Handler_Set &handlers); /// Return the current size of the cache. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the cache. - size_t total_size (void) const; + size_t total_size () const; /// Return the underlying cache map - HASH_MAP &map (void); + HASH_MAP &map (); private: /// Lookup entry<key,value> in the cache. Grabs the lock and calls the diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 9c4e8c8ef0c..65ceaddfd57 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -137,21 +137,21 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size () const { return this->cache_map_.current_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size () const { return this->cache_map_.total_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE typename Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::HASH_MAP & - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map () { return this->cache_map_; } diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 092ffff1cec..301f9bc496c 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -41,11 +41,11 @@ public: TAO_Transport_Mux_Strategy (TAO_Transport *transport); /// Base class destructor. - virtual ~TAO_Transport_Mux_Strategy (void); + virtual ~TAO_Transport_Mux_Strategy (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void) = 0; + virtual CORBA::ULong request_id () = 0; /// Bind the dispatcher with the request id. Commonalities in the /// derived class implementations is kept here. @@ -73,19 +73,19 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. The return value indicates whether idling was /// successful or not. - virtual bool idle_after_send (void) = 0; + virtual bool idle_after_send () = 0; /// Request is sent and the reply is received. Idle the transport /// now. The return value indicates whether idling was successful or /// not. - virtual bool idle_after_reply (void) = 0; + virtual bool idle_after_reply () = 0; /// The transport object has closed the connection, inform all Reply /// dispatchers and waiting strategies. - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Do we have a request pending - virtual bool has_request (void) = 0; + virtual bool has_request () = 0; protected: /// Cache the transport reference. diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h index b145ba57988..45a8dda4a6c 100644 --- a/TAO/tao/Transport_Queueing_Strategies.h +++ b/TAO/tao/Transport_Queueing_Strategies.h @@ -48,7 +48,7 @@ namespace TAO { public: /// Destructor - virtual ~Transport_Queueing_Strategy (void); + virtual ~Transport_Queueing_Strategy (); /// Return true if a message must be queued virtual bool must_queue (bool queue_empty) const = 0; diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 25a68b6e00a..490ee436614 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -147,12 +147,12 @@ namespace CORBA typedef ACE_Vector < ACE_CString > Repository_Id_List; - virtual CORBA::ValueBase* _copy_value (void) TAO_local_COPY_VALUE_IS_PURE; + virtual CORBA::ValueBase* _copy_value () TAO_local_COPY_VALUE_IS_PURE; // Reference counting. - virtual void _add_ref (void) = 0; - virtual void _remove_ref (void) = 0; - virtual CORBA::ULong _refcount_value (void) = 0; + virtual void _add_ref () = 0; + virtual void _remove_ref () = 0; + virtual CORBA::ULong _refcount_value () = 0; // dynamic casting static CORBA::ValueBase* _downcast (CORBA::ValueBase *); @@ -161,10 +161,10 @@ namespace CORBA /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void *); - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Return the repository id of this valuetype. - virtual const char * _tao_obv_repository_id (void) const = 0; + virtual const char * _tao_obv_repository_id () const = 0; /// Give the list of the RepositoryIds in the valuetype "truncatable" /// inheritance hierarchy. List the id of this valuetype as first @@ -238,9 +238,9 @@ namespace CORBA virtual void truncation_hook (); protected: - ValueBase (void); + ValueBase (); ValueBase (const ValueBase&); - virtual ~ValueBase (void); + virtual ~ValueBase (); /// This flag is set to be true when the valuetype defined /// in the idl has the truncatable parent. @@ -327,18 +327,18 @@ namespace CORBA : public virtual ValueBase { public: - virtual void _add_ref (void); - virtual void _remove_ref (void); - virtual CORBA::ULong _refcount_value (void); + virtual void _add_ref (); + virtual void _remove_ref (); + virtual CORBA::ULong _refcount_value (); /// The _tao variants are inline for fast access from T_var /// (if valuetype T is compiled with optimization for that.) %! (todo) - void _tao_add_ref (void); - void _tao_remove_ref (void); - CORBA::ULong _tao_refcount_value (void) const; + void _tao_add_ref (); + void _tao_remove_ref (); + CORBA::ULong _tao_refcount_value () const; protected: - DefaultValueRefCountBase (void); + DefaultValueRefCountBase (); DefaultValueRefCountBase (const DefaultValueRefCountBase&); virtual ~DefaultValueRefCountBase (); diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 6003f803086..ba9596b0bdb 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -54,21 +54,21 @@ namespace CORBA class TAO_Valuetype_Export ValueFactoryBase { public: - ValueFactoryBase (void); - virtual ~ValueFactoryBase (void); + ValueFactoryBase (); + virtual ~ValueFactoryBase (); // non-virtual is non-standard - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); // private: %! /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T) /// (see at definition below) - virtual CORBA::ValueBase * create_for_unmarshal (void) = 0; + virtual CORBA::ValueBase * create_for_unmarshal () = 0; /// Not pure virtual because this will be overridden only by valuetypes /// that support an abstract interface. - virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void); + virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (); private: /// Reference counter. diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 07e3818c5f9..0a5e67ec072 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -42,19 +42,19 @@ template <typename T> class TAO_Value_Var_T : private TAO_Base_var { public: - TAO_Value_Var_T (void); + TAO_Value_Var_T (); TAO_Value_Var_T (T *); TAO_Value_Var_T (const TAO_Value_Var_T<T> &); // (TAO extension) TAO_Value_Var_T (const T *); - ~TAO_Value_Var_T (void); + ~TAO_Value_Var_T (); TAO_Value_Var_T &operator= (T *); TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; operator const T * () const; operator T *& (); @@ -65,13 +65,13 @@ public: typedef T * _retn_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); // (TAO extension) - T * ptr (void) const; + T * ptr () const; private: @@ -100,9 +100,9 @@ public: TAO_Value_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); + T *& ptr (); - T * operator-> (void); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index d2c013cf17d..0b8ab48fe36 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -39,12 +39,12 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl : public TAO_Valuetype_Adapter_Factory { public: - virtual ~TAO_Valuetype_Adapter_Factory_Impl (void); + virtual ~TAO_Valuetype_Adapter_Factory_Impl (); - virtual TAO_Valuetype_Adapter * create (void); + virtual TAO_Valuetype_Adapter * create (); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static const int TAO_Requires_ValueType_Initializer = diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h index aa3cd1e5b91..3d90b5b5804 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.h +++ b/TAO/tao/Valuetype_Adapter_Factory.h @@ -39,9 +39,9 @@ class TAO_Export TAO_Valuetype_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter_Factory (void); + virtual ~TAO_Valuetype_Adapter_Factory (); - virtual TAO_Valuetype_Adapter * create (void) = 0; + virtual TAO_Valuetype_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 3c495b7da3d..34fdab5d184 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -46,7 +46,7 @@ public: explicit TAO_Wait_Strategy (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Wait_Strategy (void); + virtual ~TAO_Wait_Strategy (); /** * The user is going to send a request, prepare any internal @@ -66,11 +66,11 @@ public: /// Register the handler needs with the reactor provided that it makes /// sense for the strategy. - virtual int register_handler (void) = 0; + virtual int register_handler () = 0; /// Returns a value to indicate whether the transport needs to set /// the socket on which it is waiting to non-blocking mode or not. - virtual bool non_blocking (void) const = 0; + virtual bool non_blocking () const = 0; /// Flag that indicates whether we can process requests while /// waiting for the reply. @@ -80,7 +80,7 @@ public: * Wait_On_LF_No_Upcall does not allow the client threads to process * requests while waiting for the reply. */ - virtual bool can_process_upcalls (void) const = 0; + virtual bool can_process_upcalls () const = 0; /// Method to support deffering an upcall event till later in /// cases where can_process_upcalls() returns false. @@ -91,7 +91,7 @@ public: virtual int defer_upcall (ACE_Event_Handler*); /// Get method for the flag - bool is_registered (void) const; + bool is_registered () const; /// Set method for the flag void is_registered (bool flag); |