diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-11 17:49:39 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2020-12-11 17:49:39 -0600 |
| commit | 6a9d97cda39f4bbe99186308603cdee8c6cd9fc2 (patch) | |
| tree | adde0033325663f51f06c87ba5f166230f91e59f | |
| parent | 1ebedbe8694a45210128076453913a146c037176 (diff) | |
| parent | 368d8bff6c4b9889eb67d6337b3ebfaf5a6bca2c (diff) | |
| download | ATCD-6a9d97cda39f4bbe99186308603cdee8c6cd9fc2.tar.gz | |
Merge remote-tracking branch 'upstream/master' into igtd/android-ndk-compile
1972 files changed, 11368 insertions, 11810 deletions
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index d10dc6710d1..b705e092d95 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -55,31 +55,31 @@ namespace ACE { // = ACE version information. /// e.g., the "6" in ACE 6.3.4 - extern ACE_Export u_int major_version (void); + extern ACE_Export u_int major_version (); /// e.g., the "3" in ACE 6.3.4 - extern ACE_Export u_int minor_version (void); + extern ACE_Export u_int minor_version (); /// e.g., the "4" in ACE 6.3.4 /// Returns 0 for "stable" (non-micro) releases. - extern ACE_Export u_int micro_version (void); + extern ACE_Export u_int micro_version (); /// e.g., the "4" in ACE 6.3.4 /// Returns 0 for "stable" (non-micro) releases. - extern ACE_Export u_int beta_version (void); + extern ACE_Export u_int beta_version (); // = C++ compiler version information. /// E.g., the "SunPro C++" in SunPro C++ 4.32.0 - extern ACE_Export const ACE_TCHAR * compiler_name (void); + extern ACE_Export const ACE_TCHAR * compiler_name (); /// E.g., the "4" in SunPro C++ 4.32.0 - extern ACE_Export u_int compiler_major_version (void); + extern ACE_Export u_int compiler_major_version (); /// E.g., the "32" in SunPro C++ 4.32.0 - extern ACE_Export u_int compiler_minor_version (void); + extern ACE_Export u_int compiler_minor_version (); /// E.g., the "0" in SunPro C++ 4.32.0 - extern ACE_Export u_int compiler_beta_version (void); + extern ACE_Export u_int compiler_beta_version (); /// Check if error indicates the process being out of handles (file /// descriptors). @@ -388,7 +388,7 @@ namespace ACE * this process. This maximum may be extended using * @c ACE::set_handle_limit. */ - extern ACE_Export int max_handles (void); + extern ACE_Export int max_handles (); // = String functions /** @@ -680,7 +680,7 @@ namespace ACE ACE_NAMESPACE_INLINE_FUNCTION u_char hex2byte (ACE_TCHAR c); // = Set/get the debug level. - extern ACE_Export bool debug (void); + extern ACE_Export bool debug (); extern ACE_Export void debug (bool onoff); /// Wrapper facade for @c select that uses @c ACE_Handle_Sets. diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp index 18790043ef4..d7af2f8457c 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -18,7 +18,7 @@ ACE_ALLOC_HOOK_DEFINE_Tt (ACE_ARGV_T) template <typename CHAR_TYPE> void -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const +ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump"); @@ -32,7 +32,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const template <typename CHAR_TYPE> void -ACE_ARGV_T<CHAR_TYPE>::dump (void) const +ACE_ARGV_T<CHAR_TYPE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_ARGV_T::dump"); @@ -61,7 +61,7 @@ ACE_ARGV_T<CHAR_TYPE>::dump (void) const template <typename CHAR_TYPE> int -ACE_ARGV_T<CHAR_TYPE>::string_to_argv (void) +ACE_ARGV_T<CHAR_TYPE>::string_to_argv () { ACE_TRACE ("ACE_ARGV_T::string_to_argv"); @@ -303,7 +303,7 @@ ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args) // Free up argv_ and buf_ template <typename CHAR_TYPE> -ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T (void) +ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T () { ACE_TRACE ("ACE_ARGV_T::~ACE_ARGV_T"); @@ -331,7 +331,7 @@ ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T (void) template <typename CHAR_TYPE> int -ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue (void) +ACE_ARGV_T<CHAR_TYPE>::create_buf_from_queue () { ACE_TRACE ("ACE_ARGV_T::create_buf_from_queue"); diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index 231056ee37b..30513946040 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -35,7 +35,7 @@ class ACE_ARGV_Queue_Entry_T { public: /// Initialize a ACE_ARGV_Queue_Entry_T. - ACE_ARGV_Queue_Entry_T (void); + ACE_ARGV_Queue_Entry_T (); /** * Initialize a ACE_ARGV_Queue_Entry_T. @@ -61,10 +61,10 @@ public: /// We need this destructor to keep some compilers from complaining. /// It's just a no-op, however. - ~ACE_ARGV_Queue_Entry_T (void); + ~ACE_ARGV_Queue_Entry_T (); /// Dump the state of this object. - void dump (void) const; + void dump () const; // Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -194,7 +194,7 @@ public: explicit ACE_ARGV_T (bool substitute_env_args = true); /// Destructor. - ~ACE_ARGV_T (void); + ~ACE_ARGV_T (); /** @name Accessor methods * @@ -216,22 +216,22 @@ public: * maintained internally to this class. Do not change or delete either the * pointers or the memory to which they refer. */ - CHAR_TYPE **argv (void); + CHAR_TYPE **argv (); /// Returns the current number of arguments. - int argc (void) const; + int argc () const; /** * Returns a single string form of the current arguments. The returned * pointer refers to memory maintained internally to this class. Do not * change or delete it. */ - const CHAR_TYPE *buf (void); + const CHAR_TYPE *buf (); //@} /// Dump the state of this object. - void dump (void) const; + void dump () const; // Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -276,17 +276,16 @@ public: int add (CHAR_TYPE *argv[], bool quote_args = false); private: - /// Copy constructor not implemented. - ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&)) - - /// Assignment operator not implemented. - ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&)) + ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&) = delete; + ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&) = delete; + ACE_ARGV_T (ACE_ARGV_T<CHAR_TYPE>&&) = delete; + ACE_ARGV_T operator= (ACE_ARGV_T<CHAR_TYPE>&&) = delete; /// Creates buf_ from the queue of added args, deletes previous buf_. - int create_buf_from_queue (void); + int create_buf_from_queue (); /// Converts buf_ into the CHAR_TYPE *argv[] format. - int string_to_argv (void); + int string_to_argv (); /// Replace args with environment variable values? bool substitute_env_args_; diff --git a/ACE/ace/ARGV.inl b/ACE/ace/ARGV.inl index cd538e9ec5c..43dfa8cf770 100644 --- a/ACE/ace/ARGV.inl +++ b/ACE/ace/ARGV.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (void) +ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T () : arg_(0), quote_arg_(false) { @@ -30,7 +30,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_ } template <typename CHAR_TYPE> ACE_INLINE -ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void) +ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T () { // No-op just to keep some compilers happy... } @@ -38,7 +38,7 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::~ACE_ARGV_Queue_Entry_T (void) // Return the number of args template <typename CHAR_TYPE> ACE_INLINE int -ACE_ARGV_T<CHAR_TYPE>::argc (void) const +ACE_ARGV_T<CHAR_TYPE>::argc () const { ACE_TRACE ("ACE_ARGV_T::argc"); // Try to create the argv_ if it isn't there @@ -51,7 +51,7 @@ ACE_ARGV_T<CHAR_TYPE>::argc (void) const // Return the arguments in a space-separated string template <typename CHAR_TYPE> ACE_INLINE const CHAR_TYPE * -ACE_ARGV_T<CHAR_TYPE>::buf (void) +ACE_ARGV_T<CHAR_TYPE>::buf () { ACE_TRACE ("ACE_ARGV_T::buf"); @@ -65,7 +65,7 @@ ACE_ARGV_T<CHAR_TYPE>::buf (void) template <typename CHAR_TYPE> ACE_INLINE CHAR_TYPE ** -ACE_ARGV_T<CHAR_TYPE>::argv (void) +ACE_ARGV_T<CHAR_TYPE>::argv () { ACE_TRACE ("ACE_ARGV_T::argv"); 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/Activation_Queue.h b/ACE/ace/Activation_Queue.h index 2dbc37ab001..c01f0e9f64a 100644 --- a/ACE/ace/Activation_Queue.h +++ b/ACE/ace/Activation_Queue.h @@ -153,8 +153,10 @@ private: /// Allocation strategy of the message blocks. ACE_Allocator *data_block_allocator_; - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &)) + void operator= (const ACE_Activation_Queue &) = delete; + ACE_Activation_Queue (const ACE_Activation_Queue &) = delete; + void operator= (ACE_Activation_Queue &&) = delete; + ACE_Activation_Queue (ACE_Activation_Queue &&) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Active_Map_Manager.h b/ACE/ace/Active_Map_Manager.h index 3bf29130bf6..109d690dadb 100644 --- a/ACE/ace/Active_Map_Manager.h +++ b/ACE/ace/Active_Map_Manager.h @@ -36,7 +36,7 @@ class ACE_Export ACE_Active_Map_Manager_Key { public: /// Default constructor. - ACE_Active_Map_Manager_Key (void); + ACE_Active_Map_Manager_Key (); /** * Constructor given the @a slot_index and @a slot_generation number. @@ -47,19 +47,19 @@ public: ACE_UINT32 slot_generation); /// Get the slot_index. - ACE_UINT32 slot_index (void) const; + ACE_UINT32 slot_index () const; /// Set the slot_index. void slot_index (ACE_UINT32 i); /// Get the slot_generation number. - ACE_UINT32 slot_generation (void) const; + ACE_UINT32 slot_generation () const; /// Set the slot_generation number. void slot_generation (ACE_UINT32 g); /// Size required to store information about active key. - static size_t size (void); + static size_t size (); /// Recover state of active key from @a data. User must make sure /// that @a data encoded using the encode() method. @@ -77,7 +77,7 @@ public: // friends, they are not. /// Increment the slot_generation number. - void increment_slot_generation_count (void); + void increment_slot_generation_count (); private: /** diff --git a/ACE/ace/Active_Map_Manager.inl b/ACE/ace/Active_Map_Manager.inl index 2fc8c13e5d9..6abb8c62079 100644 --- a/ACE/ace/Active_Map_Manager.inl +++ b/ACE/ace/Active_Map_Manager.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void) +ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key () { // If you change ~0, please change ACE_Map_Manager::free_list_id() // accordingly. @@ -21,13 +21,13 @@ ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index, } ACE_INLINE ACE_UINT32 -ACE_Active_Map_Manager_Key::slot_index (void) const +ACE_Active_Map_Manager_Key::slot_index () const { return this->key_data_.slot_index_; } ACE_INLINE ACE_UINT32 -ACE_Active_Map_Manager_Key::slot_generation (void) const +ACE_Active_Map_Manager_Key::slot_generation () const { return this->key_data_.slot_generation_; } @@ -59,14 +59,14 @@ ACE_Active_Map_Manager_Key::slot_generation (ACE_UINT32 g) } ACE_INLINE void -ACE_Active_Map_Manager_Key::increment_slot_generation_count (void) +ACE_Active_Map_Manager_Key::increment_slot_generation_count () { ++this->key_data_.slot_generation_; } /* static */ ACE_INLINE size_t -ACE_Active_Map_Manager_Key::size (void) +ACE_Active_Map_Manager_Key::size () { return sizeof (ACE_UINT32) + sizeof (ACE_UINT32); } diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index 472ea71911b..ee4e7783e8d 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -58,7 +58,7 @@ public: /// Close down a Active_Map_Manager and release dynamically /// allocated resources. - ~ACE_Active_Map_Manager (void); + ~ACE_Active_Map_Manager (); /// Initialize a Active_Map_Manager with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, @@ -66,7 +66,7 @@ public: /// Close down a Active_Map_Manager and release dynamically /// allocated resources. - int close (void); + int close (); /// Add @a value to the map, and the corresponding key produced by the /// Active_Map_Manager is returned through @a key. @@ -153,26 +153,26 @@ public: T *&internal_value); /// Return the current size of the map. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the map. - size_t total_size (void) const; + size_t total_size () const; /// Returns a key that cannot be found in the map. - static const ACE_Active_Map_Manager_Key npos (void); + static const ACE_Active_Map_Manager_Key npos (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL styled iterator factory functions. /// Return forward iterator. - ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> begin (void); - ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> end (void); + ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> begin (); + ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> end (); /// Return reverse iterator. - ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rbegin (void); - ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rend (void); + ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rbegin (); + ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> rend (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Active_Map_Manager_T.inl b/ACE/ace/Active_Map_Manager_T.inl index c8a6caf9b52..5e7cec0d0ff 100644 --- a/ACE/ace/Active_Map_Manager_T.inl +++ b/ACE/ace/Active_Map_Manager_T.inl @@ -237,7 +237,7 @@ ACE_Active_Map_Manager<T>::ACE_Active_Map_Manager (size_t size, } template <class T> ACE_INLINE -ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager (void) +ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager () { } @@ -249,32 +249,32 @@ ACE_Active_Map_Manager<T>::open (size_t length, } template <class T> ACE_INLINE int -ACE_Active_Map_Manager<T>::close (void) +ACE_Active_Map_Manager<T>::close () { return ACE_AMM_BASE::close (); } template <class T> ACE_INLINE size_t -ACE_Active_Map_Manager<T>::current_size (void) const +ACE_Active_Map_Manager<T>::current_size () const { return ACE_AMM_BASE::current_size (); } template <class T> ACE_INLINE size_t -ACE_Active_Map_Manager<T>::total_size (void) const +ACE_Active_Map_Manager<T>::total_size () const { return ACE_AMM_BASE::total_size (); } /* static */ template <class T> ACE_INLINE const ACE_Active_Map_Manager_Key -ACE_Active_Map_Manager<T>::npos (void) +ACE_Active_Map_Manager<T>::npos () { return ACE_Active_Map_Manager_Key (~0, ~0); } template <class T> ACE_INLINE void -ACE_Active_Map_Manager<T>::dump (void) const +ACE_Active_Map_Manager<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_AMM_BASE::dump (); @@ -282,25 +282,25 @@ ACE_Active_Map_Manager<T>::dump (void) const } template <class T> ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> -ACE_Active_Map_Manager<T>::begin (void) +ACE_Active_Map_Manager<T>::begin () { return ACE_AMM_BASE::begin (); } template <class T> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> -ACE_Active_Map_Manager<T>::end (void) +ACE_Active_Map_Manager<T>::end () { return ACE_AMM_BASE::end (); } template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> -ACE_Active_Map_Manager<T>::rbegin (void) +ACE_Active_Map_Manager<T>::rbegin () { return ACE_AMM_BASE::rbegin (); } template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> -ACE_Active_Map_Manager<T>::rend (void) +ACE_Active_Map_Manager<T>::rend () { return ACE_AMM_BASE::rend (); } diff --git a/ACE/ace/Argv_Type_Converter.h b/ACE/ace/Argv_Type_Converter.h index c2a73f2c1eb..f752633de56 100644 --- a/ACE/ace/Argv_Type_Converter.h +++ b/ACE/ace/Argv_Type_Converter.h @@ -43,16 +43,16 @@ public: ACE_Argv_Type_Converter (int &argc, wchar_t** argv); #endif // ACE_USES_WCHAR - ~ACE_Argv_Type_Converter (void); + ~ACE_Argv_Type_Converter (); /// Returns the pointer of converted command line. - ACE_TCHAR** get_TCHAR_argv (void); + ACE_TCHAR** get_TCHAR_argv (); /// Returns the pointer of ASCII (char) command line. - char** get_ASCII_argv (void); + char** get_ASCII_argv (); /// Returns the number of sub parameters (argc). - int& get_argc (void); + int& get_argc (); private: /// Copy Constructor should not be used. diff --git a/ACE/ace/Argv_Type_Converter.inl b/ACE/ace/Argv_Type_Converter.inl index 8c7bc89ca89..c79688cd723 100644 --- a/ACE/ace/Argv_Type_Converter.inl +++ b/ACE/ace/Argv_Type_Converter.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_TCHAR** -ACE_Argv_Type_Converter::get_TCHAR_argv (void) +ACE_Argv_Type_Converter::get_TCHAR_argv () { #if defined (ACE_USES_WCHAR) if (this->char_passed_) @@ -18,7 +18,7 @@ ACE_Argv_Type_Converter::get_TCHAR_argv (void) } ACE_INLINE char** -ACE_Argv_Type_Converter::get_ASCII_argv (void) +ACE_Argv_Type_Converter::get_ASCII_argv () { #if defined (ACE_USES_WCHAR) if (this->wchar_passed_) @@ -33,7 +33,7 @@ ACE_Argv_Type_Converter::get_ASCII_argv (void) } ACE_INLINE int& -ACE_Argv_Type_Converter::get_argc (void) +ACE_Argv_Type_Converter::get_argc () { return this->saved_argc_; } diff --git a/ACE/ace/Array_Base.h b/ACE/ace/Array_Base.h index 15ffe77c361..d5ed71e47df 100644 --- a/ACE/ace/Array_Base.h +++ b/ACE/ace/Array_Base.h @@ -85,7 +85,7 @@ public: void operator= (ACE_Array_Base<T> const & s); /// Clean up the array (e.g., delete dynamically allocated memory). - ~ACE_Array_Base (void); + ~ACE_Array_Base (); // = Set/get methods. @@ -110,7 +110,7 @@ public: int get (T & item, size_type slot) const; /// Returns the <cur_size_> of the array. - size_type size (void) const; + size_type size () const; /** * Changes the size of the array to match @a new_size. @@ -120,7 +120,7 @@ public: int size (size_type new_size); /// Returns the <max_size_> of the array. - size_type max_size (void) const; + size_type max_size () const; /** * Changes the size of the array to match @a new_size. @@ -136,10 +136,10 @@ public: * Forward iterator accessors. */ //@{ - iterator begin (void); - iterator end (void); - const_iterator begin (void) const; - const_iterator end (void) const; + iterator begin (); + iterator end (); + const_iterator begin () const; + const_iterator end () const; //@} /** @@ -148,10 +148,10 @@ public: * Reverse iterator accessors. */ //@{ - reverse_iterator rbegin (void); - reverse_iterator rend (void); - const_reverse_iterator rbegin (void) const; - const_reverse_iterator rend (void) const; + reverse_iterator rbegin (); + reverse_iterator rend (); + const_reverse_iterator rbegin () const; + const_reverse_iterator rend () const; //@} /// Swap the contents of this array with the given @a array in @@ -212,13 +212,13 @@ public: /// Move forward by one element in the Array. Returns 0 when all the /// items in the Array 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/Array_Base.inl b/ACE/ace/Array_Base.inl index ccd367f2d98..5a5cef338ff 100644 --- a/ACE/ace/Array_Base.inl +++ b/ACE/ace/Array_Base.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Clean up the array (e.g., delete dynamically allocated memory). template <class T> ACE_INLINE -ACE_Array_Base<T>::~ACE_Array_Base (void) +ACE_Array_Base<T>::~ACE_Array_Base () { ACE_DES_ARRAY_FREE (this->array_, this->max_size_, @@ -13,68 +13,68 @@ ACE_Array_Base<T>::~ACE_Array_Base (void) template <class T> ACE_INLINE typename ACE_Array_Base<T>::iterator -ACE_Array_Base<T>::begin (void) +ACE_Array_Base<T>::begin () { return this->array_; } template <class T> ACE_INLINE typename ACE_Array_Base<T>::iterator -ACE_Array_Base<T>::end (void) +ACE_Array_Base<T>::end () { return this->array_ + this->cur_size_; } template <class T> ACE_INLINE typename ACE_Array_Base<T>::const_iterator -ACE_Array_Base<T>::begin (void) const +ACE_Array_Base<T>::begin () const { return this->array_; } template <class T> ACE_INLINE typename ACE_Array_Base<T>::const_iterator -ACE_Array_Base<T>::end (void) const +ACE_Array_Base<T>::end () const { return this->array_ + this->cur_size_; } template <class T> ACE_INLINE typename ACE_Array_Base<T>::reverse_iterator -ACE_Array_Base<T>::rbegin (void) +ACE_Array_Base<T>::rbegin () { return reverse_iterator (this->end ()); } template <class T> ACE_INLINE typename ACE_Array_Base<T>::reverse_iterator -ACE_Array_Base<T>::rend (void) +ACE_Array_Base<T>::rend () { return reverse_iterator (this->begin ()); } template <class T> ACE_INLINE typename ACE_Array_Base<T>::const_reverse_iterator -ACE_Array_Base<T>::rbegin (void) const +ACE_Array_Base<T>::rbegin () const { return const_reverse_iterator (this->end ()); } template <class T> ACE_INLINE typename ACE_Array_Base<T>::const_reverse_iterator -ACE_Array_Base<T>::rend (void) const +ACE_Array_Base<T>::rend () const { return const_reverse_iterator (this->begin ()); } template <class T> ACE_INLINE typename ACE_Array_Base<T>::size_type -ACE_Array_Base<T>::size (void) const +ACE_Array_Base<T>::size () const { return this->cur_size_; } template <class T> ACE_INLINE typename ACE_Array_Base<T>::size_type -ACE_Array_Base<T>::max_size (void) const +ACE_Array_Base<T>::max_size () const { return this->max_size_; } @@ -100,7 +100,7 @@ ACE_Array_Base<T>::operator[] (typename ACE_Array_Base<T>::size_type index) cons // **************************************************************** template <class T> ACE_INLINE void -ACE_Array_Iterator<T>::dump (void) const +ACE_Array_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Array_Iterator<T>::dump"); @@ -116,7 +116,7 @@ ACE_Array_Iterator<T>::ACE_Array_Iterator (ACE_Array_Base<T> &a) } template <class T> ACE_INLINE int -ACE_Array_Iterator<T>::advance (void) +ACE_Array_Iterator<T>::advance () { // ACE_TRACE ("ACE_Array_Iterator<T>::advance"); @@ -133,7 +133,7 @@ ACE_Array_Iterator<T>::advance (void) } template <class T> ACE_INLINE int -ACE_Array_Iterator<T>::done (void) const +ACE_Array_Iterator<T>::done () const { ACE_TRACE ("ACE_Array_Iterator<T>::done"); diff --git a/ACE/ace/Array_Map.cpp b/ACE/ace/Array_Map.cpp index 4917c51e42f..9a62b7275bf 100644 --- a/ACE/ace/Array_Map.cpp +++ b/ACE/ace/Array_Map.cpp @@ -41,7 +41,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::ACE_Array_Map ( } template<typename Key, typename Value, class EqualTo, class Alloc> -ACE_Array_Map<Key, Value, EqualTo, Alloc>::~ACE_Array_Map (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::~ACE_Array_Map () { for (size_t idx = 0; idx != capacity_; ++idx) { @@ -162,7 +162,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::erase ( template<typename Key, typename Value, class EqualTo, class Alloc> void -ACE_Array_Map<Key, Value, EqualTo, Alloc>::clear (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::clear () { this->size_ = 0; // No need to deallocate array nor destroy elements. } diff --git a/ACE/ace/Array_Map.h b/ACE/ace/Array_Map.h index 5fd040069ee..4feefe97066 100644 --- a/ACE/ace/Array_Map.h +++ b/ACE/ace/Array_Map.h @@ -125,7 +125,7 @@ public: ACE_Array_Map & operator= (ACE_Array_Map const & map); /// Destructor. - ~ACE_Array_Map (void); + ~ACE_Array_Map (); /** * @name Forward Iterator Accessors @@ -133,10 +133,10 @@ public: * Forward iterator accessors. */ //@{ - iterator begin (void); - iterator end (void); - const_iterator begin (void) const; - const_iterator end (void) const; + iterator begin (); + iterator end (); + const_iterator begin () const; + const_iterator end () const; //@} /** @@ -145,30 +145,30 @@ public: * Reverse iterator accessors. */ //@{ - reverse_iterator rbegin (void); - reverse_iterator rend (void); - const_reverse_iterator rbegin (void) const; - const_reverse_iterator rend (void) const; + reverse_iterator rbegin (); + reverse_iterator rend (); + const_reverse_iterator rbegin () const; + const_reverse_iterator rend () const; //@} /// Return current size of map. /** * @return The number of elements in the map. */ - size_type size (void) const; + size_type size () const; /// Maximum number of elements the map can hold. - size_type max_size (void) const; + size_type max_size () const; /// Return @c true if the map is empty, else @c false. - bool is_empty (void) const; // ACE style + bool is_empty () const; // ACE style /** * Return @c true if the map is empty, else @c false. We recommend * using @c is_empty() instead since it's more consistent with the * ACE container naming conventions. */ - bool empty (void) const; // STL style + bool empty () const; // STL style /// Swap the contents of this map with the given @a map in an /// exception-safe manner. @@ -208,7 +208,7 @@ public: /** * @note This a constant time (O(1)) operation. */ - void clear (void); + void clear (); /** * @name Search Operations diff --git a/ACE/ace/Array_Map.inl b/ACE/ace/Array_Map.inl index 32e7848c02d..d9c8978332f 100644 --- a/ACE/ace/Array_Map.inl +++ b/ACE/ace/Array_Map.inl @@ -26,77 +26,77 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::operator= ( template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin () { return this->nodes_; } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::end (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::end () { return this->nodes_ + this->size_; } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::begin () const { return this->nodes_; } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::end (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::end () const { return this->nodes_ + this->size_; } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::reverse_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin () { return reverse_iterator (this->end ()); } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::reverse_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend (void) +ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend () { return reverse_iterator (this->begin ()); } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_reverse_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::rbegin () const { return const_reverse_iterator (this->end ()); } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::const_reverse_iterator -ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::rend () const { return const_reverse_iterator (this->begin ()); } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::size_type -ACE_Array_Map<Key, Value, EqualTo, Alloc>::size (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::size () const { return this->size_; } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE typename ACE_Array_Map<Key, Value, EqualTo, Alloc>::size_type -ACE_Array_Map<Key, Value, EqualTo, Alloc>::max_size (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::max_size () const { return size_type (-1) / sizeof (value_type); } template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE bool -ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty () const { return this->size_ == 0; } @@ -105,7 +105,7 @@ ACE_Array_Map<Key, Value, EqualTo, Alloc>::is_empty (void) const template<typename Key, typename Value, class EqualTo, class Alloc> ACE_INLINE bool -ACE_Array_Map<Key, Value, EqualTo, Alloc>::empty (void) const +ACE_Array_Map<Key, Value, EqualTo, Alloc>::empty () const { return this->is_empty (); } diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h index b9b179c007a..4f259c319e3 100644 --- a/ACE/ace/Atomic_Op.h +++ b/ACE/ace/Atomic_Op.h @@ -265,7 +265,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, int> : public ACE_Atomic_Op_GCC<int> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (int c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, int> &c); ACE_Atomic_Op<ACE_Thread_Mutex, int> &operator= (int rhs); @@ -276,7 +276,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> : public ACE_Atomic_Op_GCC<unsigned int> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (unsigned int c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned> &c); ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int> &operator= (unsigned int rhs); @@ -289,7 +289,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long> : public ACE_Atomic_Op_GCC<long> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (long c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &c); ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (long rhs); @@ -300,7 +300,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> : public ACE_Atomic_Op_GCC<unsigned long> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (unsigned long c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &c); ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (unsigned long rhs); @@ -313,7 +313,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, long long> : public ACE_Atomic_Op_GCC<long long> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (long long c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, long long> &c); ACE_Atomic_Op<ACE_Thread_Mutex, long long> &operator= (long long rhs); @@ -324,7 +324,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> : public ACE_Atomic_Op_GCC<unsigned long long> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (unsigned long long c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &c); ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long> &operator= (unsigned long long rhs); @@ -337,7 +337,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, short> : public ACE_Atomic_Op_GCC<short> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (short c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, short> &c); ACE_Atomic_Op<ACE_Thread_Mutex, short> &operator= (short rhs); @@ -348,7 +348,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> : public ACE_Atomic_Op_GCC<unsigned short> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (unsigned short c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &c); ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short> &operator= (unsigned short rhs); @@ -361,7 +361,7 @@ class ACE_Export ACE_Atomic_Op<ACE_Thread_Mutex, bool> : public ACE_Atomic_Op_GCC<bool> { public: - ACE_Atomic_Op (void); + ACE_Atomic_Op (); ACE_Atomic_Op (bool c); ACE_Atomic_Op (const ACE_Atomic_Op<ACE_Thread_Mutex, bool> &c); ACE_Atomic_Op<ACE_Thread_Mutex, bool> &operator= (bool rhs); diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl index 2f9ec57bac2..318339d0363 100644 --- a/ACE/ace/Atomic_Op.inl +++ b/ACE/ace/Atomic_Op.inl @@ -419,7 +419,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value_i (void) #if defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1) ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, int>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, int>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<int> () { } @@ -446,7 +446,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, int>::operator= (int rhs) ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<unsigned int>() { } @@ -472,7 +472,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned int>::operator= (unsigned int rhs) } ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, long>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<long>() { } @@ -498,7 +498,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs) } ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<unsigned long> () { } @@ -526,7 +526,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs) // The long long intrinsics are not available on PPC #if !defined (__powerpc__) ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, long long>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<long long>() { } @@ -552,7 +552,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long long>::operator= (long long rhs) } ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<unsigned long long> () { } @@ -580,7 +580,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long long>::operator= (unsigned long lo #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_2) ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, short>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<short>() { } @@ -606,7 +606,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, short>::operator= (short rhs) } ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<unsigned short> () { } @@ -634,7 +634,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned short>::operator= (unsigned short rhs) #if !defined (ACE_LACKS_GCC_ATOMIC_BUILTINS_1) ACE_INLINE -ACE_Atomic_Op<ACE_Thread_Mutex, bool>::ACE_Atomic_Op (void) : +ACE_Atomic_Op<ACE_Thread_Mutex, bool>::ACE_Atomic_Op () : ACE_Atomic_Op_GCC<bool> () { } diff --git a/ACE/ace/Atomic_Op_GCC_T.cpp b/ACE/ace/Atomic_Op_GCC_T.cpp index 3e7e7cada05..8e263daa877 100644 --- a/ACE/ace/Atomic_Op_GCC_T.cpp +++ b/ACE/ace/Atomic_Op_GCC_T.cpp @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> void -ACE_Atomic_Op_GCC<T>::dump (void) const +ACE_Atomic_Op_GCC<T>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h index 38485af3bac..13d363163ea 100644 --- a/ACE/ace/Atomic_Op_GCC_T.h +++ b/ACE/ace/Atomic_Op_GCC_T.h @@ -37,7 +37,7 @@ class ACE_Export ACE_Atomic_Op_GCC { public: /// Atomically pre-increment @c value_. - T operator++ (void); + T operator++ (); /// Atomically post-increment @c value_. T operator++ (int); @@ -46,7 +46,7 @@ public: T operator+= (T rhs); /// Atomically pre-decrement @c value_. - T operator-- (void); + T operator-- (); /// Atomically post-decrement @c value_. T operator-- (int); @@ -76,13 +76,13 @@ public: T exchange (T newval); /// Explicitly return @c value_. - T value (void) const; + T value () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Explicitly return @c value_ (by reference). - volatile T &value_i (void); + volatile T &value_i (); // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -95,7 +95,7 @@ protected: ACE_Atomic_Op_GCC<T> &operator= (const ACE_Atomic_Op_GCC<T> &rhs); /// Initialize @c value_ to 0. - ACE_Atomic_Op_GCC (void); + ACE_Atomic_Op_GCC (); /// Initialize @c value_ to c. ACE_Atomic_Op_GCC (T c); @@ -107,7 +107,7 @@ private: // This function cannot be supported by this template specialization. // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex // template instead. - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); private: /// Current object decorated by the atomic op. diff --git a/ACE/ace/Atomic_Op_GCC_T.inl b/ACE/ace/Atomic_Op_GCC_T.inl index 90f7c4839c2..b102d422395 100644 --- a/ACE/ace/Atomic_Op_GCC_T.inl +++ b/ACE/ace/Atomic_Op_GCC_T.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC (void) +ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC () : value_ (0) { } @@ -27,7 +27,7 @@ ACE_Atomic_Op_GCC<T>::ACE_Atomic_Op_GCC ( template <typename T> ACE_INLINE T -ACE_Atomic_Op_GCC<T>::operator++ (void) +ACE_Atomic_Op_GCC<T>::operator++ () { return __sync_add_and_fetch (&this->value_, 1); } @@ -41,7 +41,7 @@ ACE_Atomic_Op_GCC<T>::operator++ (int) template <typename T> ACE_INLINE T -ACE_Atomic_Op_GCC<T>::operator-- (void) +ACE_Atomic_Op_GCC<T>::operator-- () { return __sync_sub_and_fetch (&this->value_, 1); } @@ -135,14 +135,14 @@ ACE_Atomic_Op_GCC<T>::exchange (T newval) template <typename T> ACE_INLINE T -ACE_Atomic_Op_GCC<T>::value (void) const +ACE_Atomic_Op_GCC<T>::value () const { return this->value_; } template <typename T> ACE_INLINE volatile T & -ACE_Atomic_Op_GCC<T>::value_i (void) +ACE_Atomic_Op_GCC<T>::value_i () { return this->value_; } diff --git a/ACE/ace/Atomic_Op_T.cpp b/ACE/ace/Atomic_Op_T.cpp index d925d6e4623..f0a53fa4778 100644 --- a/ACE/ace/Atomic_Op_T.cpp +++ b/ACE/ace/Atomic_Op_T.cpp @@ -26,7 +26,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Atomic_Op) // ************************************************* template <class ACE_LOCK, class TYPE> ACE_LOCK & -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex (void) +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex () { // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex"); return this->mutex_; @@ -34,7 +34,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::mutex (void) template <class ACE_LOCK, class TYPE> void -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump (void) const +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::dump"); @@ -65,7 +65,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::ACE_Atomic_Op_Ex ( // **************************************************************** template <class ACE_LOCK, class TYPE> -ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (void) +ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op () : impl_ (this->own_mutex_) { // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op"); diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h index c3d936c1fe9..599ae7075b6 100644 --- a/ACE/ace/Atomic_Op_T.h +++ b/ACE/ace/Atomic_Op_T.h @@ -155,7 +155,7 @@ public: // = Accessors. /// Atomically pre-increment @c value_. - TYPE operator++ (void); + TYPE operator++ (); /// Atomically post-increment @c value_. TYPE operator++ (int); @@ -164,7 +164,7 @@ public: TYPE operator+= (arg_type rhs); /// Atomically pre-decrement @c value_. - TYPE operator-- (void); + TYPE operator-- (); /// Atomically post-decrement @c value_. TYPE operator-- (int); @@ -201,10 +201,10 @@ public: TYPE exchange (TYPE newval); /// Explicitly return @c value_. - TYPE value (void) const; + TYPE value () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -220,7 +220,7 @@ public: * * @note The right name would be lock_, but HP/C++ will choke on that! */ - ACE_LOCK & mutex (void); + ACE_LOCK & mutex (); /** * Explicitly return @c value_ (by reference). This gives the user @@ -228,7 +228,7 @@ public: * will usually be used in conjunction with explicit access to the * lock. Use with care ;-) */ - TYPE & value_i (void); + TYPE & value_i (); private: /// Type of synchronization mechanism. @@ -259,7 +259,7 @@ public: typedef typename ACE_Type_Traits<TYPE>::parameter_type arg_type; /// Initialize @c value_ to 0. - ACE_Atomic_Op (void); + ACE_Atomic_Op (); /// Initialize @c value_ to c. ACE_Atomic_Op (arg_type c); @@ -275,7 +275,7 @@ public: ACE_Atomic_Op<ACE_LOCK, TYPE> const & rhs); /// Atomically pre-increment @c value_. - TYPE operator++ (void); + TYPE operator++ (); /// Atomically post-increment @c value_. TYPE operator++ (int); @@ -284,7 +284,7 @@ public: TYPE operator+= (arg_type rhs); /// Atomically pre-decrement @c value_. - TYPE operator-- (void); + TYPE operator-- (); /// Atomically post-decrement @c value_. TYPE operator-- (int); @@ -314,10 +314,10 @@ public: TYPE exchange (TYPE newval); /// Explicitly return @c value_. - TYPE value (void) const; + TYPE value () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -328,7 +328,7 @@ public: * will usually be used in conjunction with explicit access to the * lock. Use with care ;-) */ - TYPE & value_i (void); + TYPE & value_i (); private: /// Type of synchronization mechanism. diff --git a/ACE/ace/Atomic_Op_T.inl b/ACE/ace/Atomic_Op_T.inl index 1b1eb988f94..641f6bd36c5 100644 --- a/ACE/ace/Atomic_Op_T.inl +++ b/ACE/ace/Atomic_Op_T.inl @@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++ (void) +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++ () { // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator++"); ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); @@ -30,7 +30,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator+= ( template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator-- (void) +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator-- () { // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator--"); ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); @@ -161,7 +161,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange (TYPE newval) template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value () const { // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value"); ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_); @@ -170,7 +170,7 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE & -ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value_i (void) +ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value_i () { // Explicitly return <value_> (by reference). This gives the user // full, unrestricted access to the underlying value. This method @@ -223,7 +223,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator= ( template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ (void) +ACE_Atomic_Op<ACE_LOCK, TYPE>::operator++ () { return ++this->impl_; } @@ -245,7 +245,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator+= ( template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- (void) +ACE_Atomic_Op<ACE_LOCK, TYPE>::operator-- () { return --this->impl_; } @@ -322,14 +322,14 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::exchange (TYPE newval) template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE -ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const +ACE_Atomic_Op<ACE_LOCK, TYPE>::value () const { return this->impl_.value (); } template <class ACE_LOCK, class TYPE> ACE_INLINE void -ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const +ACE_Atomic_Op<ACE_LOCK, TYPE>::dump () const { #if defined (ACE_HAS_DUMP) this->impl_.dump (); @@ -338,7 +338,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::dump (void) const } template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE & -ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i (void) +ACE_Atomic_Op<ACE_LOCK, TYPE>::value_i () { return this->impl_.value_i (); } diff --git a/ACE/ace/Auto_Event.cpp b/ACE/ace/Auto_Event.cpp index c95c0e855c3..52024445aa6 100644 --- a/ACE/ace/Auto_Event.cpp +++ b/ACE/ace/Auto_Event.cpp @@ -44,7 +44,7 @@ ACE_Auto_Event_T<TIME_POLICY>::ACE_Auto_Event_T ( template <class TIME_POLICY> void -ACE_Auto_Event_T<TIME_POLICY>::dump (void) const +ACE_Auto_Event_T<TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_Event_T<TIME_POLICY>::dump (); diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h index f01882c62c1..d57fd71e718 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -53,10 +53,10 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - virtual ~ACE_Auto_Event_T (void); + virtual ~ACE_Auto_Event_T (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks ACE_ALLOC_HOOK_DECLARE; @@ -87,7 +87,7 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - virtual ~ACE_Auto_Event (void) + virtual ~ACE_Auto_Event () { } }; diff --git a/ACE/ace/Auto_Event.inl b/ACE/ace/Auto_Event.inl index 919c048d3ce..a8add6194f6 100644 --- a/ACE/ace/Auto_Event.inl +++ b/ACE/ace/Auto_Event.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TIME_POLICY> ACE_INLINE -ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T (void) +ACE_Auto_Event_T<TIME_POLICY>::~ACE_Auto_Event_T () { } diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index 9f8af214a31..21365a540d8 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -48,16 +48,16 @@ public: ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> & ap); ACE_Auto_Basic_Ptr<X> &operator= (ACE_Auto_Basic_Ptr<X> & rhs); - ~ACE_Auto_Basic_Ptr (void); + ~ACE_Auto_Basic_Ptr (); // = Accessor methods. X &operator *() const; - X *get (void) const; - X *release (void); + X *get () const; + X *release (); void reset (X * p = 0); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -132,17 +132,17 @@ public: ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> & ap); ACE_Auto_Basic_Array_Ptr<X> &operator= (ACE_Auto_Basic_Array_Ptr<X> & rhs); - ~ACE_Auto_Basic_Array_Ptr (void); + ~ACE_Auto_Basic_Array_Ptr (); // = Accessor methods. X & operator* () const; X & operator[] (int i) const; - X * get (void) const; - X * release (void); + X * get () const; + X * release (); void reset (X * p = 0); /// 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/Auto_Ptr.inl b/ACE/ace/Auto_Ptr.inl index 1cc93536e42..06b035f7f98 100644 --- a/ACE/ace/Auto_Ptr.inl +++ b/ACE/ace/Auto_Ptr.inl @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class X> ACE_INLINE void -ACE_Auto_Basic_Ptr<X>::dump (void) const +ACE_Auto_Basic_Ptr<X>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::dump"); @@ -16,7 +16,7 @@ ACE_Auto_Basic_Ptr<X>::dump (void) const } template<class X> ACE_INLINE void -ACE_Auto_Basic_Array_Ptr<X>::dump (void) const +ACE_Auto_Basic_Array_Ptr<X>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::dump"); @@ -31,14 +31,14 @@ ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &rhs) } template<class X> ACE_INLINE X * -ACE_Auto_Basic_Ptr<X>::get (void) const +ACE_Auto_Basic_Ptr<X>::get () const { ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::get"); return this->p_; } template<class X> ACE_INLINE X * -ACE_Auto_Basic_Ptr<X>::release (void) +ACE_Auto_Basic_Ptr<X>::release () { ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::release"); X *old = this->p_; @@ -67,7 +67,7 @@ ACE_Auto_Basic_Ptr<X>::operator= (ACE_Auto_Basic_Ptr<X> &rhs) } template<class X> ACE_INLINE -ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr (void) +ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr () { ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr"); delete this->get (); @@ -101,14 +101,14 @@ ACE_Auto_Ptr<X>::operator-> () const } template<class X> ACE_INLINE X * -ACE_Auto_Basic_Array_Ptr<X>::get (void) const +ACE_Auto_Basic_Array_Ptr<X>::get () const { ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get"); return this->p_; } template<class X> ACE_INLINE X * -ACE_Auto_Basic_Array_Ptr<X>::release (void) +ACE_Auto_Basic_Array_Ptr<X>::release () { ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::release"); X *old = this->p_; @@ -149,7 +149,7 @@ ACE_Auto_Basic_Array_Ptr<X>::operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs) } template<class X> ACE_INLINE -ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr (void) +ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr () { ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr"); #if defined (ACE_HAS_ALLOC_HOOKS) diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h index d6efaf2b890..58cba3f2610 100644 --- a/ACE/ace/Barrier.h +++ b/ACE/ace/Barrier.h @@ -59,7 +59,7 @@ struct ACE_Export ACE_Sub_Barrier const ACE_TCHAR *name = 0, void *arg = 0); - ~ACE_Sub_Barrier (void); + ~ACE_Sub_Barrier (); /// True if this generation of the barrier is done. ACE_Condition_Thread_Mutex barrier_finished_; @@ -68,7 +68,7 @@ struct ACE_Export ACE_Sub_Barrier int running_threads_; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -100,7 +100,7 @@ public: void *arg = 0); /// Default destructor. - ~ACE_Barrier (void); + ~ACE_Barrier (); /// Block the caller until all @c count threads have called @c wait and /// then allow all the caller threads to continue in parallel. @@ -108,7 +108,7 @@ public: /// @retval 0 after successfully waiting for all threads to wait. /// @retval -1 if an error occurs or the barrier is shut /// down (@sa shutdown ()). - int wait (void); + int wait (); /// Shut the barrier down, aborting the wait of all waiting threads. /// Any threads waiting on the barrier when it is shut down will return with @@ -117,10 +117,10 @@ public: /// @retval 0 for success, -1 if already shut down. /// /// @since ACE beta 5.4.9. - int shutdown (void); + int shutdown (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -169,10 +169,10 @@ public: ACE_Thread_Barrier (unsigned int count, const ACE_TCHAR *name = 0); /// Default destructor. - ~ACE_Thread_Barrier (void); + ~ACE_Thread_Barrier (); /// 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/Barrier.inl b/ACE/ace/Barrier.inl index f742deeb6e2..62cac458393 100644 --- a/ACE/ace/Barrier.inl +++ b/ACE/ace/Barrier.inl @@ -2,17 +2,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Sub_Barrier::~ACE_Sub_Barrier (void) +ACE_Sub_Barrier::~ACE_Sub_Barrier () { } ACE_INLINE -ACE_Barrier::~ACE_Barrier (void) +ACE_Barrier::~ACE_Barrier () { } ACE_INLINE -ACE_Thread_Barrier::~ACE_Thread_Barrier (void) +ACE_Thread_Barrier::~ACE_Thread_Barrier () { } diff --git a/ACE/ace/Base_Thread_Adapter.h b/ACE/ace/Base_Thread_Adapter.h index e98df29a228..5680ec8d86c 100644 --- a/ACE/ace/Base_Thread_Adapter.h +++ b/ACE/ace/Base_Thread_Adapter.h @@ -49,9 +49,9 @@ class ACE_Export ACE_OS_Thread_Descriptor { public: /// Get the thread creation flags. - long flags (void) const; + long flags () const; - virtual ~ACE_OS_Thread_Descriptor (void); + virtual ~ACE_OS_Thread_Descriptor (); protected: /// For use by ACE_Thread_Descriptor. @@ -87,14 +87,14 @@ class ACE_Service_Gestalt; class ACE_Export ACE_Base_Thread_Adapter { public: - virtual ~ACE_Base_Thread_Adapter (void); + virtual ~ACE_Base_Thread_Adapter (); /// Virtual method invoked by the thread entry point. - virtual ACE_THR_FUNC_RETURN invoke (void) = 0; + virtual ACE_THR_FUNC_RETURN invoke () = 0; /// Accessor for the C entry point function to the OS thread creation /// routine. - ACE_THR_C_FUNC entry_point (void); + ACE_THR_C_FUNC entry_point (); #ifdef ACE_USES_GPROF /// Accessor to the itimer_ @@ -103,13 +103,13 @@ public: #endif // ACE_USES_PROF /// Invoke the close_log_msg_hook, if it is present - static void close_log_msg (void); + static void close_log_msg (); /// Invoke the sync_log_msg_hook, if it is present static void sync_log_msg (const ACE_TCHAR *prog_name); /// Invoke the thr_desc_log_msg_hook, if it is present - static ACE_OS_Thread_Descriptor *thr_desc_log_msg (void); + static ACE_OS_Thread_Descriptor *thr_desc_log_msg (); protected: /// Constructor. @@ -125,7 +125,7 @@ protected: ); /// Inherit the logging features if the parent thread has an /// ACE_Log_Msg. - void inherit_log_msg (void); + void inherit_log_msg (); private: /// The hooks to inherit and cleanup the Log_Msg attributes diff --git a/ACE/ace/Base_Thread_Adapter.inl b/ACE/ace/Base_Thread_Adapter.inl index febce6f49c6..f2ea0636e59 100644 --- a/ACE/ace/Base_Thread_Adapter.inl +++ b/ACE/ace/Base_Thread_Adapter.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE long -ACE_OS_Thread_Descriptor::flags (void) const +ACE_OS_Thread_Descriptor::flags () const { return flags_; } @@ -29,7 +29,7 @@ ACE_Base_Thread_Adapter::set_log_msg_hooks ( } ACE_INLINE ACE_THR_C_FUNC -ACE_Base_Thread_Adapter::entry_point (void) +ACE_Base_Thread_Adapter::entry_point () { return this->entry_point_; } 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/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index d53b911c79c..ab39bc10623 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -39,11 +39,11 @@ public: ACE_ALLOC_HOOK_DECLARE; ACE_Bound_Ptr_Counter (long init_obj_ref_count = 0); - ~ACE_Bound_Ptr_Counter (void); + ~ACE_Bound_Ptr_Counter (); /// Create a ACE_Bound_Ptr_Counter<ACE_LOCK> and initialize the /// reference count to indicate ownership by a strong pointer. - static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_strong (void); + static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_strong (); /// Increase both the object and counter reference counts and return /// the new object reference count. A return value of -1 indicates @@ -57,7 +57,7 @@ public: /// Create a ACE_Bound_Ptr_Counter<ACE_LOCK> and initialize the /// reference count to indicate no ownership. - static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_weak (void); + static ACE_Bound_Ptr_Counter<ACE_LOCK> *create_weak (); /// Increase the counter reference count and return argument. static void attach_weak (ACE_Bound_Ptr_Counter<ACE_LOCK> *counter); @@ -130,7 +130,7 @@ public: } /// Destructor. - ~ACE_Strong_Bound_Ptr (void); + ~ACE_Strong_Bound_Ptr (); /// Assignment operator that binds @c this and @a r to the same object. void operator = (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r); @@ -194,13 +194,13 @@ public: bool operator != (X *p) const; /// Redirection operator - X *operator-> (void) const; + X *operator-> () const; /// Dereference operator - X &operator * (void) const; + X &operator * () const; /// Get the pointer value. - X *get (void) const; + X *get () const; /// Resets the ACE_Strong_Bound_Ptr to refer to a different /// underlying object. @@ -208,7 +208,7 @@ public: /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr /// objects. - bool null (void) const; + bool null () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -262,7 +262,7 @@ public: ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r); /// Destructor. - ~ACE_Weak_Bound_Ptr (void); + ~ACE_Weak_Bound_Ptr (); /// Assignment operator that binds @c this and @a r to the same object. void operator = (const ACE_Weak_Bound_Ptr<X, ACE_LOCK> &r); @@ -308,17 +308,17 @@ public: * certain of the lifetimes of the object, and do not want to incur * the locking overhead, then use the unsafe_get method instead. */ - ACE_Strong_Bound_Ptr<X, ACE_LOCK> operator-> (void) const; + ACE_Strong_Bound_Ptr<X, ACE_LOCK> operator-> () const; /// Obtain a strong pointer corresponding to this weak pointer. This /// function is useful to create a temporary strong pointer for /// conversion to a reference. - ACE_Strong_Bound_Ptr<X, ACE_LOCK> strong (void) const; + ACE_Strong_Bound_Ptr<X, ACE_LOCK> strong () const; /// Get the pointer value. Warning: this does not affect the /// reference count of the underlying object, so it may disappear on /// you while you are using it if you are not careful. - X *unsafe_get (void) const; + X *unsafe_get () const; /// Resets the ACE_Weak_Bound_Ptr to refer to a different underlying /// object. @@ -331,7 +331,7 @@ public: * reference counting mechanism such as those used by COM or CORBA * servants. */ - long add_ref (void); + long add_ref (); /// Decrement the reference count on the underlying object, which is deleted /// if the count has reached zero. @@ -341,10 +341,10 @@ public: * reference counting mechanism such as those used by COM or CORBA * servants. */ - long remove_ref (void); + long remove_ref (); /// Allows us to check for NULL on all ACE_Weak_Bound_Ptr objects. - bool null (void) const; + bool null () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index ff9e6e338ed..c5699e84030 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -17,7 +17,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::internal_create (long init_obj_ref_count) } template <class ACE_LOCK> inline ACE_Bound_Ptr_Counter<ACE_LOCK> * -ACE_Bound_Ptr_Counter<ACE_LOCK>::create_strong (void) +ACE_Bound_Ptr_Counter<ACE_LOCK>::create_strong () { // Set initial object reference count to 1. ACE_Bound_Ptr_Counter<ACE_LOCK> *temp = internal_create (1); @@ -77,7 +77,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_strong (ACE_Bound_Ptr_Counter<ACE_LOCK>* } template <class ACE_LOCK> inline ACE_Bound_Ptr_Counter<ACE_LOCK> * -ACE_Bound_Ptr_Counter<ACE_LOCK>::create_weak (void) +ACE_Bound_Ptr_Counter<ACE_LOCK>::create_weak () { // Set initial object reference count to 0. @@ -135,7 +135,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::ACE_Bound_Ptr_Counter (long init_obj_ref_count) } template <class ACE_LOCK> inline -ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter (void) +ACE_Bound_Ptr_Counter<ACE_LOCK>::~ACE_Bound_Ptr_Counter () { } @@ -171,7 +171,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (const ACE_Weak_Bound_Pt } template <class X, class ACE_LOCK> inline -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::~ACE_Strong_Bound_Ptr (void) +ACE_Strong_Bound_Ptr<X, ACE_LOCK>::~ACE_Strong_Bound_Ptr () { if (COUNTER::detach_strong (this->counter_) == 0) delete this->ptr_; @@ -260,7 +260,7 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator!= (X *p) const } template <class X, class ACE_LOCK> inline X * -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator-> (void) const +ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator-> () const { return this->ptr_; } @@ -272,13 +272,13 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::operator *() const } template <class X, class ACE_LOCK> inline X* -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get (void) const +ACE_Strong_Bound_Ptr<X, ACE_LOCK>::get () const { return this->ptr_; } template <class X, class ACE_LOCK> inline bool -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::null (void) const +ACE_Strong_Bound_Ptr<X, ACE_LOCK>::null () const { return this->ptr_ == 0; } @@ -318,7 +318,7 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::ACE_Weak_Bound_Ptr (const ACE_Strong_Bound_Ptr< } template <class X, class ACE_LOCK> inline -ACE_Weak_Bound_Ptr<X, ACE_LOCK>::~ACE_Weak_Bound_Ptr (void) +ACE_Weak_Bound_Ptr<X, ACE_LOCK>::~ACE_Weak_Bound_Ptr () { COUNTER::detach_weak (this->counter_); } @@ -412,19 +412,19 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator!= (X *p) const } template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK> -ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator-> (void) const +ACE_Weak_Bound_Ptr<X, ACE_LOCK>::operator-> () const { return ACE_Strong_Bound_Ptr<X, ACE_LOCK> (*this); } template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK> -ACE_Weak_Bound_Ptr<X, ACE_LOCK>::strong (void) const +ACE_Weak_Bound_Ptr<X, ACE_LOCK>::strong () const { return ACE_Strong_Bound_Ptr<X, ACE_LOCK> (*this); } template <class X, class ACE_LOCK> inline X* -ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get (void) const +ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get () const { // We do not check if the object has been deleted, since this operation // is defined to be unsafe! @@ -432,7 +432,7 @@ ACE_Weak_Bound_Ptr<X, ACE_LOCK>::unsafe_get (void) const } template <class X, class ACE_LOCK> inline bool -ACE_Weak_Bound_Ptr<X, ACE_LOCK>::null (void) const +ACE_Weak_Bound_Ptr<X, ACE_LOCK>::null () const { // A weak pointer must behave as though it is automatically set to null // if the underlying object has been deleted. diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h index c535924f1a0..4590230a336 100644 --- a/ACE/ace/CDR_Size.h +++ b/ACE/ace/CDR_Size.h @@ -125,9 +125,10 @@ public: size_t align); private: - /// disallow copying... - ACE_SizeCDR (const ACE_SizeCDR& rhs); - ACE_SizeCDR& operator= (const ACE_SizeCDR& rhs); + ACE_SizeCDR (const ACE_SizeCDR&) = delete; + ACE_SizeCDR& operator= (const ACE_SizeCDR&) = delete; + ACE_SizeCDR (ACE_SizeCDR&&) = delete; + ACE_SizeCDR& operator= (ACE_SizeCDR&&) = delete; ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x); ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x); diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h index 4ce2402a5fb..3a16dbeb7bf 100644 --- a/ACE/ace/CDR_Stream.h +++ b/ACE/ace/CDR_Stream.h @@ -165,7 +165,7 @@ public: ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION); /// destructor - ~ACE_OutputCDR (void); + ~ACE_OutputCDR (); /** * Disambiguate overload when inserting booleans, octets, chars, and @@ -338,14 +338,14 @@ public: * @retval Pointer to the placeholder; 0 if there is not enough space * in the stream and memory could not be allocated. */ - char* write_long_placeholder (void); - char* write_short_placeholder (void); - char* write_boolean_placeholder (void); - char* write_char_placeholder (void); - char* write_longlong_placeholder (void); - char* write_octet_placeholder (void); - char* write_float_placeholder (void); - char* write_double_placeholder (void); + char* write_long_placeholder (); + char* write_short_placeholder (); + char* write_boolean_placeholder (); + char* write_char_placeholder (); + char* write_longlong_placeholder (); + char* write_octet_placeholder (); + char* write_float_placeholder (); + char* write_double_placeholder (); /** * Writes a new value into a specific location. This is commonly @@ -403,26 +403,26 @@ public: /** * @note The only expected error is to run out of memory. */ - bool good_bit (void) const; + bool good_bit () const; /// Reuse the CDR stream to write on the old buffer. - void reset (void); + void reset (); /// Add the length of each message block in the chain. - size_t total_length (void) const; + size_t total_length () const; /** * Return the start of the message block chain for this CDR stream. * @note The complete CDR stream is represented by a chain of * message blocks. */ - const ACE_Message_Block *begin (void) const; + const ACE_Message_Block *begin () const; /// Return the last message in the chain that is is use. - const ACE_Message_Block *end (void) const; + const ACE_Message_Block *end () const; /// Return the <current_> message block in chain. - const ACE_Message_Block *current (void) const; + const ACE_Message_Block *current () const; /// Replace the message block chain with a single message block. /** @@ -431,21 +431,21 @@ public: * * @note The only expected error is to run out of memory. */ - int consolidate (void); + int consolidate (); /** * Access the underlying buffer (read only). @note This * method only returns a pointer to the first block in the * chain. */ - const char *buffer (void) const; + const char *buffer () const; /** * Return the size of first message block in the block chain. @note This * method only returns information about the first block in the * chain. */ - size_t length (void) const; + size_t length () const; /** * Utility function to allow the user more flexibility. @@ -456,8 +456,8 @@ public: int align_write_ptr (size_t alignment); /// Access the codeset translators. They can be null! - ACE_Char_Codeset_Translator *char_translator (void) const; - ACE_WChar_Codeset_Translator *wchar_translator (void) const; + ACE_Char_Codeset_Translator *char_translator () const; + ACE_WChar_Codeset_Translator *wchar_translator () const; /// Set the char codeset translator. void char_translator (ACE_Char_Codeset_Translator *); @@ -469,14 +469,14 @@ public: static void wchar_maxbytes (size_t max_bytes); /// access the serialized size of wchars. - static size_t wchar_maxbytes (void); + static size_t wchar_maxbytes (); /** * Return alignment of the wr_ptr(), with respect to the start of * the CDR stream. This is not the same as the alignment of * current->wr_ptr()! */ - size_t current_alignment (void) const; + size_t current_alignment () const; void current_alignment (size_t current_alignment); @@ -499,11 +499,11 @@ public: /// and false otherwise. For example, it would be true if either /// ACE_ENABLE_SWAP_ON_WRITE is defined or a specific byte order was /// specified for this stream. - bool do_byte_swap (void) const; + bool do_byte_swap () const; /// Returns the byte order this stream is marshaling data in. Will be one /// of the values in ACE_CDR::Byte_Order. - int byte_order (void) const; + int byte_order () const; /// For use by a gateway, which creates the output stream for the /// reply to the client in its native byte order, but which must @@ -528,9 +528,10 @@ private: // that the provide location locates. ACE_Message_Block* find (char* loc); - /// disallow copying... - ACE_OutputCDR (const ACE_OutputCDR& rhs); - ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs); + ACE_OutputCDR (const ACE_OutputCDR&) = delete; + ACE_OutputCDR& operator= (const ACE_OutputCDR&) = delete; + ACE_OutputCDR (ACE_OutputCDR&&) = delete; + ACE_OutputCDR& operator= (ACE_OutputCDR&&) = delete; ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x); ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x); @@ -760,7 +761,7 @@ public: ACE_InputCDR (Transfer_Contents rhs); /// Destructor - virtual ~ACE_InputCDR (void); + virtual ~ACE_InputCDR (); /// Disambiguate overloading when extracting octets, chars, /// booleans, and bounded strings @@ -904,20 +905,20 @@ public: * Return @c false on failure and @c true on success. */ //@{ @name Skip elements - ACE_CDR::Boolean skip_boolean (void); - ACE_CDR::Boolean skip_char (void); - ACE_CDR::Boolean skip_wchar (void); - ACE_CDR::Boolean skip_octet (void); - ACE_CDR::Boolean skip_short (void); - ACE_CDR::Boolean skip_ushort (void); - ACE_CDR::Boolean skip_long (void); - ACE_CDR::Boolean skip_ulong (void); - ACE_CDR::Boolean skip_longlong (void); - ACE_CDR::Boolean skip_ulonglong (void); - ACE_CDR::Boolean skip_float (void); - ACE_CDR::Boolean skip_double (void); - ACE_CDR::Boolean skip_longdouble (void); - ACE_CDR::Boolean skip_fixed (void); + ACE_CDR::Boolean skip_boolean (); + ACE_CDR::Boolean skip_char (); + ACE_CDR::Boolean skip_wchar (); + ACE_CDR::Boolean skip_octet (); + ACE_CDR::Boolean skip_short (); + ACE_CDR::Boolean skip_ushort (); + ACE_CDR::Boolean skip_long (); + ACE_CDR::Boolean skip_ulong (); + ACE_CDR::Boolean skip_longlong (); + ACE_CDR::Boolean skip_ulonglong (); + ACE_CDR::Boolean skip_float (); + ACE_CDR::Boolean skip_double (); + ACE_CDR::Boolean skip_longdouble (); + ACE_CDR::Boolean skip_fixed (); //@} /** @@ -925,8 +926,8 @@ public: * useful in parsing a TypeCode. * @return @c false on failure and @c true on success. */ - ACE_CDR::Boolean skip_wstring (void); - ACE_CDR::Boolean skip_string (void); + ACE_CDR::Boolean skip_wstring (); + ACE_CDR::Boolean skip_string (); /// Skip @a n bytes in the CDR stream. /** @@ -935,7 +936,7 @@ public: ACE_CDR::Boolean skip_bytes (size_t n); /// returns @c false if a problem has been detected. - bool good_bit (void) const; + bool good_bit () const; /** * @return The start of the message block chain for this CDR @@ -944,7 +945,7 @@ public: * @note In the current implementation the chain has length 1, but * we are planning to change that. */ - const ACE_Message_Block* start (void) const; + const ACE_Message_Block* start () const; // = The following functions are useful to read the contents of the // CDR stream from a socket or file. @@ -969,7 +970,7 @@ public: int byte_order); /// Steal the contents from the current CDR. - ACE_Message_Block *steal_contents (void); + ACE_Message_Block *steal_contents (); /// Steal the contents of @a cdr and make a shallow copy into this /// stream. @@ -993,16 +994,16 @@ public: /// Re-initialize the CDR stream, forgetting about the old contents /// of the stream and allocating a new buffer (from the allocators). - void reset_contents (void); + void reset_contents (); /// Returns the current position for the @c rd_ptr. - char* rd_ptr (void); + char* rd_ptr (); /// Returns the current position for the @c wr_ptr. - char* wr_ptr (void); + char* wr_ptr (); /// Return how many bytes are left in the stream. - size_t length (void) const; + size_t length () const; /** * Utility function to allow the user more flexibility. @@ -1015,15 +1016,15 @@ public: /// If @c true then this stream is writing in non-native byte order. /// This is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined. - bool do_byte_swap (void) const; + bool do_byte_swap () const; /// If @c do_byte_swap() returns @c false, this returns /// ACE_CDR_BYTE_ORDER else it returns !ACE_CDR_BYTE_ORDER. - int byte_order (void) const; + int byte_order () const; /// Access the codeset translators. They can be nil! - ACE_Char_Codeset_Translator *char_translator (void) const; - ACE_WChar_Codeset_Translator *wchar_translator (void) const; + ACE_Char_Codeset_Translator *char_translator () const; + ACE_WChar_Codeset_Translator *wchar_translator () const; /// Set the codeset translators. void char_translator (ACE_Char_Codeset_Translator *); @@ -1125,7 +1126,7 @@ private: void rd_ptr (size_t offset); /// Points to the continuation field of the current message block. - char* end (void); + char* end (); }; // **************************************************************** diff --git a/ACE/ace/CDR_Stream.inl b/ACE/ace/CDR_Stream.inl index 69810663b82..3ee06d67ef4 100644 --- a/ACE/ace/CDR_Stream.inl +++ b/ACE/ace/CDR_Stream.inl @@ -170,7 +170,7 @@ ACE_InputCDR::Transfer_Contents::Transfer_Contents (ACE_InputCDR &rhs) // **************************************************************** ACE_INLINE -ACE_OutputCDR::~ACE_OutputCDR (void) +ACE_OutputCDR::~ACE_OutputCDR () { if (this->start_.cont () != 0) { @@ -186,7 +186,7 @@ ACE_OutputCDR::~ACE_OutputCDR (void) } ACE_INLINE void -ACE_OutputCDR::reset (void) +ACE_OutputCDR::reset () { this->current_ = &this->start_; this->current_is_writable_ = true; @@ -492,7 +492,7 @@ ACE_OutputCDR::write_longdouble_array (const ACE_CDR::LongDouble* x, } ACE_INLINE bool -ACE_OutputCDR::good_bit (void) const +ACE_OutputCDR::good_bit () const { return this->good_bit_; } @@ -557,49 +557,49 @@ ACE_OutputCDR::get_version (ACE_CDR::Octet &major, ACE_CDR::Octet &minor) ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::begin (void) const +ACE_OutputCDR::begin () const { return &this->start_; } ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::end (void) const +ACE_OutputCDR::end () const { return this->current_->cont (); } ACE_INLINE const ACE_Message_Block* -ACE_OutputCDR::current (void) const +ACE_OutputCDR::current () const { return this->current_; } ACE_INLINE size_t -ACE_OutputCDR::total_length (void) const +ACE_OutputCDR::total_length () const { return ACE_CDR::total_length (this->begin (), this->end ()); } ACE_INLINE const char* -ACE_OutputCDR::buffer (void) const +ACE_OutputCDR::buffer () const { return this->start_.rd_ptr (); } ACE_INLINE size_t -ACE_OutputCDR::length (void) const +ACE_OutputCDR::length () const { return this->start_.length (); } ACE_INLINE bool -ACE_OutputCDR::do_byte_swap (void) const +ACE_OutputCDR::do_byte_swap () const { return this->do_byte_swap_; } ACE_INLINE int -ACE_OutputCDR::byte_order (void) const +ACE_OutputCDR::byte_order () const { if (this->do_byte_swap ()) return !ACE_CDR_BYTE_ORDER; @@ -614,7 +614,7 @@ ACE_OutputCDR::reset_byte_order (int byte_order) } ACE_INLINE size_t -ACE_OutputCDR::current_alignment (void) const +ACE_OutputCDR::current_alignment () const { #if !defined (ACE_LACKS_CDR_ALIGNMENT) return this->current_alignment_; @@ -649,13 +649,13 @@ ACE_OutputCDR::align_write_ptr (size_t alignment) } ACE_INLINE ACE_Char_Codeset_Translator * -ACE_OutputCDR::char_translator (void) const +ACE_OutputCDR::char_translator () const { return this->char_translator_; } ACE_INLINE ACE_WChar_Codeset_Translator * -ACE_OutputCDR::wchar_translator (void) const +ACE_OutputCDR::wchar_translator () const { return this->wchar_translator_; } @@ -675,7 +675,7 @@ ACE_OutputCDR::wchar_translator (ACE_WChar_Codeset_Translator * wctran) // **************************************************************** ACE_INLINE -ACE_InputCDR::~ACE_InputCDR (void) +ACE_InputCDR::~ACE_InputCDR () { #if defined (ACE_HAS_MONITOR_POINTS) && (ACE_HAS_MONITOR_POINTS == 1) this->monitor_->remove_ref (); @@ -792,7 +792,7 @@ ACE_InputCDR::read_fixed (ACE_CDR::Fixed &x) } ACE_INLINE size_t -ACE_InputCDR::length (void) const +ACE_InputCDR::length () const { return this->start_.length (); } @@ -1022,84 +1022,84 @@ ACE_InputCDR::read_longdouble_array (ACE_CDR::LongDouble* x, } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_octet (void) +ACE_InputCDR::skip_octet () { ACE_CDR::Octet x; return this->read_1 (&x); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_char (void) +ACE_InputCDR::skip_char () { return this->skip_octet (); // sizeof (Char) == sizeof (Octet) } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_boolean (void) +ACE_InputCDR::skip_boolean () { return this->skip_octet () && this->good_bit_; } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ushort (void) +ACE_InputCDR::skip_ushort () { ACE_CDR::UShort x; return this->read_2 (&x); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_short (void) +ACE_InputCDR::skip_short () { return this->skip_ushort (); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ulong (void) +ACE_InputCDR::skip_ulong () { ACE_CDR::ULong x; return this->read_4 (&x); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_long (void) +ACE_InputCDR::skip_long () { return this->skip_ulong (); // sizeof (Long) == sizeof (ULong) } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_ulonglong (void) +ACE_InputCDR::skip_ulonglong () { ACE_CDR::ULongLong x; return this->read_8 (&x); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_longlong (void) +ACE_InputCDR::skip_longlong () { return this->skip_ulonglong (); // sizeof (LongLong) == sizeof (ULongLong) } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_float (void) +ACE_InputCDR::skip_float () { return this->skip_ulong (); // sizeof(Float) == sizeof (ULong) } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_double (void) +ACE_InputCDR::skip_double () { return this->skip_ulonglong (); // sizeof(Double) == sizeof (ULongLong) } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_longdouble (void) +ACE_InputCDR::skip_longdouble () { ACE_CDR::LongDouble x; return this->read_16 (&x); } ACE_INLINE ACE_CDR::Boolean -ACE_InputCDR::skip_fixed (void) +ACE_InputCDR::skip_fixed () { for (int i = 0; i < 16; ++i) { @@ -1114,7 +1114,7 @@ ACE_InputCDR::skip_fixed (void) } ACE_INLINE char* -ACE_InputCDR::end (void) +ACE_InputCDR::end () { return this->start_.end (); } @@ -1126,13 +1126,13 @@ ACE_InputCDR::rd_ptr (size_t offset) } ACE_INLINE char* -ACE_InputCDR::rd_ptr (void) +ACE_InputCDR::rd_ptr () { return this->start_.rd_ptr (); } ACE_INLINE char* -ACE_InputCDR::wr_ptr (void) +ACE_InputCDR::wr_ptr () { return this->start_.wr_ptr (); } @@ -1170,13 +1170,13 @@ ACE_InputCDR::adjust (size_t size, } ACE_INLINE const ACE_Message_Block* -ACE_InputCDR::start (void) const +ACE_InputCDR::start () const { return &this->start_; } ACE_INLINE bool -ACE_InputCDR::good_bit (void) const +ACE_InputCDR::good_bit () const { return this->good_bit_; } @@ -1675,13 +1675,13 @@ ACE_InputCDR::reset_byte_order (int byte_order) } ACE_INLINE bool -ACE_InputCDR::do_byte_swap (void) const +ACE_InputCDR::do_byte_swap () const { return this->do_byte_swap_; } ACE_INLINE int -ACE_InputCDR::byte_order (void) const +ACE_InputCDR::byte_order () const { return this->do_byte_swap () ? !ACE_CDR_BYTE_ORDER : ACE_CDR_BYTE_ORDER; } @@ -1721,13 +1721,13 @@ ACE_InputCDR::get_version (ACE_CDR::Octet &major, ACE_CDR::Octet &minor) } ACE_INLINE ACE_Char_Codeset_Translator * -ACE_InputCDR::char_translator (void) const +ACE_InputCDR::char_translator () const { return this->char_translator_; } ACE_INLINE ACE_WChar_Codeset_Translator * -ACE_InputCDR::wchar_translator (void) const +ACE_InputCDR::wchar_translator () const { return this->wchar_translator_; } diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h index afc23f2e419..7f839901d1f 100644 --- a/ACE/ace/Cleanup.h +++ b/ACE/ace/Cleanup.h @@ -46,10 +46,10 @@ class ACE_Export ACE_Cleanup { public: /// No-op constructor. - ACE_Cleanup (void); + ACE_Cleanup (); /// Destructor. - virtual ~ACE_Cleanup (void); + virtual ~ACE_Cleanup (); /// Cleanup method that, by default, simply deletes itself. virtual void cleanup (void *param = 0); @@ -69,12 +69,12 @@ void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0); class ACE_Cleanup_Info_Node : public ACE_Intrusive_List_Node<ACE_Cleanup_Info_Node> { public: - ACE_Cleanup_Info_Node (void); + ACE_Cleanup_Info_Node (); ACE_Cleanup_Info_Node (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param, const char *name); - ~ACE_Cleanup_Info_Node (void); + ~ACE_Cleanup_Info_Node (); /// Equality operator. bool operator== (const ACE_Cleanup_Info_Node &o) const; @@ -82,11 +82,11 @@ public: /// Inequality operator. bool operator!= (const ACE_Cleanup_Info_Node &o) const; - void* object(void); + void* object(); - ACE_CLEANUP_FUNC cleanup_hook (void); + ACE_CLEANUP_FUNC cleanup_hook (); - void *param (void); + void *param (); ACE_ALLOC_HOOK_DECLARE; @@ -119,10 +119,10 @@ class ACE_Export ACE_OS_Exit_Info { public: /// Default constructor. - ACE_OS_Exit_Info (void); + ACE_OS_Exit_Info (); /// Destructor. - ~ACE_OS_Exit_Info (void); + ~ACE_OS_Exit_Info (); /// Use to register a cleanup hook. int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param, const char* name = 0); diff --git a/ACE/ace/Cleanup.inl b/ACE/ace/Cleanup.inl index fdae3412f65..44b8ce91d22 100644 --- a/ACE/ace/Cleanup.inl +++ b/ACE/ace/Cleanup.inl @@ -2,24 +2,24 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Cleanup::ACE_Cleanup (void) +ACE_Cleanup::ACE_Cleanup () { } ACE_INLINE void* -ACE_Cleanup_Info_Node::object(void) +ACE_Cleanup_Info_Node::object() { return this->object_; } ACE_INLINE ACE_CLEANUP_FUNC -ACE_Cleanup_Info_Node::cleanup_hook (void) +ACE_Cleanup_Info_Node::cleanup_hook () { return this->cleanup_hook_; } ACE_INLINE void * -ACE_Cleanup_Info_Node::param (void) +ACE_Cleanup_Info_Node::param () { return this->param_; } diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h index 06b2676d8ae..b678536da34 100644 --- a/ACE/ace/Condition_Attributes.h +++ b/ACE/ace/Condition_Attributes.h @@ -31,10 +31,10 @@ public: ACE_Condition_Attributes (int type = ACE_DEFAULT_SYNCH_TYPE); /// Destructor - ~ACE_Condition_Attributes (void); + ~ACE_Condition_Attributes (); /// Accessor for retrieving the current attributes - const ACE_condattr_t& attributes (void) const; + const ACE_condattr_t& attributes () const; protected: /// The attributes @@ -56,7 +56,7 @@ public: {} /// Destructor - ~ACE_Condition_Attributes_T (void) {} + ~ACE_Condition_Attributes_T () {} private: // = Prevent assignment and initialization. @@ -75,7 +75,7 @@ public: ACE_Condition_Attributes_T (int type = ACE_DEFAULT_SYNCH_TYPE); /// Destructor - ~ACE_Condition_Attributes_T (void); + ~ACE_Condition_Attributes_T (); private: // = Prevent assignment and initialization. diff --git a/ACE/ace/Condition_Attributes.inl b/ACE/ace/Condition_Attributes.inl index f63106ad4e0..4fb4f788b3e 100644 --- a/ACE/ace/Condition_Attributes.inl +++ b/ACE/ace/Condition_Attributes.inl @@ -8,14 +8,14 @@ ACE_Condition_Attributes::ACE_Condition_Attributes (int type) } ACE_INLINE -ACE_Condition_Attributes::~ACE_Condition_Attributes (void) +ACE_Condition_Attributes::~ACE_Condition_Attributes () { ACE_OS::condattr_destroy (this->attributes_); } ACE_INLINE const ACE_condattr_t& -ACE_Condition_Attributes::attributes (void) const +ACE_Condition_Attributes::attributes () const { return this->attributes_; } @@ -30,7 +30,7 @@ ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::ACE_Condition_Attributes_ } ACE_INLINE -ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T (void) +ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy>::~ACE_Condition_Attributes_T () { } diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h index f53ab12ebfd..816f08c7f2c 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.h +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h @@ -46,14 +46,14 @@ public: const ACE_Condition_Attributes &attributes); /// Implicitly destroy the condition variable. - ~ACE_Condition (void); + ~ACE_Condition (); /** * Explicitly destroy the condition variable. Note that only one * thread should call this method since it doesn't protect against * race conditions. */ - int remove (void); + int remove (); /** * Block on condition, or until absolute time-of-day has passed. If @@ -75,16 +75,16 @@ public: const ACE_Time_Value *abstime = 0); /// Signal one waiting thread. - int signal (void); + int signal (); /// Signal *all* waiting threads. - int broadcast (void); + int broadcast (); /// Returns a reference to the underlying mutex; - ACE_Recursive_Thread_Mutex &mutex (void); + ACE_Recursive_Thread_Mutex &mutex (); /// Dump the state of an object. - void dump (void) const; + void dump () const; private: // = Prevent assignment and copying. diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index 7f6b16737f0..3c16a20201f 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -25,7 +25,7 @@ ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Condition) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Thread_Condition) template <class MUTEX> void -ACE_Condition<MUTEX>::dump (void) const +ACE_Condition<MUTEX>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); @@ -46,7 +46,7 @@ ACE_Thread_Condition<MUTEX>::ACE_Thread_Condition (MUTEX &m, } template <class MUTEX> void -ACE_Thread_Condition<MUTEX>::dump (void) const +ACE_Thread_Condition<MUTEX>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Thread_Condition<MUTEX>::dump"); @@ -91,7 +91,7 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, } template <class MUTEX> -ACE_Condition<MUTEX>::~ACE_Condition (void) +ACE_Condition<MUTEX>::~ACE_Condition () { // ACE_TRACE ("ACE_Condition<MUTEX>::~ACE_Condition"); @@ -102,7 +102,7 @@ ACE_Condition<MUTEX>::~ACE_Condition (void) } template <class MUTEX> int -ACE_Condition<MUTEX>::wait (void) +ACE_Condition<MUTEX>::wait () { // ACE_TRACE ("ACE_Condition<MUTEX>::wait"); return ACE_OS::cond_wait (&this->cond_, diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index d87d96b2dc5..0f709e4814e 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -63,7 +63,7 @@ public: void *arg = 0); /// Implicitly destroy the condition variable. - ~ACE_Condition (void); + ~ACE_Condition (); // = Lock accessors. /** @@ -75,7 +75,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 @@ -88,20 +88,20 @@ 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 (); /// 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_Condition (MUTEX &m, const ACE_TCHAR *name = 0, 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; diff --git a/ACE/ace/Condition_T.inl b/ACE/ace/Condition_T.inl index dc426622988..c919464b1ad 100644 --- a/ACE/ace/Condition_T.inl +++ b/ACE/ace/Condition_T.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class MUTEX> ACE_INLINE int -ACE_Condition<MUTEX>::remove (void) +ACE_Condition<MUTEX>::remove () { // ACE_TRACE ("ACE_Condition<MUTEX>::remove"); @@ -25,21 +25,21 @@ ACE_Condition<MUTEX>::remove (void) } template<class MUTEX> ACE_INLINE MUTEX & -ACE_Condition<MUTEX>::mutex (void) +ACE_Condition<MUTEX>::mutex () { // ACE_TRACE ("ACE_Condition<MUTEX>::mutex"); return this->mutex_; } template <class MUTEX> ACE_INLINE int -ACE_Condition<MUTEX>::signal (void) +ACE_Condition<MUTEX>::signal () { // ACE_TRACE ("ACE_Condition<MUTEX>::signal"); return ACE_OS::cond_signal (&this->cond_); } template <class MUTEX> ACE_INLINE int -ACE_Condition<MUTEX>::broadcast (void) +ACE_Condition<MUTEX>::broadcast () { // ACE_TRACE ("ACE_Condition<MUTEX>::broadcast"); return ACE_OS::cond_broadcast (&this->cond_); diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h index 898e683fab6..855adcba377 100644 --- a/ACE/ace/Condition_Thread_Mutex.h +++ b/ACE/ace/Condition_Thread_Mutex.h @@ -65,14 +65,14 @@ public: void *arg = 0); /// Implicitly destroy the condition variable. - ~ACE_Condition (void); + ~ACE_Condition (); /** * Explicitly destroy the condition variable. Note that only one * thread should call this method since it doesn't protect against * race conditions. */ - int remove (void); + int remove (); /** * Block on condition, or until absolute time-of-day has passed. If @@ -83,7 +83,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 @@ -96,16 +96,16 @@ public: int wait (ACE_Thread_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 (); /// Returns a reference to the underlying mutex; - ACE_Thread_Mutex &mutex (void); + ACE_Thread_Mutex &mutex (); /// 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/Condition_Thread_Mutex.inl b/ACE/ace/Condition_Thread_Mutex.inl index 5db2808d1a3..614d9f0eb87 100644 --- a/ACE/ace/Condition_Thread_Mutex.inl +++ b/ACE/ace/Condition_Thread_Mutex.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Condition<ACE_Thread_Mutex>::remove (void) +ACE_Condition<ACE_Thread_Mutex>::remove () { // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::remove"); @@ -29,7 +29,7 @@ ACE_Condition<ACE_Thread_Mutex>::remove (void) } ACE_INLINE ACE_Thread_Mutex & -ACE_Condition<ACE_Thread_Mutex>::mutex (void) +ACE_Condition<ACE_Thread_Mutex>::mutex () { // ACE_TRACE ("ACE_Condition<ACE_Thread_Mutex>::mutex"); return this->mutex_; 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/Containers.h b/ACE/ace/Containers.h index 4d671ca9808..8ba4c3c84a6 100644 --- a/ACE/ace/Containers.h +++ b/ACE/ace/Containers.h @@ -53,7 +53,7 @@ public: ACE_DLList_Node *prev_; protected: - ACE_DLList_Node (void); + ACE_DLList_Node (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Containers.inl b/ACE/ace/Containers.inl index cd7507d403b..ed3e183a370 100644 --- a/ACE/ace/Containers.inl +++ b/ACE/ace/Containers.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_DLList_Node::ACE_DLList_Node (void) +ACE_DLList_Node::ACE_DLList_Node () : item_ (0), next_ (0), prev_ (0) diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index 4fa39569b46..2c69a6b0c6e 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -20,7 +20,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Stack) template <class T> void -ACE_Bounded_Stack<T>::dump (void) const +ACE_Bounded_Stack<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Bounded_Stack<T>::dump"); @@ -73,7 +73,7 @@ ACE_Bounded_Stack<T>::operator= (const ACE_Bounded_Stack<T> &s) } template<class T> -ACE_Bounded_Stack<T>::~ACE_Bounded_Stack (void) +ACE_Bounded_Stack<T>::~ACE_Bounded_Stack () { ACE_TRACE ("ACE_Bounded_Stack<T>::~ACE_Bounded_Stack"); delete [] this->stack_; @@ -84,7 +84,7 @@ ACE_Bounded_Stack<T>::~ACE_Bounded_Stack (void) ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Stack) template <class T, size_t ACE_SIZE> void -ACE_Fixed_Stack<T, ACE_SIZE>::dump (void) const +ACE_Fixed_Stack<T, ACE_SIZE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::dump"); @@ -92,7 +92,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::dump (void) const } template<class T, size_t ACE_SIZE> -ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack (void) +ACE_Fixed_Stack<T, ACE_SIZE>::ACE_Fixed_Stack () : size_ (ACE_SIZE), top_ (0) { @@ -124,7 +124,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::operator= (const ACE_Fixed_Stack<T, ACE_SIZE> &s) } template<class T, size_t ACE_SIZE> -ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack (void) +ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack () { ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack"); } @@ -134,7 +134,7 @@ ACE_Fixed_Stack<T, ACE_SIZE>::~ACE_Fixed_Stack (void) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Unbounded_Stack) template <class T> void -ACE_Unbounded_Stack<T>::dump (void) const +ACE_Unbounded_Stack<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Stack<T>::dump"); @@ -158,7 +158,7 @@ ACE_Unbounded_Stack<T>::ACE_Unbounded_Stack (ACE_Allocator *alloc) } template<class T> void -ACE_Unbounded_Stack<T>::delete_all_nodes (void) +ACE_Unbounded_Stack<T>::delete_all_nodes () { // ACE_TRACE ("ACE_Unbounded_Stack<T>::delete_all_nodes"); @@ -229,7 +229,7 @@ ACE_Unbounded_Stack<T>::operator= (const ACE_Unbounded_Stack<T> &s) } template<class T> -ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack (void) +ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack () { // ACE_TRACE ("ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack"); @@ -356,7 +356,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (c template <class T> T * -ACE_Double_Linked_List_Iterator_Base<T>::next (void) const +ACE_Double_Linked_List_Iterator_Base<T>::next () const { return this->not_done (); } @@ -370,13 +370,13 @@ ACE_Double_Linked_List_Iterator_Base<T>::next (T *&ptr) const template <class T> int -ACE_Double_Linked_List_Iterator_Base<T>::done (void) const +ACE_Double_Linked_List_Iterator_Base<T>::done () const { return this->not_done () ? 0 : 1; } template <class T> T & -ACE_Double_Linked_List_Iterator_Base<T>::operator* (void) const +ACE_Double_Linked_List_Iterator_Base<T>::operator* () const { return *(this->not_done ()); } @@ -391,21 +391,21 @@ ACE_Double_Linked_List_Iterator_Base<T>::reset (ACE_Double_Linked_List<T> &dll) } template <class T> int -ACE_Double_Linked_List_Iterator_Base<T>::go_head (void) +ACE_Double_Linked_List_Iterator_Base<T>::go_head () { this->current_ = static_cast<T*> (dllist_->head_->next_); return this->current_ ? 1 : 0; } template <class T> int -ACE_Double_Linked_List_Iterator_Base<T>::go_tail (void) +ACE_Double_Linked_List_Iterator_Base<T>::go_tail () { this->current_ = static_cast<T*> (dllist_->head_->prev_); return this->current_ ? 1 : 0; } template <class T> T * -ACE_Double_Linked_List_Iterator_Base<T>::not_done (void) const +ACE_Double_Linked_List_Iterator_Base<T>::not_done () const { if (this->current_ != this->dllist_->head_) return this->current_; @@ -414,7 +414,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::not_done (void) const } template <class T> T * -ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void) +ACE_Double_Linked_List_Iterator_Base<T>::do_advance () { if (this->not_done ()) { @@ -426,7 +426,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void) } template <class T> T * -ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void) +ACE_Double_Linked_List_Iterator_Base<T>::do_retreat () { if (this->not_done ()) { @@ -438,7 +438,7 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void) } template <class T> void -ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const +ACE_Double_Linked_List_Iterator_Base<T>::dump_i () const { ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %x"), this->current_)); @@ -467,13 +467,13 @@ ACE_Double_Linked_List_Iterator<T>::reset (ACE_Double_Linked_List<T> &dll) } template <class T> int -ACE_Double_Linked_List_Iterator<T>::first (void) +ACE_Double_Linked_List_Iterator<T>::first () { return this->go_head (); } template <class T> int -ACE_Double_Linked_List_Iterator<T>::advance (void) +ACE_Double_Linked_List_Iterator<T>::advance () { return this->do_advance () ? 1 : 0; } @@ -497,7 +497,7 @@ ACE_Double_Linked_List_Iterator<T>::advance_and_remove (bool dont_remove) } template <class T> void -ACE_Double_Linked_List_Iterator<T>::dump (void) const +ACE_Double_Linked_List_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -508,7 +508,7 @@ ACE_Double_Linked_List_Iterator<T>::dump (void) const template <class T> ACE_Double_Linked_List_Iterator<T> & -ACE_Double_Linked_List_Iterator<T>::operator++ (void) +ACE_Double_Linked_List_Iterator<T>::operator++ () { this->do_advance (); return *this; @@ -531,7 +531,7 @@ ACE_Double_Linked_List_Iterator<T>::operator++ (int) template <class T> ACE_Double_Linked_List_Iterator<T> & -ACE_Double_Linked_List_Iterator<T>::operator-- (void) +ACE_Double_Linked_List_Iterator<T>::operator-- () { this->do_retreat (); return *this; @@ -572,13 +572,13 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::reset (ACE_Double_Linked_List<T> &dl } template <class T> int -ACE_Double_Linked_List_Reverse_Iterator<T>::first (void) +ACE_Double_Linked_List_Reverse_Iterator<T>::first () { return this->go_tail (); } template <class T> int -ACE_Double_Linked_List_Reverse_Iterator<T>::advance (void) +ACE_Double_Linked_List_Reverse_Iterator<T>::advance () { return this->do_retreat () ? 1 : 0; } @@ -604,7 +604,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::advance_and_remove (bool dont_remove } template <class T> void -ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const +ACE_Double_Linked_List_Reverse_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -615,7 +615,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const template <class T> ACE_Double_Linked_List_Reverse_Iterator<T> & -ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (void) +ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ () { this->do_retreat (); return *this; @@ -638,7 +638,7 @@ ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (int) template <class T> ACE_Double_Linked_List_Reverse_Iterator<T> & -ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- (void) +ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- () { this->do_advance (); return *this; @@ -698,7 +698,7 @@ ACE_Double_Linked_List<T>::operator= (const ACE_Double_Linked_List<T> &cx) } template <class T> -ACE_Double_Linked_List<T>::~ACE_Double_Linked_List (void) +ACE_Double_Linked_List<T>::~ACE_Double_Linked_List () { this->delete_nodes (); @@ -710,13 +710,13 @@ ACE_Double_Linked_List<T>::~ACE_Double_Linked_List (void) } template <class T> int -ACE_Double_Linked_List<T>::is_empty (void) const +ACE_Double_Linked_List<T>::is_empty () const { return this->size () ? 0 : 1; } template <class T> int -ACE_Double_Linked_List<T>::is_full (void) const +ACE_Double_Linked_List<T>::is_full () const { return 0; // We have no bound. } @@ -737,7 +737,7 @@ ACE_Double_Linked_List<T>::insert_head (T *new_item) } template <class T> T * -ACE_Double_Linked_List<T>::delete_head (void) +ACE_Double_Linked_List<T>::delete_head () { if (this->is_empty ()) return 0; @@ -749,7 +749,7 @@ ACE_Double_Linked_List<T>::delete_head (void) } template <class T> T * -ACE_Double_Linked_List<T>::delete_tail (void) +ACE_Double_Linked_List<T>::delete_tail () { if (this->is_empty ()) return 0; @@ -761,7 +761,7 @@ ACE_Double_Linked_List<T>::delete_tail (void) } template <class T> void -ACE_Double_Linked_List<T>::reset (void) +ACE_Double_Linked_List<T>::reset () { this->delete_nodes (); } @@ -781,13 +781,13 @@ ACE_Double_Linked_List<T>::get (T *&item, size_t slot) } template <class T> size_t -ACE_Double_Linked_List<T>::size (void) const +ACE_Double_Linked_List<T>::size () const { return this->size_; } template <class T> void -ACE_Double_Linked_List<T>::dump (void) const +ACE_Double_Linked_List<T>::dump () const { #if defined (ACE_HAS_DUMP) // Dump the state of an object. @@ -801,7 +801,7 @@ ACE_Double_Linked_List<T>::remove (T *n) } template <class T> void -ACE_Double_Linked_List<T>::delete_nodes (void) +ACE_Double_Linked_List<T>::delete_nodes () { while (! this->is_empty ()) { @@ -829,7 +829,7 @@ ACE_Double_Linked_List<T>::copy_nodes (const ACE_Double_Linked_List<T> &c) } template <class T> void -ACE_Double_Linked_List<T>::init_head (void) +ACE_Double_Linked_List<T>::init_head () { this->head_->next_ = this->head_; this->head_->prev_ = this->head_; @@ -875,14 +875,14 @@ ACE_Double_Linked_List<T>::remove_element (T *item) ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set) template <class T, size_t ACE_SIZE> size_t -ACE_Fixed_Set<T, ACE_SIZE>::size (void) const +ACE_Fixed_Set<T, ACE_SIZE>::size () const { ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::size"); return this->cur_size_; } template <class T, size_t ACE_SIZE> void -ACE_Fixed_Set<T, ACE_SIZE>::dump (void) const +ACE_Fixed_Set<T, ACE_SIZE>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::dump"); @@ -890,7 +890,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::dump (void) const } template <class T, size_t ACE_SIZE> -ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set (void) +ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set () { ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::~ACE_Fixed_Set"); this->cur_size_ = 0; @@ -923,7 +923,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::operator= (const ACE_Fixed_Set<T, ACE_SIZE> &fs) } template <class T, size_t ACE_SIZE> -ACE_Fixed_Set<T, ACE_SIZE>::ACE_Fixed_Set (void) +ACE_Fixed_Set<T, ACE_SIZE>::ACE_Fixed_Set () : cur_size_ (0), max_size_ (ACE_SIZE) { @@ -1014,7 +1014,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::remove (const T &item) ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Iterator_Base) template <class T, size_t ACE_SIZE> void -ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i (void) const +ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::dump_i"); @@ -1032,7 +1032,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::ACE_Fixed_Set_Iterator_Base (ACE_Fixed } template <class T, size_t ACE_SIZE> int -ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance (void) +ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance () { ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance"); @@ -1054,7 +1054,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::advance (void) } template <class T, size_t ACE_SIZE> int -ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first (void) +ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first () { ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first"); @@ -1064,7 +1064,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::first (void) } template <class T, size_t ACE_SIZE> int -ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done (void) const +ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done () const { ACE_TRACE ("ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::done"); @@ -1095,7 +1095,7 @@ ACE_Fixed_Set_Iterator_Base<T, ACE_SIZE>::next_i (T *&item) ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Iterator) template <class T, size_t ACE_SIZE> void -ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump (void) const +ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -1133,7 +1133,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::remove (T *&item) } template <class T, size_t ACE_SIZE> T& -ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* (void) +ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* () { T *retv = 0; @@ -1149,7 +1149,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::operator* (void) ACE_ALLOC_HOOK_DEFINE_Tcs(ACE_Fixed_Set_Const_Iterator) template <class T, size_t ACE_SIZE> void -ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump (void) const +ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -1172,7 +1172,7 @@ ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::next (const T *&item) } template <class T, size_t ACE_SIZE> const T& -ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* (void) const +ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* () const { const T *retv = 0; @@ -1188,7 +1188,7 @@ ACE_Fixed_Set_Const_Iterator<T, ACE_SIZE>::operator* (void) const ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Set) template <class T> void -ACE_Bounded_Set<T>::dump (void) const +ACE_Bounded_Set<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Bounded_Set<T>::dump"); @@ -1196,14 +1196,14 @@ ACE_Bounded_Set<T>::dump (void) const } template <class T> -ACE_Bounded_Set<T>::~ACE_Bounded_Set (void) +ACE_Bounded_Set<T>::~ACE_Bounded_Set () { ACE_TRACE ("ACE_Bounded_Set<T>::~ACE_Bounded_Set"); delete [] this->search_structure_; } template <class T> -ACE_Bounded_Set<T>::ACE_Bounded_Set (void) +ACE_Bounded_Set<T>::ACE_Bounded_Set () : cur_size_ (0), max_size_ (static_cast<size_t> (ACE_Bounded_Set<T>::DEFAULT_SIZE)) { @@ -1217,7 +1217,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (void) } template <class T> size_t -ACE_Bounded_Set<T>::size (void) const +ACE_Bounded_Set<T>::size () const { ACE_TRACE ("ACE_Bounded_Set<T>::size"); return this->cur_size_; @@ -1352,7 +1352,7 @@ ACE_Bounded_Set<T>::remove (const T &item) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Bounded_Set_Iterator) template <class T> void -ACE_Bounded_Set_Iterator<T>::dump (void) const +ACE_Bounded_Set_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::dump"); @@ -1369,7 +1369,7 @@ ACE_Bounded_Set_Iterator<T>::ACE_Bounded_Set_Iterator (ACE_Bounded_Set<T> &s) } template <class T> int -ACE_Bounded_Set_Iterator<T>::advance (void) +ACE_Bounded_Set_Iterator<T>::advance () { ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::advance"); @@ -1383,7 +1383,7 @@ ACE_Bounded_Set_Iterator<T>::advance (void) } template <class T> int -ACE_Bounded_Set_Iterator<T>::first (void) +ACE_Bounded_Set_Iterator<T>::first () { ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::first"); @@ -1392,7 +1392,7 @@ ACE_Bounded_Set_Iterator<T>::first (void) } template <class T> int -ACE_Bounded_Set_Iterator<T>::done (void) const +ACE_Bounded_Set_Iterator<T>::done () const { ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::done"); @@ -1422,14 +1422,14 @@ ACE_DNode<T>::ACE_DNode (const T &i, ACE_DNode<T> *n, ACE_DNode<T> *p) } template <class T> -ACE_DNode<T>::~ACE_DNode (void) +ACE_DNode<T>::~ACE_DNode () { } // **************************************************************** template <class T> void -ACE_Unbounded_Stack_Iterator<T>::dump (void) const +ACE_Unbounded_Stack_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::dump"); @@ -1445,7 +1445,7 @@ ACE_Unbounded_Stack_Iterator<T>::ACE_Unbounded_Stack_Iterator (ACE_Unbounded_Sta } template <class T> int -ACE_Unbounded_Stack_Iterator<T>::advance (void) +ACE_Unbounded_Stack_Iterator<T>::advance () { // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::advance"); this->current_ = this->current_->next_; @@ -1453,7 +1453,7 @@ ACE_Unbounded_Stack_Iterator<T>::advance (void) } template <class T> int -ACE_Unbounded_Stack_Iterator<T>::first (void) +ACE_Unbounded_Stack_Iterator<T>::first () { // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::first"); this->current_ = this->stack_.head_->next_; @@ -1461,7 +1461,7 @@ ACE_Unbounded_Stack_Iterator<T>::first (void) } template <class T> int -ACE_Unbounded_Stack_Iterator<T>::done (void) const +ACE_Unbounded_Stack_Iterator<T>::done () const { ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::done"); @@ -1513,7 +1513,7 @@ ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet (const ACE_Ordered_MultiSet<T> &us } template <class T> -ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet (void) +ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet () { // ACE_TRACE ("ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet"); @@ -1606,7 +1606,7 @@ ACE_Ordered_MultiSet<T>::find (const T &item, template <class T> void -ACE_Ordered_MultiSet<T>::reset (void) +ACE_Ordered_MultiSet<T>::reset () { ACE_TRACE ("reset"); @@ -1614,7 +1614,7 @@ ACE_Ordered_MultiSet<T>::reset (void) } template <class T> void -ACE_Ordered_MultiSet<T>::dump (void) const +ACE_Ordered_MultiSet<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump"); @@ -1769,7 +1769,7 @@ ACE_Ordered_MultiSet<T>::copy_nodes (const ACE_Ordered_MultiSet<T> &us) } template <class T> void -ACE_Ordered_MultiSet<T>::delete_nodes (void) +ACE_Ordered_MultiSet<T>::delete_nodes () { // iterate through list, deleting nodes for (ACE_DNode<T> *curr = this->head_; @@ -1813,7 +1813,7 @@ ACE_Ordered_MultiSet_Iterator<T>::next (T *&item) const } template <class T> T& -ACE_Ordered_MultiSet_Iterator<T>::operator* (void) +ACE_Ordered_MultiSet_Iterator<T>::operator* () { //ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::operator*"); T *retv = 0; @@ -1849,7 +1849,7 @@ ACE_DLList<T>::insert_head (T *new_item) } template <class T> T * -ACE_DLList<T>::delete_head (void) +ACE_DLList<T>::delete_head () { ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_head (); T *temp2 = (T *) (temp1 ? temp1->item_ : 0); @@ -1861,7 +1861,7 @@ ACE_DLList<T>::delete_head (void) } template <class T> T * -ACE_DLList<T>::delete_tail (void) +ACE_DLList<T>::delete_tail () { ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_tail (); T *temp2 = (T *) (temp1 ? temp1->item_ : 0); diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h index 90a967b6f6b..5cbbca05813 100644 --- a/ACE/ace/Containers_T.h +++ b/ACE/ace/Containers_T.h @@ -103,7 +103,7 @@ public: /** * Deallocate the memory used by the Bounded_Stack. */ - ~ACE_Bounded_Stack (void); + ~ACE_Bounded_Stack (); // = Classic Stack operations. @@ -137,22 +137,22 @@ public: /** * Performs constant time check to determine if the stack is empty. */ - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. /** * Performs constant time check to determine if the stack is at capacity. */ - int is_full (void) const; + int is_full () const; /// The number of items in the stack. /** * Return the number of items currently in the stack. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -210,7 +210,7 @@ public: /** * Initialize an empty stack. */ - ACE_Fixed_Stack (void); + ACE_Fixed_Stack (); /// The copy constructor (performs initialization). /** @@ -228,7 +228,7 @@ public: /** * Destroy the stack. */ - ~ACE_Fixed_Stack (void); + ~ACE_Fixed_Stack (); // = Classic Stack operations. @@ -262,22 +262,22 @@ public: /** * Performs constant time check to see if stack is empty. */ - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. /** * Performs constant time check to see if stack is full. */ - int is_full (void) const; + int is_full () const; /// The number of items in the stack. /** * Constant time access to the current size of the stack. */ - size_t size (void) const; + size_t size () const; /// 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 @@ class ACE_DNode public: /// This isn't necessary, but it keeps some compilers happy. - ~ACE_DNode (void); + ~ACE_DNode (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -399,7 +399,7 @@ public: /** * Destroy the underlying list for the stack. */ - ~ACE_Unbounded_Stack (void); + ~ACE_Unbounded_Stack (); // = Classic Stack operations. @@ -434,13 +434,13 @@ public: /** * Constant time check to see if the stack is empty. */ - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. /** * Always resturns 0 since the stack is unbounded. */ - int is_full (void) const; + int is_full () const; // = Auxiliary methods (not strictly part of the Stack ADT). @@ -469,17 +469,17 @@ public: /** * Constant time access to the current stack size. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; private: /// Delete all the nodes in the stack. - void delete_all_nodes (void); + void delete_all_nodes (); /// Copy all nodes from {s} to {this}. void copy_all_nodes (const ACE_Unbounded_Stack<T> &s); @@ -514,17 +514,17 @@ public: /// Move forward by one element in the Stack. Returns 0 when all the /// items in the Stack have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the Stack. Returns 0 if the /// Stack is empty, else 1. - int first (void); + int first (); /// 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; @@ -560,14 +560,14 @@ public: * @deprecated Return the address of next (current) unvisited item in * the list. 0 if there is no more element available. */ - T *next (void) const; + T *next () const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// STL-like iterator dereference operator: returns a reference /// to the node underneath the iterator. - T & operator* (void) const ; + T & operator* () const ; /** * Retasks the iterator to iterate over a new @@ -598,11 +598,11 @@ protected: * @note the head of the ACE_DLList is actually a null entry, so the * first element is actually the 2n'd entry */ - int go_head (void); + int go_head (); /// Move to the last element of the list. Returns 0 if the list is /// empty, else 1. - int go_tail (void); + int go_tail (); /** * Check if we reach the end of the list. Can also be used to get @@ -610,18 +610,18 @@ protected: * current item if there are still elements left , 0 if we run out * of element. */ - T *not_done (void) const ; + T *not_done () const ; /// Advance to the next element in the list. Return the address of the /// next element if there are more, 0 otherwise. - T *do_advance (void); + T *do_advance (); /// Retreat to the previous element in the list. Return the address /// of the previous element if there are more, 0 otherwise. - T *do_retreat (void); + T *do_retreat (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Remember where we are. T *current_; @@ -661,11 +661,11 @@ public: /// Move to the first element in the list. Returns 0 if the /// list is empty, else 1. - int first (void); + int first (); /// Move forward by one element in the list. Returns 0 when all the /// items in the list have been seen, else 1. - int advance (void); + int advance (); /** * Advance the iterator while removing the original item from the @@ -678,19 +678,19 @@ public: // = STL-style iteration methods /// Prefix advance. - ACE_Double_Linked_List_Iterator<T> & operator++ (void); + ACE_Double_Linked_List_Iterator<T> & operator++ (); /// Postfix advance. ACE_Double_Linked_List_Iterator<T> operator++ (int); /// Prefix reverse. - ACE_Double_Linked_List_Iterator<T> & operator-- (void); + ACE_Double_Linked_List_Iterator<T> & operator-- (); /// Postfix reverse. ACE_Double_Linked_List_Iterator<T> operator-- (int); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -729,11 +729,11 @@ public: /// Move to the first element in the list. Returns 0 if the /// list is empty, else 1. - int first (void); + int first (); /// Move forward by one element in the list. Returns 0 when all the /// items in the list have been seen, else 1. - int advance (void); + int advance (); /** * Advance the iterator while removing the original item from the @@ -746,19 +746,19 @@ public: // = STL-style iteration methods /// Prefix advance. - ACE_Double_Linked_List_Reverse_Iterator<T> & operator++ (void); + ACE_Double_Linked_List_Reverse_Iterator<T> & operator++ (); /// Postfix advance. ACE_Double_Linked_List_Reverse_Iterator<T> operator++ (int); /// Prefix reverse. - ACE_Double_Linked_List_Reverse_Iterator<T> & operator-- (void); + ACE_Double_Linked_List_Reverse_Iterator<T> & operator-- (); /// Postfix reverse. ACE_Double_Linked_List_Reverse_Iterator<T> operator-- (int); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -846,7 +846,7 @@ public: /** * Clean up the memory allocated for the nodes of the list. */ - ~ACE_Double_Linked_List (void); + ~ACE_Double_Linked_List (); // = Check boundary conditions. @@ -854,13 +854,13 @@ public: /** * Performs constant time check to determine if the list is empty. */ - int is_empty (void) const; + int is_empty () const; /// The list is unbounded, so this always returns 0. /** * Since the list is unbounded, the method simply returns 0. */ - int is_full (void) const; + int is_full () const; // = Classic queue operations. @@ -884,7 +884,7 @@ public: * internal node's address on success, 0 if the queue was empty. * This method will *not* free the internal node. */ - T* delete_head (void); + T* delete_head (); /// Removes the tail of the list and returns a pointer to that item. /** @@ -892,7 +892,7 @@ public: * internal nodes's address on success, 0 if the queue was * empty. This method will *not* free the internal node. */ - T *delete_tail (void); + T *delete_tail (); // = Additional utility methods. @@ -902,7 +902,7 @@ public: * Notice that since no one is interested in the items within, * This operation will delete all items. */ - void reset (void); + void reset (); /// Get the {slot}th element in the set. Returns -1 if the element /// isn't in the range {0..{size} - 1}, else 0. @@ -916,10 +916,10 @@ public: /** * Constant time call to return the current size of the list. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Use DNode address directly. /** @@ -935,7 +935,7 @@ protected: /** * Removes and deallocates memory for all of the list nodes. */ - void delete_nodes (void); + void delete_nodes (); /// Copy nodes from {rhs} into this list. /** @@ -948,7 +948,7 @@ protected: /** * Initialize the head pointer so that the list has a dummy node. */ - void init_head (void); + void init_head (); ///Constant time insert a new item into the list structure. /** @@ -1052,7 +1052,7 @@ public: * @return Pointer to previously inserted item; 0 if the list is empty, * an error occurred, or the original pointer inserted was 0. */ - T *delete_head (void); + T *delete_head (); /** * Removes the item at the tail of the list and returns its pointer. @@ -1060,7 +1060,7 @@ public: * @return Pointer to previously inserted item; 0 if the list is empty, * an error occurred, or the original pointer inserted was 0. */ - T *delete_tail (void); + T *delete_tail (); //@} /** @@ -1076,7 +1076,7 @@ public: int get (T *&item, size_t slot = 0); /// Delegates to ACE_Double_Linked_List. - void dump (void) const; + void dump () const; /// Delegates to ACE_Double_Linked_List. int remove (ACE_DLList_Node *n); @@ -1107,7 +1107,7 @@ public: delete *p; @endcode */ - ~ACE_DLList (void); + ~ACE_DLList (); }; /** @@ -1142,7 +1142,7 @@ public: // = Iteration methods. /// Move forward by one element in the list. Returns 0 when all the /// items in the list have been seen, else 1. - int advance (void); + int advance (); /// Pass back the {next_item} that hasn't been seen in the list. /// Returns 0 when all items have been seen, else 1. @@ -1153,7 +1153,7 @@ public: * whereas the Double_Linked_List version of next returns the node, this next * returns the contents of the node */ - T *next (void) const; + T *next () const; /** * Removes the current item (i.e., {next}) from the list. @@ -1161,10 +1161,10 @@ public: * directly (defined in its base class) and you will need to * release the element returned by it. */ - int remove (void); + int remove (); /// Delegates to ACE_Double_Linked_List_Iterator. - void dump (void) const; + void dump () const; private: ACE_DLList<T> *list_; @@ -1202,23 +1202,23 @@ public: // = Iteration methods. /// Move forward by one element in the list. Returns 0 when all the /// items in the list have been seen, else 1. - int advance (void); + int advance (); /// Pass back the {next_item} that hasn't been seen in the list. /// Returns 0 when all items have been seen, else 1. int next (T *&); /// @deprecated Delegates to ACE_Double_Linked_List_Iterator. - T *next (void) const; + T *next () const; /// Removes the current item (i.e., {next}) from the list. /// Note that DLList iterators do not support {advance_and_remove} /// directly (defined in its base class) and you will need to /// release the element returned by it. - int remove (void); + int remove (); /// Delegates to ACE_Double_Linked_List_Iterator. - void dump (void) const; + void dump () const; private: ACE_DLList<T> *list_; @@ -1245,14 +1245,14 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the set. Returns 0 if the /// set is empty, else 1. - int first (void); + int first (); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1270,7 +1270,7 @@ protected: size_t iterated_items_; /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Pass back the {next_item} that hasn't been seen in the Set. /// Returns 0 when all items have been seen, else 1. @@ -1298,7 +1298,7 @@ public: int next (T *&next_item); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Remove the item where the itearetor is located at. /// Returns 1 if it removes a item, else 0. @@ -1307,7 +1307,7 @@ public: /// STL-like iterator dereference operator: returns a reference /// to the node underneath the iterator. - T & operator* (void); + T & operator* (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1333,11 +1333,11 @@ public: int next (const T *&next_item); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// STL-like iterator dereference operator: returns a reference /// to the node underneath the iterator. - const T & operator* (void) const ; + const T & operator* () const ; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1391,7 +1391,7 @@ public: /** * Creates an empy set */ - ACE_Fixed_Set (void); + ACE_Fixed_Set (); /// Copy constructor. /** @@ -1409,7 +1409,7 @@ public: /** * Destroys a set. */ - ~ACE_Fixed_Set (void); + ~ACE_Fixed_Set (); // = Check boundary conditions. @@ -1417,13 +1417,13 @@ public: /** * Performs constant time check to determine if a set is empty. */ - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. /** * Performs a constant time check to see if the set is full. */ - int is_full (void) const; + int is_full () const; // = Classic unordered set operations. @@ -1453,10 +1453,10 @@ public: /** * Returns the current size of the set. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1505,17 +1505,17 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the set. Returns 0 if the /// set is empty, else 1. - int first (void); + int first (); /// 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; @@ -1584,7 +1584,7 @@ public: * The default constructor initializes the Bounded_Set to a maximum size * specified by the DEFAULT_SIZE. */ - ACE_Bounded_Set (void); + ACE_Bounded_Set (); /// Construct a Bounded_Set with the provided sizeB. /** @@ -1612,7 +1612,7 @@ public: * Clean up the underlying dynamically allocated memory that is used by * the Bounded_Set. */ - ~ACE_Bounded_Set (void); + ~ACE_Bounded_Set (); // = Check boundary conditions. @@ -1621,14 +1621,14 @@ public: * A constant time check is performed to determine if the Bounded_Set is * empty. */ - int is_empty (void) const; + int is_empty () const; /// Returns 1 if the container is full, otherwise returns 0. /** * Performs a constant time check to determine if the Bounded_Set is at * capacity. */ - int is_full (void) const; + int is_full () const; // = Classic unordered set operations. @@ -1661,10 +1661,10 @@ public: /** * Returns a size_t representing the current size of the set. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1713,28 +1713,28 @@ public: /// Repositions the iterator at the first item in the ordered multiset /// Returns 0 if the list is empty else 1. - int first (void); + int first (); /// Repositions the iterator at the last item in the ordered multiset /// Returns 0 if the list is empty else 1. - int last (void); + int last (); /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Move backward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int retreat (void); + int retreat (); /// 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; /// Returns a reference to the internal element {this} is pointing to. - T& operator* (void); + T& operator* (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1808,7 +1808,7 @@ public: /** * Delete the nodes of the set. */ - ~ACE_Ordered_MultiSet (void); + ~ACE_Ordered_MultiSet (); /// Assignment operator. /** @@ -1822,13 +1822,13 @@ public: /** * Constant time check to determine if the set is empty. */ - int is_empty (void) const; + int is_empty () const; /// Size of the set. /** * Constant time check to determine the size of the set. */ - size_t size (void) const; + size_t size () const; // = Classic unordered set operations. @@ -1868,10 +1868,10 @@ public: /** * Delete the nodes inside the set. */ - void reset (void); + void reset (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1900,7 +1900,7 @@ private: ACE_DNode<T> *&new_position) const; /// Delete all the nodes in the Set. - void delete_nodes (void); + void delete_nodes (); /// Copy nodes into this set. void copy_nodes (const ACE_Ordered_MultiSet<T> &); diff --git a/ACE/ace/Containers_T.inl b/ACE/ace/Containers_T.inl index adc0f42cd23..9ef0b04df29 100644 --- a/ACE/ace/Containers_T.inl +++ b/ACE/ace/Containers_T.inl @@ -2,14 +2,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> ACE_INLINE int -ACE_Bounded_Stack<T>::is_empty (void) const +ACE_Bounded_Stack<T>::is_empty () const { ACE_TRACE ("ACE_Bounded_Stack<T>::is_empty"); return this->top_ == 0; } template <class T> ACE_INLINE int -ACE_Bounded_Stack<T>::is_full (void) const +ACE_Bounded_Stack<T>::is_full () const { ACE_TRACE ("ACE_Bounded_Stack<T>::is_full"); return this->top_ >= this->size_; @@ -55,7 +55,7 @@ ACE_Bounded_Stack<T>::top (T &item) const } template <class T> ACE_INLINE size_t -ACE_Bounded_Stack<T>::size (void) const +ACE_Bounded_Stack<T>::size () const { return this->size_; } @@ -63,14 +63,14 @@ ACE_Bounded_Stack<T>::size (void) const //---------------------------------------- template <class T, size_t ACE_SIZE> ACE_INLINE int -ACE_Fixed_Stack<T, ACE_SIZE>::is_empty (void) const +ACE_Fixed_Stack<T, ACE_SIZE>::is_empty () const { ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_empty"); return this->top_ == 0; } template <class T, size_t ACE_SIZE> ACE_INLINE int -ACE_Fixed_Stack<T, ACE_SIZE>::is_full (void) const +ACE_Fixed_Stack<T, ACE_SIZE>::is_full () const { ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::is_full"); return this->top_ >= this->size_; @@ -116,13 +116,13 @@ ACE_Fixed_Stack<T, ACE_SIZE>::top (T &item) const } template <class T, size_t ACE_SIZE> ACE_INLINE size_t -ACE_Fixed_Stack<T, ACE_SIZE>::size (void) const +ACE_Fixed_Stack<T, ACE_SIZE>::size () const { return this->size_; } template <class T> ACE_INLINE int -ACE_Unbounded_Stack<T>::is_empty (void) const +ACE_Unbounded_Stack<T>::is_empty () const { // ACE_TRACE ("ACE_Unbounded_Stack<T>::is_empty"); return this->head_ == this->head_->next_; @@ -142,14 +142,14 @@ ACE_Unbounded_Stack<T>::top (T &item) const } template <class T> ACE_INLINE int -ACE_Unbounded_Stack<T>::is_full (void) const +ACE_Unbounded_Stack<T>::is_full () const { ACE_TRACE ("ACE_Unbounded_Stack<T>::is_full"); return 0; // ??? } template <class T> ACE_INLINE size_t -ACE_Unbounded_Stack<T>::size (void) const +ACE_Unbounded_Stack<T>::size () const { return this->cur_size_; } @@ -160,14 +160,14 @@ ACE_Unbounded_Stack<T>::size (void) const // --- template <class T, size_t ACE_SIZE> ACE_INLINE int -ACE_Fixed_Set<T, ACE_SIZE>::is_empty (void) const +ACE_Fixed_Set<T, ACE_SIZE>::is_empty () const { ACE_TRACE ("ACE_Fixed_Set<T>::is_empty"); return this->cur_size_ == 0; } template <class T, size_t ACE_SIZE> ACE_INLINE int -ACE_Fixed_Set<T, ACE_SIZE>::is_full (void) const +ACE_Fixed_Set<T, ACE_SIZE>::is_full () const { ACE_TRACE ("ACE_Fixed_Set<T, ACE_SIZE>::is_full"); return this->cur_size_ == this->max_size_; @@ -176,14 +176,14 @@ ACE_Fixed_Set<T, ACE_SIZE>::is_full (void) const // --- template <class T> ACE_INLINE int -ACE_Bounded_Set<T>::is_empty (void) const +ACE_Bounded_Set<T>::is_empty () const { ACE_TRACE ("ACE_Bounded_Set<T>::is_empty"); return this->cur_size_ == 0; } template <class T> ACE_INLINE int -ACE_Bounded_Set<T>::is_full (void) const +ACE_Bounded_Set<T>::is_full () const { ACE_TRACE ("ACE_Bounded_Set<T>::is_full"); return this->cur_size_ == this->max_size_; @@ -192,7 +192,7 @@ ACE_Bounded_Set<T>::is_full (void) const // -- template <class T> ACE_INLINE int -ACE_Ordered_MultiSet_Iterator<T>::first (void) +ACE_Ordered_MultiSet_Iterator<T>::first () { ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::first"); current_ = set_.head_; @@ -201,7 +201,7 @@ ACE_Ordered_MultiSet_Iterator<T>::first (void) } template <class T> ACE_INLINE int -ACE_Ordered_MultiSet_Iterator<T>::last (void) +ACE_Ordered_MultiSet_Iterator<T>::last () { ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::last"); current_ = set_.tail_; @@ -210,7 +210,7 @@ ACE_Ordered_MultiSet_Iterator<T>::last (void) } template <class T> ACE_INLINE int -ACE_Ordered_MultiSet_Iterator<T>::advance (void) +ACE_Ordered_MultiSet_Iterator<T>::advance () { ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::advance"); @@ -220,7 +220,7 @@ ACE_Ordered_MultiSet_Iterator<T>::advance (void) } template <class T> ACE_INLINE int -ACE_Ordered_MultiSet_Iterator<T>::retreat (void) +ACE_Ordered_MultiSet_Iterator<T>::retreat () { ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::retreat"); @@ -230,7 +230,7 @@ ACE_Ordered_MultiSet_Iterator<T>::retreat (void) } template <class T> ACE_INLINE int -ACE_Ordered_MultiSet_Iterator<T>::done (void) const +ACE_Ordered_MultiSet_Iterator<T>::done () const { ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::done"); @@ -238,7 +238,7 @@ ACE_Ordered_MultiSet_Iterator<T>::done (void) const } template <class T> ACE_INLINE void -ACE_Ordered_MultiSet_Iterator<T>::dump (void) const +ACE_Ordered_MultiSet_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::dump"); @@ -250,14 +250,14 @@ ACE_Ordered_MultiSet_Iterator<T>::dump (void) const // -- template <class T> ACE_INLINE int -ACE_Ordered_MultiSet<T>::is_empty (void) const +ACE_Ordered_MultiSet<T>::is_empty () const { ACE_TRACE ("ACE_Ordered_MultiSet<T>::is_empty"); return this->cur_size_ > 0 ? 0 : 1; } template <class T> ACE_INLINE size_t -ACE_Ordered_MultiSet<T>::size (void) const +ACE_Ordered_MultiSet<T>::size () const { // ACE_TRACE ("ACE_Ordered_MultiSet<T>::size"); return this->cur_size_; @@ -329,7 +329,7 @@ ACE_DLList<T>::get (T *&item, size_t index) } template <class T> ACE_INLINE void -ACE_DLList<T>::dump (void) const +ACE_DLList<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_DLList_Base::dump (); @@ -359,13 +359,13 @@ ACE_DLList<T>::ACE_DLList (const ACE_DLList<T> &l) } template <class T> ACE_INLINE -ACE_DLList<T>::~ACE_DLList (void) +ACE_DLList<T>::~ACE_DLList () { while (this->delete_head ()) ; } template <class T> ACE_INLINE int -ACE_DLList_Iterator<T>::remove (void) +ACE_DLList_Iterator<T>::remove () { ACE_DLList_Node *temp = this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next (); this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance (); @@ -397,20 +397,20 @@ ACE_DLList_Iterator<T>::next (T *&ptr) } template <class T> ACE_INLINE T * -ACE_DLList_Iterator<T>::next (void) const +ACE_DLList_Iterator<T>::next () const { ACE_DLList_Node *temp = ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next (); return (T *) (temp ? temp->item_ : 0); } template <class T> ACE_INLINE int -ACE_DLList_Iterator<T>::advance (void) +ACE_DLList_Iterator<T>::advance () { return this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance (); } template <class T> ACE_INLINE void -ACE_DLList_Iterator<T>::dump (void) const +ACE_DLList_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::dump (); @@ -419,7 +419,7 @@ ACE_DLList_Iterator<T>::dump (void) const template <class T> ACE_INLINE int -ACE_DLList_Reverse_Iterator<T>::remove (void) +ACE_DLList_Reverse_Iterator<T>::remove () { ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next (); this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance (); @@ -441,7 +441,7 @@ ACE_DLList_Reverse_Iterator<T>::reset (ACE_DLList<T> &l) } template <class T> ACE_INLINE int -ACE_DLList_Reverse_Iterator<T>::advance (void) +ACE_DLList_Reverse_Iterator<T>::advance () { return ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance (); } @@ -458,7 +458,7 @@ ACE_DLList_Reverse_Iterator<T>::next (T *&ptr) } template <class T> ACE_INLINE T * -ACE_DLList_Reverse_Iterator<T>::next (void) const +ACE_DLList_Reverse_Iterator<T>::next () const { ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next (); return (T *) (temp ? temp->item_ : 0); @@ -466,7 +466,7 @@ ACE_DLList_Reverse_Iterator<T>::next (void) const template <class T> ACE_INLINE void -ACE_DLList_Reverse_Iterator<T>::dump (void) const +ACE_DLList_Reverse_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump (); diff --git a/ACE/ace/Copy_Disabled.h b/ACE/ace/Copy_Disabled.h index de053516f3a..264dec106cb 100644 --- a/ACE/ace/Copy_Disabled.h +++ b/ACE/ace/Copy_Disabled.h @@ -47,7 +47,7 @@ class ACE_Export ACE_Copy_Disabled { public: /// Default constructor - ACE_Copy_Disabled (void); + ACE_Copy_Disabled (); private: ACE_Copy_Disabled (const ACE_Copy_Disabled &) = delete; 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/DLL.h b/ACE/ace/DLL.h index c646964855f..0ca0b5a806e 100644 --- a/ACE/ace/DLL.h +++ b/ACE/ace/DLL.h @@ -131,14 +131,14 @@ public: bool close_handle_on_destruction = true); /// Call to close the DLL object. - int close (void); + int close (); /** * Called when the DLL object is destroyed -- invokes close() if the * @a close_handle_on_destruction flag was set to non-zero in the * constructor or open() method. */ - ~ACE_DLL (void); + ~ACE_DLL (); /** * Look up a named symbol in the DLL. DLL must be successfully opened @@ -155,7 +155,7 @@ public: /// Returns a pointer to a string explaining that an error occurred. You /// will need to consult the error log for the actual error string /// returned by the OS. - ACE_TCHAR *error (void) const; + ACE_TCHAR *error () const; /** * Return the handle to the caller. If @a become_owner is true then diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 7ab61cacf49..64612470e80 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -170,9 +170,10 @@ private: */ bool open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors); - /// Disallow copying and assignment since we don't handle them. - ACE_DLL_Handle (const ACE_DLL_Handle &); - void operator= (const ACE_DLL_Handle &); + ACE_DLL_Handle (const ACE_DLL_Handle &) = delete; + void operator= (const ACE_DLL_Handle &) = delete; + ACE_DLL_Handle (ACE_DLL_Handle &&) = delete; + void operator= (ACE_DLL_Handle &&) = delete; private: /// Keep track of how many ACE_DLL objects have a reference to this @@ -288,9 +289,10 @@ private: /// Close the singleton instance. static void close_singleton (void); - /// Disallow copying and assignment since we don't handle these. - ACE_DLL_Manager (const ACE_DLL_Manager &); - void operator= (const ACE_DLL_Manager &); + ACE_DLL_Manager (const ACE_DLL_Manager &) = delete; + void operator= (const ACE_DLL_Manager &) = delete; + ACE_DLL_Manager (ACE_DLL_Manager &&) = delete; + void operator= (ACE_DLL_Manager &&) = delete; private: /// Vector containing all loaded handle objects. diff --git a/ACE/ace/Dirent.h b/ACE/ace/Dirent.h index 65fe3049bb5..02551013d07 100644 --- a/ACE/ace/Dirent.h +++ b/ACE/ace/Dirent.h @@ -34,7 +34,7 @@ class ACE_Export ACE_Dirent { public: /// Default constructor. - ACE_Dirent (void); + ACE_Dirent (); /// Constructor calls @c opendir() explicit ACE_Dirent (const ACE_TCHAR *dirname); @@ -44,10 +44,10 @@ public: int open (const ACE_TCHAR *filename); /// Destructor calls @c closedir(). - ~ACE_Dirent (void); + ~ACE_Dirent (); /// Closes the directory stream and frees the ACE_DIR structure. - void close (void); + void close (); // = Iterator methods. /** @@ -67,12 +67,12 @@ public: * update the st_atime field of the directory each time the * directory is actually read. */ - ACE_DIRENT *read (void); + ACE_DIRENT *read (); // = Manipulators. /// Returns the current location associated with the directory /// stream. - long tell (void); + long tell (); /** * Sets the position of the next @c read() operation on the @@ -94,7 +94,7 @@ public: * the current state of the corresponding directory, as a call to * @c opendir() would. */ - void rewind (void); + void rewind (); private: /// Pointer to the directory stream. diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl index 24befd9f975..163954c712f 100644 --- a/ACE/ace/Dirent.inl +++ b/ACE/ace/Dirent.inl @@ -24,7 +24,7 @@ ACE_Dirent::open (const ACE_TCHAR *dirname) } ACE_INLINE -ACE_Dirent::ACE_Dirent (void) +ACE_Dirent::ACE_Dirent () : dirp_ (0) { } @@ -40,20 +40,20 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) } ACE_INLINE -ACE_Dirent::~ACE_Dirent (void) +ACE_Dirent::~ACE_Dirent () { if (this->dirp_ != 0) ACE_OS::closedir (this->dirp_); } ACE_INLINE ACE_DIRENT * -ACE_Dirent::read (void) +ACE_Dirent::read () { return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0; } ACE_INLINE void -ACE_Dirent::close (void) +ACE_Dirent::close () { if (this->dirp_ != 0) { @@ -65,7 +65,7 @@ ACE_Dirent::close (void) } ACE_INLINE void -ACE_Dirent::rewind (void) +ACE_Dirent::rewind () { if (this->dirp_) ACE_OS::rewinddir (this->dirp_); @@ -79,7 +79,7 @@ ACE_Dirent::seek (long loc) } ACE_INLINE long -ACE_Dirent::tell (void) +ACE_Dirent::tell () { return this->dirp_ ? ACE_OS::telldir (this->dirp_) : 0; } 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/Dynamic_Service_Base.h b/ACE/ace/Dynamic_Service_Base.h index 3d46492031b..308290e5fdd 100644 --- a/ACE/ace/Dynamic_Service_Base.h +++ b/ACE/ace/Dynamic_Service_Base.h @@ -37,7 +37,7 @@ class ACE_Export ACE_Dynamic_Service_Base { public: /// Dump the current static of the object - void dump (void) const; + void dump () const; protected: /// Perform the default repo search, but optionally skip searching the global @@ -49,8 +49,8 @@ protected: bool no_global = false); /// No need to create, or assign instances of this class - ACE_Dynamic_Service_Base (void); - ~ACE_Dynamic_Service_Base (void); + ACE_Dynamic_Service_Base (); + ~ACE_Dynamic_Service_Base (); const ACE_Dynamic_Service_Base& operator= (const ACE_Dynamic_Service_Base&); private: diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h index 4e268d3f933..6e97e3602d7 100644 --- a/ACE/ace/Env_Value_T.h +++ b/ACE/ace/Env_Value_T.h @@ -44,26 +44,26 @@ public: * variable name or a default value. Before being useful it must * open()'d. */ - ACE_Env_Value (void); + ACE_Env_Value (); /// Constructor that calls open(). ACE_Env_Value (const ACE_TCHAR *varname, const T &vardefault); /// Destroy the value. - ~ACE_Env_Value (void); + ~ACE_Env_Value (); /// Returns the value as type T. - operator T (void); + operator T (); /// The constructor, read @a varname from the environment, using /// @a defval as its value if it is not defined. void open (const ACE_TCHAR *varname, const T &defval); /// Returns the name of the variable being tracked. - const ACE_TCHAR *varname (void) const; + const ACE_TCHAR *varname () const; private: - void fetch_value (void); + void fetch_value (); const ACE_TCHAR *varname_; T value_; diff --git a/ACE/ace/Env_Value_T.inl b/ACE/ace/Env_Value_T.inl index 1fc1b863f03..f016e5c5f68 100644 --- a/ACE/ace/Env_Value_T.inl +++ b/ACE/ace/Env_Value_T.inl @@ -1,13 +1,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> ACE_INLINE -ACE_Env_Value<T>::operator T (void) +ACE_Env_Value<T>::operator T () { return value_; } template <class T> ACE_INLINE -ACE_Env_Value<T>::ACE_Env_Value (void) +ACE_Env_Value<T>::ACE_Env_Value () : varname_ (0) { } @@ -31,7 +31,7 @@ ACE_Env_Value<T>::open (const ACE_TCHAR *varname, } template <class T> ACE_INLINE void -ACE_Env_Value<T>::fetch_value (void) +ACE_Env_Value<T>::fetch_value () { #if defined (ACE_WIN32) const ACE_TCHAR *env = ACE_OS::getenv (this->varname_); @@ -45,13 +45,13 @@ ACE_Env_Value<T>::fetch_value (void) } template <class T> ACE_INLINE const ACE_TCHAR* -ACE_Env_Value<T>::varname (void) const +ACE_Env_Value<T>::varname () const { return this->varname_; } template <class T> ACE_INLINE -ACE_Env_Value<T>::~ACE_Env_Value (void) +ACE_Env_Value<T>::~ACE_Env_Value () { } diff --git a/ACE/ace/Event.cpp b/ACE/ace/Event.cpp index 20fe0730644..01918ec80e1 100644 --- a/ACE/ace/Event.cpp +++ b/ACE/ace/Event.cpp @@ -38,7 +38,7 @@ ACE_Event_T<TIME_POLICY>::ACE_Event_T (int manual_reset, } template <class TIME_POLICY> -ACE_Event_T<TIME_POLICY>::~ACE_Event_T (void) +ACE_Event_T<TIME_POLICY>::~ACE_Event_T () { } diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h index e8c9db91faf..d0ebcb0c160 100644 --- a/ACE/ace/Event.h +++ b/ACE/ace/Event.h @@ -49,11 +49,11 @@ public: LPSECURITY_ATTRIBUTES sa = 0); /// Implicitly destroy the event variable. - virtual ~ACE_Event_T (void); + virtual ~ACE_Event_T (); /// 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 event gets the time /// of day. diff --git a/ACE/ace/Event.inl b/ACE/ace/Event.inl index b8a688be71d..b369cd29649 100644 --- a/ACE/ace/Event.inl +++ b/ACE/ace/Event.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TIME_POLICY> ACE_Time_Value_T<TIME_POLICY> -ACE_Event_T<TIME_POLICY>::gettimeofday (void) const +ACE_Event_T<TIME_POLICY>::gettimeofday () const { return this->time_policy_ (); } diff --git a/ACE/ace/Event_Base.h b/ACE/ace/Event_Base.h index a158c5e67fe..aaef456772b 100644 --- a/ACE/ace/Event_Base.h +++ b/ACE/ace/Event_Base.h @@ -40,17 +40,17 @@ class ACE_Export ACE_Event_Base { public: /// Implicitly destroy the event variable. - virtual ~ACE_Event_Base (void); + virtual ~ACE_Event_Base (); /** * Explicitly destroy the event variable. Note that only one thread * should call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Underlying handle to event. - ACE_event_t handle (void) const; + ACE_event_t handle () const; /** * Set the underlying handle to event. Note that this method assumes @@ -70,7 +70,7 @@ public: * sleep till the event becomes signaled * event resets wait() completes. */ - int wait (void); + int wait (); /// Same as wait() above, but this one can be timed /// @a abstime is absolute time-of-day if if @a use_absolute_time @@ -87,7 +87,7 @@ public: * if thread(s) are waiting, wake up one waiting thread and * reset event */ - int signal (void); + int signal (); /** * if MANUAL reset @@ -97,13 +97,13 @@ public: * wakeup one waiting thread (if present) and * reset event */ - int pulse (void); + int pulse (); /// Set to nonsignaled state. - int reset (void); + int reset (); /// 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/Event_Base.inl b/ACE/ace/Event_Base.inl index fa8cf909e27..dc38a38f45c 100644 --- a/ACE/ace/Event_Base.inl +++ b/ACE/ace/Event_Base.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_event_t -ACE_Event_Base::handle (void) const +ACE_Event_Base::handle () const { return this->handle_; } diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index 6d70762a04a..ae23e7e82a4 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -83,10 +83,10 @@ public: }; /// Destructor is virtual to enable proper cleanup. - virtual ~ACE_Event_Handler (void); + virtual ~ACE_Event_Handler (); /// Get the I/O handle. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /// Set the I/O handle. virtual void set_handle (ACE_HANDLE); @@ -96,7 +96,7 @@ public: /// Get the priority of the Event_Handler. /// @note Priorities run from MIN_PRIORITY (which is the "lowest priority") /// to MAX_PRIORITY (which is the "highest priority"). - virtual int priority (void) const; + virtual int priority () const; /// Set the priority of the Event_Handler. virtual void priority (int priority); @@ -156,7 +156,7 @@ public: * @note This method has an affect only when used with the * ACE_Dev_Poll_Reactor (and then, only on Linux) or the ACE_TP_Reactor. */ - virtual int resume_handler (void); + virtual int resume_handler (); virtual int handle_qos (ACE_HANDLE = ACE_INVALID_HANDLE); virtual int handle_group_qos (ACE_HANDLE = ACE_INVALID_HANDLE); @@ -166,10 +166,10 @@ public: virtual void reactor (ACE_Reactor *reactor); /// Get the event demultiplexors. - virtual ACE_Reactor *reactor (void) const; + virtual ACE_Reactor *reactor () const; /// Get only the reactor's timer related interface. - virtual ACE_Reactor_Timer_Interface *reactor_timer_interface (void) const; + virtual ACE_Reactor_Timer_Interface *reactor_timer_interface () const; /** * Used to read from non-socket ACE_HANDLEs in our own thread to @@ -208,7 +208,7 @@ public: * * @return Current reference count. */ - virtual Reference_Count add_reference (void); + virtual Reference_Count add_reference (); /// Decrement reference count on the handler. /** @@ -219,7 +219,7 @@ public: * * @return Current reference count. */ - virtual Reference_Count remove_reference (void); + virtual Reference_Count remove_reference (); /** * @class Policy @@ -232,7 +232,7 @@ public: public: /// Virtual destructor. - virtual ~Policy (void); + virtual ~Policy (); }; /** @@ -263,7 +263,7 @@ public: }; /// Current Reference_Counting_Policy. - Value value (void) const; + Value value () const; /// Update Reference_Counting_Policy. void value (Value value); @@ -277,7 +277,7 @@ public: }; /// Current Reference_Counting_Policy. - Reference_Counting_Policy &reference_counting_policy (void); + Reference_Counting_Policy &reference_counting_policy (); protected: /// Force ACE_Event_Handler to be an abstract base class. @@ -313,7 +313,7 @@ class ACE_Export ACE_Event_Handler_var { public: /// Default constructor. - ACE_Event_Handler_var (void); + ACE_Event_Handler_var (); /// Construct with a handler. ACE_Event_Handler_var (ACE_Event_Handler *p); @@ -322,7 +322,7 @@ public: ACE_Event_Handler_var (const ACE_Event_Handler_var &b); /// Destructor. - ~ACE_Event_Handler_var (void); + ~ACE_Event_Handler_var (); /// Assignment to a handler. ACE_Event_Handler_var &operator= (ACE_Event_Handler *p); @@ -334,10 +334,10 @@ public: ACE_Event_Handler *operator-> () const; /// Access the handler. - ACE_Event_Handler *handler (void) const; + ACE_Event_Handler *handler () const; /// Release the handler. - ACE_Event_Handler *release (void); + ACE_Event_Handler *release (); /// Reset the handler. void reset (ACE_Event_Handler *p = 0); @@ -389,13 +389,13 @@ namespace ACE class ACE_Export ACE_Notification_Buffer { public: - ACE_Notification_Buffer (void); + ACE_Notification_Buffer (); ACE_Notification_Buffer (ACE_Event_Handler *eh, ACE_Reactor_Mask mask); /// Default destructor. - ~ACE_Notification_Buffer (void) = default; + ~ACE_Notification_Buffer () = default; /// Pointer to the Event_Handler that will be dispatched /// by the main event loop. diff --git a/ACE/ace/Framework_Component.h b/ACE/ace/Framework_Component.h index 8ffba2d5fac..20882ebe79c 100644 --- a/ACE/ace/Framework_Component.h +++ b/ACE/ace/Framework_Component.h @@ -67,11 +67,11 @@ public: const ACE_TCHAR *name = 0); /// Close the contained singleton. - virtual void close_singleton (void) = 0; + virtual void close_singleton () = 0; protected: /// Destructor. - virtual ~ACE_Framework_Component (void); + virtual ~ACE_Framework_Component (); private: /// Pointer to the actual component. @@ -106,21 +106,21 @@ public: /// Close down the repository and free up dynamically allocated /// resources. - ~ACE_Framework_Repository (void); + ~ACE_Framework_Repository (); /// Initialize the repository. int open (int size = DEFAULT_SIZE); /// Close down the repository and free up dynamically allocated /// resources, also called by dtor. - int close (void); + int close (); /// Get pointer to a process-wide ACE_Framework_Repository. static ACE_Framework_Repository *instance (int size = ACE_Framework_Repository::DEFAULT_SIZE); /// Delete the dynamically allocated Singleton. - static void close_singleton (void); + static void close_singleton (); // = Search structure operations (all acquire locks as necessary). @@ -136,13 +136,13 @@ public: int remove_dll_components (const ACE_TCHAR *dll_name); /// Return the current size of the repository. - int current_size (void) const; + int current_size () const; /// Return the total size of the repository. - int total_size (void) const; + int total_size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -157,7 +157,7 @@ private: /// Compact component_vector_ after components have been removed__maintains /// order. - void compact (void); + void compact (); private: /// Contains all the framework components. diff --git a/ACE/ace/Framework_Component.inl b/ACE/ace/Framework_Component.inl index e5d25bb2fe8..0ac8b7faa6a 100644 --- a/ACE/ace/Framework_Component.inl +++ b/ACE/ace/Framework_Component.inl @@ -18,7 +18,7 @@ ACE_Framework_Component::ACE_Framework_Component (void *_this, /***************************************************************/ ACE_INLINE int -ACE_Framework_Repository::current_size (void) const +ACE_Framework_Repository::current_size () const { ACE_TRACE ("ACE_Framework_Repository::current_size"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1); @@ -26,7 +26,7 @@ ACE_Framework_Repository::current_size (void) const } ACE_INLINE int -ACE_Framework_Repository::total_size (void) const +ACE_Framework_Repository::total_size () const { ACE_TRACE ("ACE_Framework_Repository::total_size"); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, const_cast <ACE_SYNCH_MUTEX&>(this->lock_), -1); diff --git a/ACE/ace/Framework_Component_T.cpp b/ACE/ace/Framework_Component_T.cpp index abefe8325b9..1c503d5dd4e 100644 --- a/ACE/ace/Framework_Component_T.cpp +++ b/ACE/ace/Framework_Component_T.cpp @@ -17,7 +17,7 @@ ACE_Framework_Component_T<Concrete>::ACE_Framework_Component_T (Concrete *concre } template <class Concrete> -ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T (void) +ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T () { ACE_TRACE ("ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T"); Concrete::close_singleton (); @@ -26,7 +26,7 @@ ACE_Framework_Component_T<Concrete>::~ACE_Framework_Component_T (void) ACE_ALLOC_HOOK_DEFINE_Tt(ACE_Framework_Component_T) template <class Concrete> void -ACE_Framework_Component_T<Concrete>::close_singleton (void) +ACE_Framework_Component_T<Concrete>::close_singleton () { ACE_TRACE ("ACE_Framework_Component_T<Concrete>::close_singleton"); Concrete::close_singleton (); diff --git a/ACE/ace/Framework_Component_T.h b/ACE/ace/Framework_Component_T.h index 5d5c3995586..a4e7d4ee356 100644 --- a/ACE/ace/Framework_Component_T.h +++ b/ACE/ace/Framework_Component_T.h @@ -40,10 +40,10 @@ public: ACE_Framework_Component_T (Concrete *concrete); /// Destructor. - ~ACE_Framework_Component_T (void); + ~ACE_Framework_Component_T (); /// Close the contained singleton. - void close_singleton (void); + void close_singleton (); ACE_ALLOC_HOOK_DECLARE; }; diff --git a/ACE/ace/Free_List.cpp b/ACE/ace/Free_List.cpp index 36eed6d47f4..e9e9c483fe5 100644 --- a/ACE/ace/Free_List.cpp +++ b/ACE/ace/Free_List.cpp @@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> -ACE_Free_List<T>::~ACE_Free_List (void) +ACE_Free_List<T>::~ACE_Free_List () { } @@ -42,7 +42,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::ACE_Locked_Free_List (int mode, // Destructor - removes all the elements from the free_list template <class T, class ACE_LOCK> -ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List (void) +ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List () { if (this->mode_ != ACE_PURE_FREE_LIST) while (this->free_list_ != 0) @@ -79,7 +79,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::add (T *element) // water mark. template <class T, class ACE_LOCK> T * -ACE_Locked_Free_List<T, ACE_LOCK>::remove (void) +ACE_Locked_Free_List<T, ACE_LOCK>::remove () { ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, 0)); @@ -103,7 +103,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::remove (void) // Returns the current size of the free list template <class T, class ACE_LOCK> size_t -ACE_Locked_Free_List<T, ACE_LOCK>::size (void) +ACE_Locked_Free_List<T, ACE_LOCK>::size () { return this->size_; } diff --git a/ACE/ace/Free_List.h b/ACE/ace/Free_List.h index 38ca93100e6..7f661d41db2 100644 --- a/ACE/ace/Free_List.h +++ b/ACE/ace/Free_List.h @@ -36,7 +36,7 @@ class ACE_Free_List { public: /// Destructor - removes all the elements from the free_list. - virtual ~ACE_Free_List (void); + virtual ~ACE_Free_List (); /// Inserts an element onto the free list (if it isn't past the high /// water mark). @@ -44,10 +44,10 @@ public: /// Takes a element off the freelist and returns it. It creates /// <inc> new elements if the size is at or below the low water mark. - virtual T *remove (void) = 0; + virtual T *remove () = 0; /// Returns the current size of the free list. - virtual size_t size (void) = 0; + virtual size_t size () = 0; /// Resizes the free list to @a newsize. virtual void resize (size_t newsize) = 0; @@ -82,7 +82,7 @@ public: size_t inc = ACE_DEFAULT_FREE_LIST_INC); /// Destructor - removes all the elements from the free_list. - virtual ~ACE_Locked_Free_List (void); + virtual ~ACE_Locked_Free_List (); /// Inserts an element onto the free list (if it isn't past the high /// water mark). @@ -90,10 +90,10 @@ public: /// Takes a element off the freelist and returns it. It creates /// <inc> new elements if the size is at or below the low water mark. - virtual T *remove (void); + virtual T *remove (); /// Returns the current size of the free list. - virtual size_t size (void); + virtual size_t size (); /// Resizes the free list to @a newsize. virtual void resize (size_t newsize); diff --git a/ACE/ace/Functor.h b/ACE/ace/Functor.h index 8920966639d..8a88dce9312 100644 --- a/ACE/ace/Functor.h +++ b/ACE/ace/Functor.h @@ -58,10 +58,10 @@ class ACE_Export ACE_Command_Base { public: /// Default constructor. - ACE_Command_Base (void); + ACE_Command_Base (); /// Virtual destructor. - virtual ~ACE_Command_Base (void); + virtual ~ACE_Command_Base (); /** * Invokes the method encapsulated by the command, passing along the diff --git a/ACE/ace/Functor.inl b/ACE/ace/Functor.inl index d50490d9f2d..c7d170c2e67 100644 --- a/ACE/ace/Functor.inl +++ b/ACE/ace/Functor.inl @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. ACE_INLINE -ACE_Command_Base::ACE_Command_Base (void) +ACE_Command_Base::ACE_Command_Base () { } diff --git a/ACE/ace/Functor_T.cpp b/ACE/ace/Functor_T.cpp index 9b99c5029ee..e71a64fb258 100644 --- a/ACE/ace/Functor_T.cpp +++ b/ACE/ace/Functor_T.cpp @@ -34,7 +34,7 @@ ACE_Command_Callback<RECEIVER, ACTION>::ACE_Command_Callback (RECEIVER &recvr, } template <class RECEIVER, class ACTION> -ACE_Command_Callback<RECEIVER, ACTION>::~ACE_Command_Callback (void) +ACE_Command_Callback<RECEIVER, ACTION>::~ACE_Command_Callback () { } diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index f89b683d567..c3b6deb2bb1 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -64,7 +64,7 @@ public: ACE_Command_Callback (RECEIVER &recvr, ACTION action); /// Virtual destructor. - virtual ~ACE_Command_Callback (void); + virtual ~ACE_Command_Callback (); /// Invokes the method @c action_ from the object @c receiver_. virtual int execute (void *arg = 0); @@ -89,14 +89,14 @@ template <class RECEIVER> class ACE_Member_Function_Command : public ACE_Command_Base { public: - typedef void (RECEIVER::*PTMF)(void); + typedef void (RECEIVER::*PTMF)(); /// Con Constructor: sets the <receiver_> of the Command to @a recvr, and the /// <action_> of the Command to <action>. ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf); /// Virtual destructor. - virtual ~ACE_Member_Function_Command (void); + virtual ~ACE_Member_Function_Command (); /// Invokes the method <action_> from the object <receiver_>. The /// parameter is ignored diff --git a/ACE/ace/Functor_T.inl b/ACE/ace/Functor_T.inl index 415a0090b42..8a4d1d01290 100644 --- a/ACE/ace/Functor_T.inl +++ b/ACE/ace/Functor_T.inl @@ -11,7 +11,7 @@ ACE_Member_Function_Command (RECEIVER &recvr, PTMF ptmf) template<class RECEIVER> ACE_INLINE ACE_Member_Function_Command<RECEIVER>:: -~ACE_Member_Function_Command (void) +~ACE_Member_Function_Command () { } diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h index fbe64a18a3b..e25fb23487c 100644 --- a/ACE/ace/Get_Opt.h +++ b/ACE/ace/Get_Opt.h @@ -428,9 +428,10 @@ private: /// Set last_option. void last_option (const ACE_TString &s); - // Disallow copying and assignment. - ACE_Get_Opt (const ACE_Get_Opt &); - ACE_Get_Opt &operator= (const ACE_Get_Opt &); + ACE_Get_Opt (const ACE_Get_Opt &) = delete; + ACE_Get_Opt &operator= (const ACE_Get_Opt &) = delete; + ACE_Get_Opt (ACE_Get_Opt &&) = delete; + ACE_Get_Opt &operator= (ACE_Get_Opt &&) = delete; private: diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index dd4f9a2b967..aa997fd4029 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -23,7 +23,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // ACE_ALLOC_HOOK_DEFINE(ACE_Guard) template <class ACE_LOCK> void -ACE_Guard<ACE_LOCK>::dump (void) const +ACE_Guard<ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump"); @@ -38,7 +38,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const // ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard) template <class ACE_LOCK> void -ACE_Write_Guard<ACE_LOCK>::dump (void) const +ACE_Write_Guard<ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Write_Guard<ACE_LOCK>::dump"); @@ -49,7 +49,7 @@ ACE_Write_Guard<ACE_LOCK>::dump (void) const // ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard) template <class ACE_LOCK> void -ACE_Read_Guard<ACE_LOCK>::dump (void) const +ACE_Read_Guard<ACE_LOCK>::dump () const { // ACE_TRACE ("ACE_Read_Guard<ACE_LOCK>::dump"); ACE_Guard<ACE_LOCK>::dump (); diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index 03fa8dba9bf..b90de0bced4 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -80,33 +80,33 @@ public: ACE_Guard (ACE_LOCK &l, bool block, int become_owner); /// Implicitly release the lock. - ~ACE_Guard (void); + ~ACE_Guard (); // = Lock accessors. /// Explicitly acquire the lock. - int acquire (void); + int acquire (); /// Conditionally acquire the lock (i.e., won't block). - int tryacquire (void); + int tryacquire (); /// Explicitly release the lock, but only if it is held! - int release (void); + int release (); /// Relinquish ownership of the lock so that it is not released /// implicitly in the destructor. - void disown (void); + void disown (); // = Utility methods. /// true if locked, false if couldn't acquire the lock /// (errno will contain the reason for this). - bool locked (void) const; + bool locked () const; /// Explicitly remove the lock. - int remove (void); + int remove (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -152,21 +152,21 @@ public: // = Lock accessors. /// Explicitly acquire the write lock. - int acquire_write (void); + int acquire_write (); /// Explicitly acquire the write lock. - int acquire (void); + int acquire (); /// Conditionally acquire the write lock (i.e., won't block). - int tryacquire_write (void); + int tryacquire_write (); /// Conditionally acquire the write lock (i.e., won't block). - int tryacquire (void); + int tryacquire (); // = Utility methods. /// Dump the state of an object. - void dump (void) const; + void dump () const; // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -196,21 +196,21 @@ public: // = Lock accessors. /// Explicitly acquire the read lock. - int acquire_read (void); + int acquire_read (); /// Explicitly acquire the read lock. - int acquire (void); + int acquire (); /// Conditionally acquire the read lock (i.e., won't block). - int tryacquire_read (void); + int tryacquire_read (); /// Conditionally acquire the read lock (i.e., won't block). - int tryacquire (void); + int tryacquire (); // = Utility methods. /// Dump the state of an object. - void dump (void) const; + void dump () const; // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -242,36 +242,36 @@ public: ACE_TSS_Guard (ACE_LOCK &lock, bool block = true); /// Implicitly release the thread-specific lock. - ~ACE_TSS_Guard (void); + ~ACE_TSS_Guard (); // = Lock accessors. /// Explicitly acquire the thread-specific lock. - int acquire (void); + int acquire (); /// Conditionally acquire the thread-specific lock (i.e., won't /// block). - int tryacquire (void); + int tryacquire (); /// Explicitly release the thread-specific lock. - int release (void); + int release (); // = Utility methods. /// Explicitly release the thread-specific lock. - int remove (void); + int remove (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Helper, meant for subclass only. - ACE_TSS_Guard (void); + ACE_TSS_Guard (); /// Initialize the key. - void init_key (void); + void init_key (); /// Called when thread exits to clean up the lock. static void cleanup (void *ptr); @@ -306,21 +306,21 @@ public: // = Lock accessors. /// Explicitly acquire the thread-specific write lock. - int acquire_write (void); + int acquire_write (); /// Explicitly acquire the thread-specific write lock. - int acquire (void); + int acquire (); /// Conditionally acquire the thread-specific write lock (i.e., won't block). - int tryacquire_write (void); + int tryacquire_write (); /// Conditionally acquire the thread-specific write lock (i.e., won't block). - int tryacquire (void); + int tryacquire (); // = Utility methods. /// Dump the state of an object. - void dump (void) const; + void dump () const; // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. @@ -348,22 +348,22 @@ public: // = Lock accessors. /// Explicitly acquire the thread-specific read lock. - int acquire_read (void); + int acquire_read (); /// Explicitly acquire the thread-specific read lock. - int acquire (void); + int acquire (); /// Conditionally acquire the thread-specific read lock (i.e., won't /// block). - int tryacquire_read (void); + int tryacquire_read (); /// Conditionally acquire the thread-specific read lock (i.e., won't /// block). - int tryacquire (void); + int tryacquire (); // = Utility methods. /// Dump the state of an object. - void dump (void) const; + void dump () const; // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. diff --git a/ACE/ace/Guard_T.inl b/ACE/ace/Guard_T.inl index 02d6989cdc0..7135fc32cb0 100644 --- a/ACE/ace/Guard_T.inl +++ b/ACE/ace/Guard_T.inl @@ -6,19 +6,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_LOCK> ACE_INLINE int -ACE_Guard<ACE_LOCK>::acquire (void) +ACE_Guard<ACE_LOCK>::acquire () { return this->owner_ = this->lock_->acquire (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Guard<ACE_LOCK>::tryacquire (void) +ACE_Guard<ACE_LOCK>::tryacquire () { return this->owner_ = this->lock_->tryacquire (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Guard<ACE_LOCK>::release (void) +ACE_Guard<ACE_LOCK>::release () { if (this->owner_ == -1) return -1; @@ -59,25 +59,25 @@ ACE_Guard<ACE_LOCK>::ACE_Guard (ACE_LOCK &l, bool /* block */, int become_owner) // lock. template <class ACE_LOCK> ACE_INLINE -ACE_Guard<ACE_LOCK>::~ACE_Guard (void) +ACE_Guard<ACE_LOCK>::~ACE_Guard () { this->release (); } template <class ACE_LOCK> ACE_INLINE bool -ACE_Guard<ACE_LOCK>::locked (void) const +ACE_Guard<ACE_LOCK>::locked () const { return this->owner_ != -1; } template <class ACE_LOCK> ACE_INLINE int -ACE_Guard<ACE_LOCK>::remove (void) +ACE_Guard<ACE_LOCK>::remove () { return this->lock_->remove (); } template <class ACE_LOCK> ACE_INLINE void -ACE_Guard<ACE_LOCK>::disown (void) +ACE_Guard<ACE_LOCK>::disown () { this->owner_ = -1; } @@ -90,25 +90,25 @@ ACE_Write_Guard<ACE_LOCK>::ACE_Write_Guard (ACE_LOCK &m) } template <class ACE_LOCK> ACE_INLINE int -ACE_Write_Guard<ACE_LOCK>::acquire_write (void) +ACE_Write_Guard<ACE_LOCK>::acquire_write () { return this->owner_ = this->lock_->acquire_write (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Write_Guard<ACE_LOCK>::acquire (void) +ACE_Write_Guard<ACE_LOCK>::acquire () { return this->owner_ = this->lock_->acquire_write (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Write_Guard<ACE_LOCK>::tryacquire_write (void) +ACE_Write_Guard<ACE_LOCK>::tryacquire_write () { return this->owner_ = this->lock_->tryacquire_write (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Write_Guard<ACE_LOCK>::tryacquire (void) +ACE_Write_Guard<ACE_LOCK>::tryacquire () { return this->owner_ = this->lock_->tryacquire_write (); } @@ -125,25 +125,25 @@ ACE_Write_Guard<ACE_LOCK>::ACE_Write_Guard (ACE_LOCK &m, } template <class ACE_LOCK> ACE_INLINE int -ACE_Read_Guard<ACE_LOCK>::acquire_read (void) +ACE_Read_Guard<ACE_LOCK>::acquire_read () { return this->owner_ = this->lock_->acquire_read (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Read_Guard<ACE_LOCK>::acquire (void) +ACE_Read_Guard<ACE_LOCK>::acquire () { return this->owner_ = this->lock_->acquire_read (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Read_Guard<ACE_LOCK>::tryacquire_read (void) +ACE_Read_Guard<ACE_LOCK>::tryacquire_read () { return this->owner_ = this->lock_->tryacquire_read (); } template <class ACE_LOCK> ACE_INLINE int -ACE_Read_Guard<ACE_LOCK>::tryacquire (void) +ACE_Read_Guard<ACE_LOCK>::tryacquire () { return this->owner_ = this->lock_->tryacquire_read (); } diff --git a/ACE/ace/Handle_Set.h b/ACE/ace/Handle_Set.h index 4e4cf36ab94..33a9728a62d 100644 --- a/ACE/ace/Handle_Set.h +++ b/ACE/ace/Handle_Set.h @@ -63,7 +63,7 @@ public: }; /// Constructor, initializes the bitmask to all 0s. - ACE_Handle_Set (void); + ACE_Handle_Set (); /** * Constructor, initializes the handle set from a given mask. @@ -72,7 +72,7 @@ public: // = Methods for manipulating bitsets. /// Initialize the bitmask to all 0s and reset the associated fields. - void reset (void); + void reset (); /** * Checks whether @a handle is enabled. No range checking is @@ -90,10 +90,10 @@ public: void clr_bit (ACE_HANDLE handle); /// Returns a count of the number of enabled bits. - int num_set (void) const; + int num_set () const; /// Returns the number of the large bit. - ACE_HANDLE max_set (void) const; + ACE_HANDLE max_set () const; /** * Rescan the underlying @c fd_set up to handle @a max to find the new @@ -110,7 +110,7 @@ public: /// Returns a pointer to the underlying @c fd_set. Returns 0 if /// there are no handle bits set (<size_> == 0). - fd_set *fdset (void); + fd_set *fdset (); #if defined (ACE_HAS_BIG_FD_SET) /// Assignment operator optimizes for cases where <size_> == 0. @@ -118,7 +118,7 @@ public: #endif /* ACE_HAS_BIG_FD_SET */ /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -177,11 +177,11 @@ public: ACE_Handle_Set_Iterator (const ACE_Handle_Set &hs); /// Default dtor. - ~ACE_Handle_Set_Iterator (void); + ~ACE_Handle_Set_Iterator (); /// Reset the state of the iterator by reinitializing the state /// that we maintain. - void reset_state (void); + void reset_state (); /** * "Next" operator. Returns the next unseen ACE_HANDLE in the @@ -190,10 +190,10 @@ public: * the iterator automatically, so you need not call <operator++> * (which is now obsolete). */ - ACE_HANDLE operator () (void); + ACE_HANDLE operator () (); /// 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/Handle_Set.inl b/ACE/ace/Handle_Set.inl index db76152f168..c156c78c846 100644 --- a/ACE/ace/Handle_Set.inl +++ b/ACE/ace/Handle_Set.inl @@ -11,7 +11,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Initialize the bitmask to all 0s and reset the associated fields. ACE_INLINE void -ACE_Handle_Set::reset (void) +ACE_Handle_Set::reset () { ACE_TRACE ("ACE_Handle_Set::reset"); this->max_handle_ = @@ -53,7 +53,7 @@ ACE_Handle_Set::operator = (const ACE_Handle_Set &rhs) // Returns the number of the large bit. ACE_INLINE ACE_HANDLE -ACE_Handle_Set::max_set (void) const +ACE_Handle_Set::max_set () const { ACE_TRACE ("ACE_Handle_Set::max_set"); return this->max_handle_; @@ -133,7 +133,7 @@ ACE_Handle_Set::clr_bit (ACE_HANDLE handle) // Returns a count of the number of enabled bits. ACE_INLINE int -ACE_Handle_Set::num_set (void) const +ACE_Handle_Set::num_set () const { ACE_TRACE ("ACE_Handle_Set::num_set"); #if defined (ACE_HANDLE_SET_USES_FD_ARRAY) @@ -159,7 +159,7 @@ ACE_Handle_Set::operator fd_set *() // Returns a pointer to the underlying fd_set. ACE_INLINE fd_set * -ACE_Handle_Set::fdset (void) +ACE_Handle_Set::fdset () { ACE_TRACE ("ACE_Handle_Set::fdset"); @@ -170,7 +170,7 @@ ACE_Handle_Set::fdset (void) } ACE_INLINE -ACE_Handle_Set_Iterator::~ACE_Handle_Set_Iterator (void) +ACE_Handle_Set_Iterator::~ACE_Handle_Set_Iterator () { } diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp index 604cab1207a..579b7784b56 100644 --- a/ACE/ace/Hash_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Map_Manager_T.cpp @@ -54,7 +54,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::ACE_Hash_Map_Entry (const EXT_ID &ext_id, } template <class EXT_ID, class INT_ID> -ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry (void) +ACE_Hash_Map_Entry<EXT_ID, INT_ID>::~ACE_Hash_Map_Entry () { } @@ -83,7 +83,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::item () const } template <class EXT_ID, class INT_ID> void -ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const +ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -94,7 +94,7 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -162,7 +162,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::open } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close_i () { // Protect against "double-deletion" in case the destructor also // gets called. @@ -197,7 +197,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all_i () { // Iterate through the entire map calling the destuctor of each // <ACE_Hash_Map_Entry>. @@ -398,7 +398,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin // ------------------------------------------------------------ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); @@ -409,7 +409,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -439,7 +439,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i"); @@ -470,7 +470,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: // ------------------------------------------------------------ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); @@ -481,7 +481,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -511,7 +511,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i"); diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index 561a7273c1f..755283eb302 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -45,19 +45,19 @@ public: ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev); /// Destructor. - ~ACE_Hash_Map_Entry (void); + ~ACE_Hash_Map_Entry (); /// Key accessor. - EXT_ID& key (void); + EXT_ID& key (); /// Read-only key accessor. - const EXT_ID& key (void) const; + const EXT_ID& key () const; /// Item accessor. - INT_ID& item (void); + INT_ID& item (); /// Read-only item accessor. - const INT_ID& item (void) const; + const INT_ID& item () const; /// Key used to look up an entry. /// @deprecated Use key() @@ -74,7 +74,7 @@ public: ACE_Hash_Map_Entry<EXT_ID, INT_ID> *prev_; /// Dump the state of an object. - void dump (void) const; + void dump () const; }; // Forward decl. @@ -223,13 +223,13 @@ public: /// Close down the ACE_Hash_Map_Manager_Ex and release dynamically allocated /// resources. - int close (void); + int close (); /// Removes all the entries in the ACE_Hash_Map_Manager_Ex. - int unbind_all (void); + int unbind_all (); /// Cleanup the ACE_Hash_Map_Manager_Ex. - ~ACE_Hash_Map_Manager_Ex (void); + ~ACE_Hash_Map_Manager_Ex (); /** * Associate @a item with @a int_id. If @a item is already in the @@ -390,11 +390,11 @@ public: /// Returns the current number of ACE_Hash_Map_Entry objects in the /// hash table. - size_t current_size (void) const; + size_t current_size () const; /// Return the size of the array that's used to point to the /// linked lists of ACE_Hash_Map_Entry objects in the hash table. - size_t total_size (void) const; + size_t total_size () const; /** * Returns a reference to the underlying <ACE_LOCK>. This makes it @@ -404,24 +404,24 @@ public: * guard the state of an iterator. * @note The right name would be <lock>, but HP/C++ will choke on that! */ - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL styled iterator factory functions. /// Return forward iterator. - iterator begin (void); - iterator end (void); - const_iterator begin (void) const; - const_iterator end (void) const; + iterator begin (); + iterator end (); + const_iterator begin () const; + const_iterator end () const; /// Return reverse iterator. - reverse_iterator rbegin (void); - reverse_iterator rend (void); - const_reverse_iterator rbegin (void) const; - const_reverse_iterator rend (void) const; + reverse_iterator rbegin (); + reverse_iterator rend (); + const_reverse_iterator rbegin () const; + const_reverse_iterator rend () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -523,11 +523,11 @@ protected: /// Close down a <Map_Manager_Ex>. Must be called with /// locks held. - int close_i (void); + int close_i (); /// Removes all the entries in <Map_Manager_Ex>. Must be called with /// locks held. - int unbind_all_i (void); + int unbind_all_i (); /// Pointer to a memory allocator used for table_, so it should /// supply size*sizeof (ACE_Hash_Map_Entry<EXT_ID, INT_ID>), @@ -555,7 +555,7 @@ protected: size_t &loc); /// Accessor of the underlying table - ACE_Hash_Map_Entry<EXT_ID, INT_ID> *table (void); + ACE_Hash_Map_Entry<EXT_ID, INT_ID> *table (); private: /** @@ -634,17 +634,17 @@ public: int next (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the Hash_Map_Manager_Ex that is being iterated /// over. - ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -656,14 +656,14 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -710,17 +710,17 @@ public: int next (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the Hash_Map_Manager_Ex that is being iterated /// over. - const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -732,14 +732,14 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -798,21 +798,21 @@ public: // = Iteration methods. /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -854,21 +854,21 @@ public: // = Iteration methods. /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -918,26 +918,26 @@ public: // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); /// Returns a reference to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns a pointer to the interal element @c this is pointing to. - ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> (void) const; + ACE_Hash_Map_Entry<EXT_ID, INT_ID>* operator-> () const; /// Returns reference the Hash_Map_Manager_Ex that is being iterated /// over. - ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (void); + ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &) const; @@ -946,11 +946,11 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backward by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Map we are iterating over. ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> *map_man_; @@ -996,21 +996,21 @@ public: /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix reverse. - ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix reverse. ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix advance. - ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix advance. ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -1052,21 +1052,21 @@ public: /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix reverse. - ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (void); + ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator++ (); /// Postfix reverse. ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix advance. - ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (void); + ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> &operator-- (); /// Postfix advance. ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> operator-- (int); diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl index 7af638f58f0..479bbe9c11f 100644 --- a/ACE/ace/Hash_Map_Manager_T.inl +++ b/ACE/ace/Hash_Map_Manager_T.inl @@ -32,7 +32,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close () { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -40,7 +40,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::close } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbind_all () { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -48,25 +48,25 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::unbin } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Map_Manager_Ex (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::~ACE_Hash_Map_Manager_Ex () { this->close (); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::current_size () const { return this->cur_size_; } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE size_t -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::total_size () const { return this->total_size_; } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_LOCK & -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::mutex (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::mutex () { ACE_TRACE ("ACE_Hash_Map_Manager_Ex::mutex"); return this->lock_; @@ -372,63 +372,63 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rebin template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin () { return iterator (*this); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end () { return iterator (*this, 1); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::begin () const { return const_iterator (*this); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end (void) const +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::end () const { return const_iterator (*this, 1); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin () { return reverse_iterator (*this); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_iterator -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend () { return reverse_iterator (*this, 1); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_reverse_iterator - ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin (void) const + ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rbegin () const { return const_reverse_iterator (*this); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE typename ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::const_reverse_iterator - ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend (void) const + ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::rend () const { return const_reverse_iterator (*this, 1); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::table (void) +ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::table () { return this->table_; } @@ -536,7 +536,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done"); @@ -547,7 +547,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -562,7 +562,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -579,7 +579,7 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: // iterated over. template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& -ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void) +ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map () { ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map"); return *this->map_man_; @@ -634,7 +634,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done (void) const +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done () const { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::done"); @@ -645,7 +645,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -660,7 +660,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); ACE_Hash_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -677,7 +677,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ // iterated over. template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE const ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>& -ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void) +ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map"); return *this->map_man_; @@ -702,7 +702,7 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -751,7 +751,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance"); return this->forward_i (); @@ -759,7 +759,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::adva template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -780,7 +780,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); @@ -800,7 +800,7 @@ ACE_Hash_Map_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::oper } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -821,7 +821,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance"); return this->forward_i (); @@ -829,7 +829,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -850,7 +850,7 @@ ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); @@ -886,7 +886,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -907,7 +907,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); @@ -927,7 +927,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -936,7 +936,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> int -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::reverse_i"); @@ -946,7 +946,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> & -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator*"); @@ -955,7 +955,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Entry<EXT_ID, INT_ID> * -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator->"); @@ -964,7 +964,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map (void) +ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map () { ACE_TRACE ("ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::map"); return *this->map_man_; @@ -989,7 +989,7 @@ ACE_Hash_Map_Bucket_Iterator<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>:: } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -1008,7 +1008,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance"); return this->reverse_i (); @@ -1016,7 +1016,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -1037,7 +1037,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); @@ -1057,7 +1057,7 @@ ACE_Hash_Map_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -1076,7 +1076,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::advance"); return this->reverse_i (); @@ -1084,7 +1084,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -1105,7 +1105,7 @@ ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> & -ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_Hash_Map_Const_Reverse_Iterator_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); 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/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h index 848ec99040c..ff4d544159b 100644 --- a/ACE/ace/High_Res_Timer.h +++ b/ACE/ace/High_Res_Timer.h @@ -120,7 +120,7 @@ public: static void global_scale_factor (global_scale_factor_type gsf); /// Returns the global_scale_factor. - static global_scale_factor_type global_scale_factor (void); + static global_scale_factor_type global_scale_factor (); #ifndef ACE_HR_SCALE_CONVERSION # define ACE_HR_SCALE_CONVERSION (ACE_ONE_SECOND_IN_USECS) @@ -151,13 +151,13 @@ public: const u_int iterations = 10); /// Initialize the timer. - ACE_High_Res_Timer (void); + ACE_High_Res_Timer (); /// Destructor. - ~ACE_High_Res_Timer (void); + ~ACE_High_Res_Timer (); /// Reinitialize the timer. - void reset (void); + void reset (); /// Start timing. void start (const ACE_OS::ACE_HRTimer_Op = ACE_OS::ACE_HRTIMER_GETTIME); @@ -213,7 +213,7 @@ public: ACE_HANDLE handle = ACE_STDOUT) const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -224,7 +224,7 @@ public: * as the gettimeofday function, thereby basing the timer calculations * on the high res timer rather than wall clock time. */ - static ACE_Time_Value gettimeofday_hr (void); + static ACE_Time_Value gettimeofday_hr (); /** * @deprecated THIS FUNCTION IS DEPRECATED. PLEASE USE @@ -252,7 +252,7 @@ public: * factor. If there are any problems getting it, we just return 1 * (the default). */ - static ACE_UINT32 get_cpuinfo (void); + static ACE_UINT32 get_cpuinfo (); #endif /* defined (ACE_LINUX) && !ACE_LACKS_SSCANF */ private: diff --git a/ACE/ace/High_Res_Timer.inl b/ACE/ace/High_Res_Timer.inl index fd0a1e8b088..34dc21d383b 100644 --- a/ACE/ace/High_Res_Timer.inl +++ b/ACE/ace/High_Res_Timer.inl @@ -69,7 +69,7 @@ ACE_High_Res_Timer::gettimeofday (const ACE_OS::ACE_HRTimer_Op op) /// function, which is deprecated. If it gets removed, please move the /// code down here, intact. ACE_INLINE ACE_Time_Value -ACE_High_Res_Timer::gettimeofday_hr (void) +ACE_High_Res_Timer::gettimeofday_hr () { return ACE_High_Res_Timer::gettimeofday (); } @@ -106,7 +106,7 @@ ACE_High_Res_Timer::elapsed_hrtime (const ACE_hrtime_t end, } ACE_INLINE -ACE_High_Res_Timer::~ACE_High_Res_Timer (void) +ACE_High_Res_Timer::~ACE_High_Res_Timer () { } 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/Intrusive_Auto_Ptr.cpp b/ACE/ace/Intrusive_Auto_Ptr.cpp index 69ecffe2852..c437ce99e42 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.cpp +++ b/ACE/ace/Intrusive_Auto_Ptr.cpp @@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tc(ACE_Intrusive_Auto_Ptr) template <class X> -ACE_Intrusive_Auto_Ptr<X>::~ACE_Intrusive_Auto_Ptr (void) +ACE_Intrusive_Auto_Ptr<X>::~ACE_Intrusive_Auto_Ptr () { reset (0); } diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h index 36ff94901b8..c2eae90691b 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.h +++ b/ACE/ace/Intrusive_Auto_Ptr.h @@ -73,7 +73,7 @@ public: /// Destructor. Releases the reference to the underlying representation. /// If the release of that reference causes its reference count to reach 0, /// the representation object will also be destroyed. - virtual ~ACE_Intrusive_Auto_Ptr (void); + virtual ~ACE_Intrusive_Auto_Ptr (); /// Assignment operator that binds the current object and @a r to the same /// ACE_Intrusive_Auto_Ptr_Rep. An ACE_Intrusive_Auto_Ptr_Rep @@ -81,24 +81,24 @@ public: void operator = (const ACE_Intrusive_Auto_Ptr<X> &r); /// Redirection operator - X *operator-> (void) const; + X *operator-> () const; /// Accessor method. X &operator *() const; /// Releases the reference to the underlying representation object. /// @retval The pointer value prior to releasing it. - X *release (void); + X *release (); /// Releases the current pointer value and then sets a new /// pointer value specified by @a p. void reset (X *p = 0); /// Get the pointer value. - X *get (void) const; + X *get () const; /// Get the reference count value. - long count (void) const; + long count () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Intrusive_Auto_Ptr.inl b/ACE/ace/Intrusive_Auto_Ptr.inl index a37f2f3b25b..f208d6feb4b 100644 --- a/ACE/ace/Intrusive_Auto_Ptr.inl +++ b/ACE/ace/Intrusive_Auto_Ptr.inl @@ -21,7 +21,7 @@ ACE_Intrusive_Auto_Ptr<X>::ACE_Intrusive_Auto_Ptr (const ACE_Intrusive_Auto_Ptr< } template <class X> ACE_INLINE X * -ACE_Intrusive_Auto_Ptr<X>::operator-> (void) const +ACE_Intrusive_Auto_Ptr<X>::operator-> () const { return this->rep_; } @@ -33,14 +33,14 @@ ACE_Intrusive_Auto_Ptr<X>::operator *() const } template <class X> ACE_INLINE X* -ACE_Intrusive_Auto_Ptr<X>::get (void) const +ACE_Intrusive_Auto_Ptr<X>::get () const { // We return the ACE_Future_rep. return this->rep_; } template<class X> ACE_INLINE X * -ACE_Intrusive_Auto_Ptr<X>::release (void) +ACE_Intrusive_Auto_Ptr<X>::release () { X *p = this->rep_; if (this->rep_ != 0) diff --git a/ACE/ace/Intrusive_List.cpp b/ACE/ace/Intrusive_List.cpp index 0623adbe493..54bafc4c7b7 100644 --- a/ACE/ace/Intrusive_List.cpp +++ b/ACE/ace/Intrusive_List.cpp @@ -14,14 +14,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> -ACE_Intrusive_List<T>::ACE_Intrusive_List (void) +ACE_Intrusive_List<T>::ACE_Intrusive_List () : head_ (0) , tail_ (0) { } template<class T> -ACE_Intrusive_List<T>::~ACE_Intrusive_List (void) +ACE_Intrusive_List<T>::~ACE_Intrusive_List () { } @@ -64,7 +64,7 @@ ACE_Intrusive_List<T>::push_front (T *node) } template<class T> T * -ACE_Intrusive_List<T>::pop_front (void) +ACE_Intrusive_List<T>::pop_front () { T *node = this->head_; if (node != 0) @@ -75,7 +75,7 @@ ACE_Intrusive_List<T>::pop_front (void) } template<class T> T * -ACE_Intrusive_List<T>::pop_back (void) +ACE_Intrusive_List<T>::pop_back () { T *node = this->tail_; if (node != 0) diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index 2ed02750b35..d5ba0534d41 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -57,15 +57,15 @@ class ACE_Intrusive_List public: /// Constructor. Use user specified allocation strategy /// if specified. - ACE_Intrusive_List (void); + ACE_Intrusive_List (); /// Destructor. - ~ACE_Intrusive_List (void); + ~ACE_Intrusive_List (); // = Check boundary conditions. /// Returns true if the container is empty, otherwise returns false. - bool is_empty (void) const; + bool is_empty () const; /// Insert an element at the beginning of the list void push_front (T *node); @@ -74,16 +74,16 @@ public: void push_back (T *node); /// Remove the element at the beginning of the list - T *pop_front (void); + T *pop_front (); /// Remove the element at the end of the list - T *pop_back (void); + T *pop_back (); /// Get the element at the head of the queue - T *head (void) const; + T *head () const; /// Get the element at the tail of the queue - T *tail (void) const; + T *tail () const; /// Remove a element from the list /** diff --git a/ACE/ace/Intrusive_List.inl b/ACE/ace/Intrusive_List.inl index 17d7a15653e..ae004a341a0 100644 --- a/ACE/ace/Intrusive_List.inl +++ b/ACE/ace/Intrusive_List.inl @@ -4,19 +4,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> ACE_INLINE bool -ACE_Intrusive_List<T>::is_empty (void) const +ACE_Intrusive_List<T>::is_empty () const { return this->head_ == 0; } template<class T> ACE_INLINE T * -ACE_Intrusive_List<T>::head (void) const +ACE_Intrusive_List<T>::head () const { return this->head_; } template<class T> ACE_INLINE T * -ACE_Intrusive_List<T>::tail (void) const +ACE_Intrusive_List<T>::tail () const { return this->tail_; } diff --git a/ACE/ace/Intrusive_List_Node.cpp b/ACE/ace/Intrusive_List_Node.cpp index 830ea4b1ce7..74f27993d02 100644 --- a/ACE/ace/Intrusive_List_Node.cpp +++ b/ACE/ace/Intrusive_List_Node.cpp @@ -14,7 +14,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> -ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node (void) +ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node () : prev_ (0) , next_ (0) { diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index 732a5179242..366083712e5 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -44,9 +44,9 @@ public: * */ //@{ - T *prev (void) const; + T *prev () const; void prev (T *); - T *next (void) const; + T *next () const; void next (T *); //@} @@ -56,7 +56,7 @@ protected: * The constructor is protected, because only derived classes should * be instantiated. */ - ACE_Intrusive_List_Node (void); + ACE_Intrusive_List_Node (); private: /// Head and tail of the list diff --git a/ACE/ace/Intrusive_List_Node.inl b/ACE/ace/Intrusive_List_Node.inl index 220453adc46..d26a78a4179 100644 --- a/ACE/ace/Intrusive_List_Node.inl +++ b/ACE/ace/Intrusive_List_Node.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> ACE_INLINE T* -ACE_Intrusive_List_Node<T>::prev (void) const +ACE_Intrusive_List_Node<T>::prev () const { return this->prev_; } @@ -14,7 +14,7 @@ ACE_Intrusive_List_Node<T>::prev (T *x) } template<class T> ACE_INLINE T* -ACE_Intrusive_List_Node<T>::next (void) const +ACE_Intrusive_List_Node<T>::next () const { return this->next_; } diff --git a/ACE/ace/Lock.h b/ACE/ace/Lock.h index f1318800153..2216a6f5581 100644 --- a/ACE/ace/Lock.h +++ b/ACE/ace/Lock.h @@ -42,45 +42,45 @@ class ACE_Export ACE_Lock { public: /// CE needs a default constructor here. - ACE_Lock (void); + ACE_Lock (); /// Noop virtual destructor - virtual ~ACE_Lock (void); + virtual ~ACE_Lock (); /** * Explicitly destroy the lock. Note that only one thread should * call this method since it doesn't protect against race * conditions. */ - virtual int remove (void) = 0; + virtual int remove () = 0; /// Block the thread until the lock is acquired. Returns -1 on /// failure. - virtual int acquire (void) = 0; + virtual int acquire () = 0; /** * Conditionally acquire the lock (i.e., won't block). Returns -1 * on failure. If we "failed" because someone else already had the * lock, @c errno is set to @c EBUSY. */ - virtual int tryacquire (void) = 0; + virtual int tryacquire () = 0; /// Release the lock. Returns -1 on failure. - virtual int release (void) = 0; + virtual int release () = 0; /** * Block until the thread acquires a read lock. If the locking * mechanism doesn't support read locks then this just calls * acquire(). Returns -1 on failure. */ - virtual int acquire_read (void) = 0; + virtual int acquire_read () = 0; /** * Block until the thread acquires a write lock. If the locking * mechanism doesn't support read locks then this just calls * acquire(). Returns -1 on failure. */ - virtual int acquire_write (void) = 0; + virtual int acquire_write () = 0; /** * Conditionally acquire a read lock. If the locking mechanism @@ -88,7 +88,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - virtual int tryacquire_read (void) = 0; + virtual int tryacquire_read () = 0; /** * Conditionally acquire a write lock. If the locking mechanism @@ -96,14 +96,14 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - virtual int tryacquire_write (void) = 0; + virtual int tryacquire_write () = 0; /** * Conditionally try to upgrade a lock held for read to a write lock. * If the locking mechanism doesn't support read locks then this just * calls acquire(). Returns 0 on success, -1 on failure. */ - virtual int tryacquire_write_upgrade (void) = 0; + virtual int tryacquire_write_upgrade () = 0; }; /** @@ -123,20 +123,20 @@ class ACE_Export ACE_Adaptive_Lock : public ACE_Lock public: /// You must also override the destructor function to match with how /// you construct the underneath @c lock_. - virtual ~ACE_Adaptive_Lock (void); + virtual ~ACE_Adaptive_Lock (); // = Lock/unlock operations. - virtual int remove (void); - virtual int acquire (void); - virtual int tryacquire (void); - virtual int release (void); - virtual int acquire_read (void); - virtual int acquire_write (void); - virtual int tryacquire_read (void); - virtual int tryacquire_write (void); - virtual int tryacquire_write_upgrade (void); - void dump (void) const; + virtual int remove (); + virtual int acquire (); + virtual int tryacquire (); + virtual int release (); + virtual int acquire_read (); + virtual int acquire_write (); + virtual int tryacquire_read (); + virtual int tryacquire_write (); + virtual int tryacquire_write_upgrade (); + void dump () const; protected: /** @@ -144,7 +144,7 @@ protected: * The default constructor simply set the @c lock_ to 0 (null). You * must overwrite this method for this class to work. */ - ACE_Adaptive_Lock (void); + ACE_Adaptive_Lock (); ACE_Lock *lock_; }; diff --git a/ACE/ace/Lock.inl b/ACE/ace/Lock.inl index 43b4bac0898..f2ad9996716 100644 --- a/ACE/ace/Lock.inl +++ b/ACE/ace/Lock.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Lock::ACE_Lock (void) +ACE_Lock::ACE_Lock () { } diff --git a/ACE/ace/Lock_Adapter_T.cpp b/ACE/ace/Lock_Adapter_T.cpp index 0068e8ae0d1..9bf13d3fc9a 100644 --- a/ACE/ace/Lock_Adapter_T.cpp +++ b/ACE/ace/Lock_Adapter_T.cpp @@ -15,7 +15,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_LOCKING_MECHANISM> -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter () { if (this->delete_lock_) delete this->lock_; @@ -23,14 +23,14 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::~ACE_Lock_Adapter (void) // Explicitly destroy the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::remove (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::remove () { return this->lock_->remove (); } // Block the thread until the lock is acquired. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire () { return this->lock_->acquire (); } @@ -38,7 +38,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire (void) // Conditionally acquire the lock (i.e., won't block). template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire () { return this->lock_->tryacquire (); } @@ -46,7 +46,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire (void) // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release () { return this->lock_->release (); } @@ -56,7 +56,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::release (void) // <acquire>. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read () { return this->lock_->acquire_read (); } @@ -66,7 +66,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_read (void) // <acquire>. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write () { return this->lock_->acquire_write (); } @@ -75,7 +75,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::acquire_write (void) // doesn't support read locks then this just calls <acquire>. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read () { return this->lock_->tryacquire_read (); } @@ -84,7 +84,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_read (void) // doesn't support write locks then this just calls <acquire>. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write () { return this->lock_->tryacquire_write (); } @@ -94,7 +94,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void) // calls <acquire>. Returns 0 on success, -1 on failure. template <class ACE_LOCKING_MECHANISM> int -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade () { return this->lock_->tryacquire_write_upgrade (); } diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h index 2e1f0a53290..ece637ae264 100644 --- a/ACE/ace/Lock_Adapter_T.h +++ b/ACE/ace/Lock_Adapter_T.h @@ -46,53 +46,53 @@ public: /// Constructor. Since no lock is provided by the user, one will be /// created internally. - ACE_Lock_Adapter (void); + ACE_Lock_Adapter (); /// Destructor. If @c lock_ was not passed in by the user, it will be /// deleted. - virtual ~ACE_Lock_Adapter (void); + virtual ~ACE_Lock_Adapter (); // = Lock accessors. /// Block the thread until the lock is acquired. - virtual int acquire (void); + virtual int acquire (); /// Conditionally acquire the lock (i.e., won't block). - virtual int tryacquire (void); + virtual int tryacquire (); /// Release the lock. - virtual int release (void); + virtual int release (); /** * Block until the thread acquires a read lock. If the locking * mechanism doesn't support read locks then this just calls * acquire(). */ - virtual int acquire_read (void); + virtual int acquire_read (); /** * Block until the thread acquires a write lock. If the locking * mechanism doesn't support read locks then this just calls * acquire(). */ - virtual int acquire_write (void); + virtual int acquire_write (); /// Conditionally acquire a read lock. If the locking mechanism /// doesn't support read locks then this just calls acquire(). - virtual int tryacquire_read (void); + virtual int tryacquire_read (); /// Conditionally acquire a write lock. If the locking mechanism /// doesn't support read locks then this just calls acquire(). - virtual int tryacquire_write (void); + virtual int tryacquire_write (); /** * Conditionally try to upgrade a lock held for read to a write lock. * If the locking mechanism doesn't support read locks then this just * calls acquire(). Returns 0 on success, -1 on failure. */ - virtual int tryacquire_write_upgrade (void); + virtual int tryacquire_write_upgrade (); /// Explicitly destroy the lock. - virtual int remove (void); + virtual int remove (); private: /// The concrete locking mechanism that all the methods delegate to. diff --git a/ACE/ace/Lock_Adapter_T.inl b/ACE/ace/Lock_Adapter_T.inl index 5de19ea5b2f..efffe4980af 100644 --- a/ACE/ace/Lock_Adapter_T.inl +++ b/ACE/ace/Lock_Adapter_T.inl @@ -14,7 +14,7 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter ( template <class ACE_LOCKING_MECHANISM> ACE_INLINE -ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void) +ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter () : lock_ (0), delete_lock_ (true) { diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 6a3e481197e..474962401a3 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -245,16 +245,16 @@ public: }; /// Returns a pointer to the Singleton. - static ACE_Log_Msg *instance (void); + static ACE_Log_Msg *instance (); /// Returns last error. - static int last_error_adapter (void); + static int last_error_adapter (); /// Returns non-null if an ACE_Log_Msg exists for the calling thread. - static int exists (void); + static int exists (); /// Returns the current program name used for logging. - static const ACE_TCHAR * program_name (void); + static const ACE_TCHAR * program_name (); /// Clears the flag from the default priority mask used to /// initialize ACE_Log_Msg instances. @@ -265,10 +265,10 @@ public: static void enable_debug_messages (ACE_Log_Priority priority = LM_DEBUG); /// Initialize logger. - ACE_Log_Msg (void); + ACE_Log_Msg (); /// cleanup logger. - ~ACE_Log_Msg (void); + ~ACE_Log_Msg (); /// Initialize the ACE logging facility. /** @@ -308,7 +308,7 @@ public: /** * Return the bits in the logger's options flags. */ - u_long flags (void); + u_long flags (); /** @name Allow apps to acquire and release internal synchronization * lock @@ -320,10 +320,10 @@ public: //@{ /// Acquire the internal lock. - int acquire (void); + int acquire (); /// Release the internal lock. - int release (void); + int release (); //@} /// Call after doing a @c fork() to resynchronize the process id and @@ -339,7 +339,7 @@ public: /// Get the result of the operation status (by convention, -1 means /// error). - int op_status (void) const; + int op_status () const; /// Set the value of the errnum (by convention this corresponds to /// errno). @@ -347,25 +347,25 @@ public: /// Get the value of the errnum (by convention this corresponds to /// errno). - int errnum (void) const; + int errnum () const; /// Set the line number where an error occurred. void linenum (int); /// Get the line number where an error occurred. - int linenum (void) const; + int linenum () const; /// Set the file name where an error occurred. void file (const char *); /// Get the file name where an error occurred. - const char *file (void); + const char *file (); /// Set the message that describes what type of error occurred. void msg (const ACE_TCHAR *); /// Get the message that describes what type of error occurred. - const ACE_TCHAR *msg (void); + const ACE_TCHAR *msg (); /// Set the field that indicates whether interrupted calls should be /// restarted. @@ -373,7 +373,7 @@ public: /// Get the field that indicates whether interrupted calls should be /// restarted. - bool restart (void) const; + bool restart () const; // = Notice that the following two function is equivalent to // "void msg_ostream (HANDLE)" and "HANDLE msg_ostream (void)" @@ -390,7 +390,7 @@ public: void msg_ostream (ACE_OSTREAM_TYPE *, bool delete_ostream); /// Get the ostream that is used to print error messages. - ACE_OSTREAM_TYPE *msg_ostream (void) const; + ACE_OSTREAM_TYPE *msg_ostream () const; /** * Set a new callback object and return the existing callback to @@ -399,7 +399,7 @@ public: * them in each thread. */ ACE_Log_Msg_Callback *msg_callback (ACE_Log_Msg_Callback *c); - ACE_Log_Msg_Callback *msg_callback (void) const; + ACE_Log_Msg_Callback *msg_callback () const; /** * Set a new backend object and return the existing backend to @@ -411,28 +411,28 @@ public: * on a backend object. */ static ACE_Log_Msg_Backend *msg_backend (ACE_Log_Msg_Backend *b); - static ACE_Log_Msg_Backend *msg_backend (void); + static ACE_Log_Msg_Backend *msg_backend (); /// Nesting depth increment. - int inc (void); + int inc (); /// Nesting depth decrement. - int dec (void); + int dec (); /// Get trace depth. - int trace_depth (void) const; + int trace_depth () const; /// Set trace depth. void trace_depth (int); /// Get trace active status. - bool trace_active (void) const; + bool trace_active () const; /// Set trace active status. void trace_active (bool value); /// Get the TSS thread descriptor. - ACE_Thread_Descriptor *thr_desc (void) const; + ACE_Thread_Descriptor *thr_desc () const; /** * Set the TSS thread descriptor. This method will call @@ -442,13 +442,13 @@ public: void thr_desc (ACE_Thread_Descriptor *td); /// Stop tracing status on a per-thread basis... - void stop_tracing (void); + void stop_tracing (); /// Start tracing status on a per-thread basis... - void start_tracing (void); + void start_tracing (); /// Query tracing status on a per-thread basis... - bool tracing_enabled (void) const; + bool tracing_enabled () const; typedef enum { @@ -486,10 +486,10 @@ public: /// Optimize reading of the pid (avoids a system call if the value is /// cached...). - pid_t getpid (void) const; + pid_t getpid () const; /// Get the name of the local host. - const ACE_TCHAR *local_host (void) const; + const ACE_TCHAR *local_host () const; /// Set the name of the local host. void local_host (const ACE_TCHAR *); @@ -626,7 +626,7 @@ public: ACE_OS_Log_Msg_Attributes &attributes); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -749,13 +749,13 @@ private: #endif /* ACE_MT_SAFE */ /// For cleanup, at program termination. - static void close (void); + static void close (); /// Decouple the OS layer from the ACE_Log_Msg layer. static void sync_hook (const ACE_TCHAR *prg_name); /// Return the TSS singleton thread descriptor - static ACE_OS_Thread_Descriptor *thr_desc_hook (void); + static ACE_OS_Thread_Descriptor *thr_desc_hook (); //friend void ACE_OS::cleanup_tss (const u_int); diff --git a/ACE/ace/Log_Msg.inl b/ACE/ace/Log_Msg.inl index 1062c15c6b1..bca6dc2271f 100644 --- a/ACE/ace/Log_Msg.inl +++ b/ACE/ace/Log_Msg.inl @@ -31,7 +31,7 @@ ACE_Log_Msg::op_status (int status) ACE_INLINE int -ACE_Log_Msg::op_status (void) const +ACE_Log_Msg::op_status () const { return this->status_; } @@ -45,14 +45,14 @@ ACE_Log_Msg::restart (bool r) ACE_INLINE bool -ACE_Log_Msg::restart (void) const +ACE_Log_Msg::restart () const { return this->restart_; } ACE_INLINE int -ACE_Log_Msg::errnum (void) const +ACE_Log_Msg::errnum () const { return this->errnum_; } @@ -66,7 +66,7 @@ ACE_Log_Msg::errnum (int e) ACE_INLINE int -ACE_Log_Msg::linenum (void) const +ACE_Log_Msg::linenum () const { return this->linenum_; } @@ -80,21 +80,21 @@ ACE_Log_Msg::linenum (int l) ACE_INLINE int -ACE_Log_Msg::inc (void) +ACE_Log_Msg::inc () { return this->trace_depth_++; } ACE_INLINE int -ACE_Log_Msg::dec (void) +ACE_Log_Msg::dec () { return this->trace_depth_ == 0 ? 0 : --this->trace_depth_; } ACE_INLINE int -ACE_Log_Msg::trace_depth (void) const +ACE_Log_Msg::trace_depth () const { return this->trace_depth_; } @@ -108,7 +108,7 @@ ACE_Log_Msg::trace_depth (int depth) ACE_INLINE bool -ACE_Log_Msg::trace_active (void) const +ACE_Log_Msg::trace_active () const { return this->trace_active_; } @@ -122,7 +122,7 @@ ACE_Log_Msg::trace_active (bool value) ACE_INLINE ACE_Thread_Descriptor * -ACE_Log_Msg::thr_desc (void) const +ACE_Log_Msg::thr_desc () const { return this->thr_desc_; } @@ -130,7 +130,7 @@ ACE_Log_Msg::thr_desc (void) const /// Enable the tracing facility on a per-thread basis. ACE_INLINE void -ACE_Log_Msg::start_tracing (void) +ACE_Log_Msg::start_tracing () { this->tracing_enabled_ = true; } @@ -138,21 +138,21 @@ ACE_Log_Msg::start_tracing (void) /// Disable the tracing facility on a per-thread basis. ACE_INLINE void -ACE_Log_Msg::stop_tracing (void) +ACE_Log_Msg::stop_tracing () { this->tracing_enabled_ = false; } ACE_INLINE bool -ACE_Log_Msg::tracing_enabled (void) const +ACE_Log_Msg::tracing_enabled () const { return this->tracing_enabled_; } ACE_INLINE const char * -ACE_Log_Msg::file (void) +ACE_Log_Msg::file () { return this->file_; } @@ -166,7 +166,7 @@ ACE_Log_Msg::file (const char *s) ACE_INLINE const ACE_TCHAR * -ACE_Log_Msg::msg (void) +ACE_Log_Msg::msg () { return this->msg_ + ACE_Log_Msg::msg_off_; } @@ -181,7 +181,7 @@ ACE_Log_Msg::msg (const ACE_TCHAR *m) ACE_INLINE ACE_Log_Msg_Callback * -ACE_Log_Msg::msg_callback (void) const +ACE_Log_Msg::msg_callback () const { return this->msg_callback_; } @@ -197,7 +197,7 @@ ACE_Log_Msg::msg_callback (ACE_Log_Msg_Callback *c) ACE_INLINE ACE_OSTREAM_TYPE * -ACE_Log_Msg::msg_ostream (void) const +ACE_Log_Msg::msg_ostream () const { return this->ostream_; } @@ -211,14 +211,14 @@ ACE_Log_Msg::msg_ostream (ACE_OSTREAM_TYPE *m) ACE_INLINE const ACE_TCHAR * -ACE_Log_Msg::local_host (void) const +ACE_Log_Msg::local_host () const { return ACE_Log_Msg::local_host_; } ACE_INLINE pid_t -ACE_Log_Msg::getpid (void) const +ACE_Log_Msg::getpid () const { return ACE_OS::getpid (); } diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h index 0ace47d7fc9..e68279e5450 100644 --- a/ACE/ace/Log_Record.h +++ b/ACE/ace/Log_Record.h @@ -193,9 +193,10 @@ private: /// ACE_Log_Category_TSS* category_; - /// disallow copying... - ACE_Log_Record (const ACE_Log_Record& rhs); - ACE_Log_Record& operator= (const ACE_Log_Record& rhs); + ACE_Log_Record (const ACE_Log_Record&) = delete; + ACE_Log_Record& operator= (const ACE_Log_Record&) = delete; + ACE_Log_Record (ACE_Log_Record&&) = delete; + ACE_Log_Record& operator= (ACE_Log_Record&& rhs) = delete; }; // Forward decls. diff --git a/ACE/ace/Malloc.h b/ACE/ace/Malloc.h index 3ad30ac5f08..f36be65e75c 100644 --- a/ACE/ace/Malloc.h +++ b/ACE/ace/Malloc.h @@ -265,7 +265,7 @@ public: class ACE_Export ACE_Malloc_Header { public: - ACE_Malloc_Header (void); + ACE_Malloc_Header (); /// Points to next block if on free list. ACE_Malloc_Header *next_block_; @@ -284,7 +284,7 @@ public: char padding_[(ACE_MALLOC_PADDING_SIZE) ? ACE_MALLOC_PADDING_SIZE : ACE_MALLOC_ALIGN]; /// Dump the state of the object. - void dump (void) const; + void dump () const; }; /** @@ -307,10 +307,10 @@ public: ACE_Name_Node *head); /// Constructor. - ACE_Name_Node (void); + ACE_Name_Node (); /// Constructor. - ~ACE_Name_Node (void); + ~ACE_Name_Node (); /// Initialize a name node pointer. static void init_ptr (ACE_Name_Node **ptr, @@ -318,7 +318,7 @@ public: void *base_addr); /// Return a pointer to the name of this node. - const char *name (void) const; + const char *name () const; /// Name of the Node. char *name_; @@ -333,14 +333,14 @@ public: ACE_Name_Node *prev_; /// Dump the state of the object. - void dump (void) const; + void dump () const; private: /// Copy constructor. ACE_Name_Node (const ACE_Name_Node &); }; /// Print out a bunch of size info for debugging. - static void print_alignment_info (void); + static void print_alignment_info (); /// Reference counter. int ref_counter_; @@ -379,7 +379,7 @@ public: ACE_Malloc_Header base_; /// Dump the state of the object. - void dump (void) const; + void dump () const; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Malloc.inl b/ACE/ace/Malloc.inl index 2eb2a3a2325..691cc300af2 100644 --- a/ACE/ace/Malloc.inl +++ b/ACE/ace/Malloc.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node (void) +ACE_Control_Block::ACE_Name_Node::~ACE_Name_Node () { } 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/Malloc_Base.h b/ACE/ace/Malloc_Base.h index 267021ce799..76e63076bd6 100644 --- a/ACE/ace/Malloc_Base.h +++ b/ACE/ace/Malloc_Base.h @@ -45,20 +45,20 @@ public: // = Memory Management /// Get pointer to a default ACE_Allocator. - static ACE_Allocator *instance (void); + static ACE_Allocator *instance (); /// Set pointer to a process-wide ACE_Allocator and return existing /// pointer. static ACE_Allocator *instance (ACE_Allocator *); /// Delete the dynamically allocated Singleton - static void close_singleton (void); + static void close_singleton (); /// "No-op" constructor (needed to make certain compilers happy). - ACE_Allocator (void); + ACE_Allocator (); /// Virtual destructor - virtual ~ACE_Allocator (void); + virtual ~ACE_Allocator (); /// Allocate @a nbytes, but don't give them any initial value. virtual void *malloc (size_type nbytes) = 0; @@ -76,7 +76,7 @@ public: virtual void free (void *ptr) = 0; /// Remove any resources associated with this memory manager. - virtual int remove (void) = 0; + virtual int remove () = 0; // = Map manager like functions @@ -149,7 +149,7 @@ public: #endif /* ACE_HAS_MALLOC_STATS */ /// Dump the state of the object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; private: // DO NOT ADD ANY STATE (DATA MEMBERS) TO THIS CLASS!!!! See the // <ACE_Allocator::instance> implementation for explanation. diff --git a/ACE/ace/Managed_Object.cpp b/ACE/ace/Managed_Object.cpp index 3935cf96f0d..b6f512202fe 100644 --- a/ACE/ace/Managed_Object.cpp +++ b/ACE/ace/Managed_Object.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TYPE> -ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter (void) +ACE_Cleanup_Adapter<TYPE>::~ACE_Cleanup_Adapter () { } diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index 207c0abfc35..eed45cbbc23 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -42,13 +42,13 @@ class ACE_Cleanup_Adapter : public ACE_Cleanup { public: /// Default constructor. - ACE_Cleanup_Adapter (void); + ACE_Cleanup_Adapter (); /// Virtual destructor, needed by some compilers for vtable placement. - virtual ~ACE_Cleanup_Adapter (void); + virtual ~ACE_Cleanup_Adapter (); /// Accessor for contained object. - TYPE &object (void); + TYPE &object (); private: ACE_UNIMPLEMENTED_FUNC (ACE_Cleanup_Adapter (const ACE_Cleanup_Adapter<TYPE> &)) diff --git a/ACE/ace/Managed_Object.inl b/ACE/ace/Managed_Object.inl index 4747e8faa2b..c3b3acae0a1 100644 --- a/ACE/ace/Managed_Object.inl +++ b/ACE/ace/Managed_Object.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TYPE> ACE_INLINE -ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter (void) +ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter () // Note: don't explicitly initialize "object_", because TYPE may not // have a default constructor. Let the compiler figure it out . . . { @@ -12,7 +12,7 @@ ACE_Cleanup_Adapter<TYPE>::ACE_Cleanup_Adapter (void) template <class TYPE> ACE_INLINE TYPE & -ACE_Cleanup_Adapter<TYPE>::object (void) +ACE_Cleanup_Adapter<TYPE>::object () { return this->object_; } diff --git a/ACE/ace/Manual_Event.cpp b/ACE/ace/Manual_Event.cpp index d0504f84e62..91235a610e0 100644 --- a/ACE/ace/Manual_Event.cpp +++ b/ACE/ace/Manual_Event.cpp @@ -44,7 +44,7 @@ ACE_Manual_Event_T<TIME_POLICY>::ACE_Manual_Event_T ( template <class TIME_POLICY> void -ACE_Manual_Event_T<TIME_POLICY>::dump (void) const +ACE_Manual_Event_T<TIME_POLICY>::dump () const { #if defined (ACE_HAS_DUMP) ACE_Event_T<TIME_POLICY>::dump (); diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h index 5287eec3e27..a2981f41ffd 100644 --- a/ACE/ace/Manual_Event.h +++ b/ACE/ace/Manual_Event.h @@ -53,10 +53,10 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - ~ACE_Manual_Event_T (void); + ~ACE_Manual_Event_T (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks ACE_ALLOC_HOOK_DECLARE; @@ -85,7 +85,7 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - virtual ~ACE_Manual_Event (void) {} + virtual ~ACE_Manual_Event () {} }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Manual_Event.inl b/ACE/ace/Manual_Event.inl index d72fdfc85e6..7db9b7b0ebd 100644 --- a/ACE/ace/Manual_Event.inl +++ b/ACE/ace/Manual_Event.inl @@ -3,7 +3,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class TIME_POLICY> ACE_INLINE -ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T (void) +ACE_Manual_Event_T<TIME_POLICY>::~ACE_Manual_Event_T () { } diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index ecb34ab503b..fb7d6046cf6 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -57,7 +57,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size, } template <class EXT_ID, class INT_ID, class ACE_LOCK> int -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i () { // Free entries. this->free_search_structure (); @@ -385,7 +385,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_and_return_index (const EXT_ID & } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_all (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_all () { // Go through the entire occupied list. for (ACE_UINT32 i = this->occupied_list_.next (); @@ -551,7 +551,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (ACE_UINT32 new_size) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_UINT32 -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size () { // Calculate the new size. ACE_UINT32 current_size = this->total_size_; @@ -568,7 +568,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void) } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure () { // Free up the structure. if (this->search_structure_ != 0) @@ -590,7 +590,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void) } template <class EXT_ID, class INT_ID> void -ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const +ACE_Map_Entry<EXT_ID, INT_ID>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -606,7 +606,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -619,7 +619,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -629,7 +629,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -639,7 +639,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const +ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -647,7 +647,7 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const +ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); @@ -655,7 +655,7 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> void -ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const +ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) this->dump_i (); diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index e4c541957de..4ca68a32721 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -38,11 +38,11 @@ class ACE_Map_Entry { public: /// Initialize member variables. - ACE_Map_Entry (void); + ACE_Map_Entry (); /// We need this destructor to keep some compilers from complaining. /// It's just a no-op, however. - ~ACE_Map_Entry (void); + ~ACE_Map_Entry (); /// Key used to look up an entry. EXT_ID ext_id_; @@ -51,7 +51,7 @@ public: INT_ID int_id_; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -60,13 +60,13 @@ public: // are not portable. /// Get next entry. - ACE_UINT32 next (void) const; + ACE_UINT32 next () const; /// Set next entry. void next (ACE_UINT32 n); /// Get prev entry. - ACE_UINT32 prev (void) const; + ACE_UINT32 prev () const; /// Set prev entry. void prev (ACE_UINT32 p); @@ -157,11 +157,11 @@ public: /// Close down a ACE_Map_Manager and release dynamically allocated /// resources. - int close (void); + int close (); /// Close down a ACE_Map_Manager and release dynamically allocated /// resources. - ~ACE_Map_Manager (void); + ~ACE_Map_Manager (); /** * Associate @a ext_id with @a int_id. If @a ext_id is already in the @@ -248,13 +248,13 @@ public: /** * Unbind all entires. */ - void unbind_all (void); + void unbind_all (); /// Return the current size of the map. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the map. - size_t total_size (void) const; + size_t total_size () const; /** * Returns a reference to the underlying ACE_LOCK. This makes it @@ -264,20 +264,20 @@ public: * guard the state of an iterator. * @note The right name would be lock, but HP/C++ will choke on that! */ - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL styled iterator factory functions. /// Return forward iterator. - ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> begin (void); - ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> end (void); + ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> begin (); + ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> end (); /// Return reverse iterator. - ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rbegin (void); - ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rend (void); + ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rbegin (); + ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> rend (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -353,7 +353,7 @@ protected: int resize_i (ACE_UINT32 size); /// Close down a <Map_Manager>. Must be called with locks held. - int close_i (void); + int close_i (); /// Returns 1 if <id1> == <id2>, else 0. This is defined as a /// separate method to facilitate template specialization. @@ -361,17 +361,17 @@ protected: /// This function returns the new size of the Map Manager. This /// function is called when we run out of room and need to resize. - ACE_UINT32 new_size (void); + ACE_UINT32 new_size (); /// Explicitly call the destructors and free up the /// <search_structure_>. - void free_search_structure (void); + void free_search_structure (); /// Id of the free list sentinel. - ACE_UINT32 free_list_id (void) const; + ACE_UINT32 free_list_id () const; /// Id of the occupied list sentinel. - ACE_UINT32 occupied_list_id (void) const; + ACE_UINT32 occupied_list_id () const; /// Finds the next free slot. int next_free (ACE_UINT32 &slot); @@ -460,14 +460,14 @@ public: int next (ACE_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element @c this is pointing to. - ACE_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns reference the Map_Manager that is being iterated /// over. - ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map (void); + ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map (); /// Check if two iterators point to the same position bool operator== (const ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &) const; @@ -479,14 +479,14 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backware by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> *map_man_; @@ -518,14 +518,14 @@ public: int next (ACE_Map_Entry<EXT_ID, INT_ID> *&next_entry) const; /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Returns a reference to the interal element @c this is pointing to. - ACE_Map_Entry<EXT_ID, INT_ID>& operator* (void) const; + ACE_Map_Entry<EXT_ID, INT_ID>& operator* () const; /// Returns reference the Map_Manager that is being iterated /// over. - const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map (void) const; + const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>& map () const; /// Check if two iterators point to the same position bool operator== (const ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &) const; @@ -537,14 +537,14 @@ public: protected: /// Move forward by one element in the set. Returns 0 when there's /// no more item in the set after the current items, else 1. - int forward_i (void); + int forward_i (); /// Move backware by one element in the set. Returns 0 when there's /// no more item in the set before the current item, else 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; /// Map we are iterating over. const ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> *map_man_; @@ -576,21 +576,21 @@ public: /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void); + ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void); + ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int); @@ -622,21 +622,21 @@ public: /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix advance. - ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void); + ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (); /// Postfix advance. ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void); + ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (); /// Postfix reverse. ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int); @@ -668,21 +668,21 @@ public: /// Move forward by one element in the set. 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; // = STL styled iteration, compare, and reference functions. /// Prefix reverse. - ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (void); + ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator++ (); /// Postfix reverse. ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator++ (int); /// Prefix advance. - ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (void); + ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> &operator-- (); /// Postfix advance. ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> operator-- (int); diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl index 3c132b4f9bf..5ef512b49ed 100644 --- a/ACE/ace/Map_Manager.inl +++ b/ACE/ace/Map_Manager.inl @@ -5,7 +5,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class EXT_ID, class INT_ID> ACE_INLINE -ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) +ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry () : next_ (0), prev_ (0) #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -15,13 +15,13 @@ ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) } template <class EXT_ID, class INT_ID> ACE_INLINE -ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry (void) +ACE_Map_Entry<EXT_ID, INT_ID>::~ACE_Map_Entry () { // No-op just to keep some compilers happy... } template <class EXT_ID, class INT_ID> ACE_INLINE ACE_UINT32 -ACE_Map_Entry<EXT_ID, INT_ID>::next (void) const +ACE_Map_Entry<EXT_ID, INT_ID>::next () const { return this->next_; } @@ -33,7 +33,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::next (ACE_UINT32 n) } template <class EXT_ID, class INT_ID> ACE_INLINE ACE_UINT32 -ACE_Map_Entry<EXT_ID, INT_ID>::prev (void) const +ACE_Map_Entry<EXT_ID, INT_ID>::prev () const { return this->prev_; } @@ -68,7 +68,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close () { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -76,7 +76,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::~ACE_Map_Manager (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::~ACE_Map_Manager () { this->close (); } @@ -186,21 +186,21 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size () const { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, static_cast<size_t> (-1)); return this->cur_size_; } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE size_t -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size () const { ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, static_cast<size_t> (-1)); return this->total_size_; } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_LOCK & -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex () { return this->lock_; } @@ -233,7 +233,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::equal (const EXT_ID &id1, } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_UINT32 -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id () const { // If you change ~0, please change // ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key() @@ -242,35 +242,35 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_list_id (void) const } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_UINT32 -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::occupied_list_id (void) const +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::occupied_list_id () const { return (ACE_UINT32) ~1; } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::begin (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::begin () { return ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::end (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::end () { return ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this, 1); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rbegin (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rbegin () { return ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> -ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend (void) +ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend () { return ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> (*this, 1); } @@ -295,13 +295,13 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done () const { return this->next_ == this->map_man_->occupied_list_id (); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void) +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i () { #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -332,7 +332,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void) +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i () { #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -364,7 +364,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void) +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map () { return *this->map_man_; } @@ -402,13 +402,13 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_I } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done () const { return this->next_ == this->map_man_->occupied_list_id (); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void) +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i () { #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -439,7 +439,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void) } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void) +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i () { #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -471,7 +471,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE const ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void) const +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map () const { return *this->map_man_; } @@ -528,14 +528,14 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator (ACE_Map_Manager<EX } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) +ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance () { return this->forward_i (); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void) +ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ () { this->forward_i (); return *this; @@ -552,7 +552,7 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void) +ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- () { this->reverse_i (); return *this; @@ -606,14 +606,14 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Const_Iterator (const } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) +ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance () { return this->forward_i (); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void) +ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ () { this->forward_i (); return *this; @@ -630,7 +630,7 @@ ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void) +ACE_Map_Const_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- () { this->reverse_i (); return *this; @@ -684,14 +684,14 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Reverse_Iterator (AC } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int -ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) +ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance () { return this->reverse_i (); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (void) +ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ () { this->reverse_i (); return *this; @@ -708,7 +708,7 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator++ (int) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> & -ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (void) +ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- () { this->forward_i (); return *this; @@ -725,7 +725,7 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (int) template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Entry<EXT_ID, INT_ID>& -ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const +ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* () const { ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0; @@ -738,7 +738,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE ACE_Map_Entry<EXT_ID, INT_ID>& -ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const +ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* () const { ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0; diff --git a/ACE/ace/Map_T.cpp b/ACE/ace/Map_T.cpp index f67f07ef8f8..6ebb44e61dd 100644 --- a/ACE/ace/Map_T.cpp +++ b/ACE/ace/Map_T.cpp @@ -14,28 +14,28 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class KEY, class VALUE> -ACE_Map<KEY, VALUE>::~ACE_Map (void) +ACE_Map<KEY, VALUE>::~ACE_Map () { } template <class T> -ACE_Iterator_Impl<T>::~ACE_Iterator_Impl (void) +ACE_Iterator_Impl<T>::~ACE_Iterator_Impl () { } template <class T> -ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl (void) +ACE_Reverse_Iterator_Impl<T>::~ACE_Reverse_Iterator_Impl () { } template <class T, class IMPLEMENTATION, class ENTRY> -ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Iterator_Adapter (void) +ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Iterator_Adapter () { } template <class T, class IMPLEMENTATION, class ENTRY> ACE_Iterator_Impl<T> * -ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) const +ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone () const { ACE_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -62,24 +62,24 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::dereference () const } template <class T, class IMPLEMENTATION, class ENTRY> void -ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus (void) +ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus () { ++this->implementation_; } template <class T, class IMPLEMENTATION, class ENTRY> void -ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus (void) +ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus () { --this->implementation_; } template <class T, class IMPLEMENTATION, class ENTRY> -ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Reverse_Iterator_Adapter (void) +ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::~ACE_Map_Impl_Reverse_Iterator_Adapter () { } template <class T, class IMPLEMENTATION, class ENTRY> ACE_Reverse_Iterator_Impl<T> * -ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) const +ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone () const { ACE_Reverse_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -107,20 +107,20 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::dereference () } template <class T, class IMPLEMENTATION, class ENTRY> void -ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus (void) +ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::plus_plus () { ++this->implementation_; } template <class T, class IMPLEMENTATION, class ENTRY> void -ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus (void) +ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::minus_minus () { --this->implementation_; } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::~ACE_Map_Impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::~ACE_Map_Impl () { } @@ -133,7 +133,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ope } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> int -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::close (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::close () { return this->implementation_.close (); } @@ -249,19 +249,19 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unb } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> size_t -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void) const +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size () const { return this->implementation_.current_size (); } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> size_t -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void) const +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size () const { return this->implementation_.total_size (); } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> void -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump (void) const +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump () const { #if defined (ACE_HAS_DUMP) this->implementation_.dump (); @@ -269,7 +269,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dum } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::begin_impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::begin_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -279,7 +279,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::beg } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end_impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -289,7 +289,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::end } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbegin_impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbegin_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -299,7 +299,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rbe } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rend_impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rend_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -309,12 +309,12 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ren } template <class T, class VALUE> -ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Iterator_Adapter (void) +ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Iterator_Adapter () { } template <class T, class VALUE> ACE_Iterator_Impl<T> * -ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::clone (void) const +ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::clone () const { ACE_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -343,24 +343,24 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::dereference () const } template <class T, class VALUE> void -ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::plus_plus (void) +ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::plus_plus () { ++this->implementation_; } template <class T, class VALUE> void -ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::minus_minus (void) +ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::minus_minus () { --this->implementation_; } template <class T, class VALUE> -ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (void) +ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::~ACE_Active_Map_Manager_Reverse_Iterator_Adapter () { } template <class T, class VALUE> ACE_Reverse_Iterator_Impl<T> * -ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::clone (void) const +ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::clone () const { ACE_Reverse_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -389,19 +389,19 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::dereference () const } template <class T, class VALUE> void -ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::plus_plus (void) +ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::plus_plus () { ++this->implementation_; } template <class T, class VALUE> void -ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::minus_minus (void) +ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::minus_minus () { --this->implementation_; } template <class KEY, class VALUE, class KEY_ADAPTER> -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::~ACE_Active_Map_Manager_Adapter (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::~ACE_Active_Map_Manager_Adapter () { } @@ -414,7 +414,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::open (size_t length, } template <class KEY, class VALUE, class KEY_ADAPTER> int -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::close (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::close () { return this->implementation_.close (); } @@ -691,19 +691,19 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key, } template <class KEY, class VALUE, class KEY_ADAPTER> size_t -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void) const +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size () const { return this->implementation_.current_size (); } template <class KEY, class VALUE, class KEY_ADAPTER> size_t -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void) const +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size () const { return this->implementation_.total_size (); } template <class KEY, class VALUE, class KEY_ADAPTER> void -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump () const { #if defined (ACE_HAS_DUMP) this->implementation_.dump (); @@ -711,7 +711,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -721,7 +721,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::begin_impl (void) } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -731,7 +731,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::end_impl (void) } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -741,7 +741,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rbegin_impl (void) } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -751,12 +751,12 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rend_impl (void) } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> -ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (void) +ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Iterator_Adapter () { } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_Iterator_Impl<T> * -ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone (void) const +ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone () const { ACE_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -785,24 +785,24 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>: } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void -ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus (void) +ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus () { ++this->implementation_; } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void -ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus (void) +ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus () { --this->implementation_; } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> -ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (void) +ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter () { } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_Reverse_Iterator_Impl<T> * -ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone (void) const +ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::clone () const { ACE_Reverse_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -831,19 +831,19 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void -ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus (void) +ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::plus_plus () { ++this->implementation_; } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> void -ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus (void) +ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::minus_minus () { --this->implementation_; } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::~ACE_Hash_Map_Manager_Ex_Adapter (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::~ACE_Hash_Map_Manager_Ex_Adapter () { } @@ -856,7 +856,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> int -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::close (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::close () { return this->implementation_.close (); } @@ -984,19 +984,19 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> size_t -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void) const +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size () const { return this->implementation_.current_size (); } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> size_t -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void) const +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size () const { return this->implementation_.total_size (); } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> void -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump (void) const +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump () const { #if defined (ACE_HAS_DUMP) this->implementation_.dump (); @@ -1004,7 +1004,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::begin_impl (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::begin_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1014,7 +1014,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::end_impl (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::end_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1024,7 +1024,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rbegin_impl (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rbegin_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1034,7 +1034,7 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rend_impl (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rend_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1044,12 +1044,12 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class T, class KEY, class VALUE> -ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Iterator_Adapter (void) +ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Iterator_Adapter () { } template <class T, class KEY, class VALUE> ACE_Iterator_Impl<T> * -ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::clone (void) const +ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::clone () const { ACE_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -1078,24 +1078,24 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::dereference () const } template <class T, class KEY, class VALUE> void -ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::plus_plus (void) +ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::plus_plus () { ++this->implementation_; } template <class T, class KEY, class VALUE> void -ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::minus_minus (void) +ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::minus_minus () { --this->implementation_; } template <class T, class KEY, class VALUE> -ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Reverse_Iterator_Adapter (void) +ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::~ACE_Map_Manager_Reverse_Iterator_Adapter () { } template <class T, class KEY, class VALUE> ACE_Reverse_Iterator_Impl<T> * -ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::clone (void) const +ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::clone () const { ACE_Reverse_Iterator_Impl<T> *temp = 0; ACE_NEW_RETURN (temp, @@ -1124,19 +1124,19 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::dereference () const } template <class T, class KEY, class VALUE> void -ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::plus_plus (void) +ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::plus_plus () { ++this->implementation_; } template <class T, class KEY, class VALUE> void -ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::minus_minus (void) +ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::minus_minus () { --this->implementation_; } template <class KEY, class VALUE, class KEY_GENERATOR> -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::~ACE_Map_Manager_Adapter (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::~ACE_Map_Manager_Adapter () { } @@ -1149,7 +1149,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::open (size_t length, } template <class KEY, class VALUE, class KEY_GENERATOR> int -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::close (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::close () { return this->implementation_.close (); } @@ -1277,19 +1277,19 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key, } template <class KEY, class VALUE, class KEY_GENERATOR> size_t -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void) const +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size () const { return this->implementation_.current_size (); } template <class KEY, class VALUE, class KEY_GENERATOR> size_t -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void) const +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size () const { return this->implementation_.total_size (); } template <class KEY, class VALUE, class KEY_GENERATOR> void -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump () const { #if defined (ACE_HAS_DUMP) this->implementation_.dump (); @@ -1297,7 +1297,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1307,7 +1307,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::begin_impl (void) } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl () { ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1317,7 +1317,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::end_impl (void) } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, @@ -1327,7 +1327,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rbegin_impl (void) } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > * -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rend_impl () { ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *temp = 0; ACE_NEW_RETURN (temp, diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index 3da8e4809d8..bb8938acaa3 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -56,13 +56,13 @@ class ACE_Incremental_Key_Generator public: /// Constructor. - ACE_Incremental_Key_Generator (void); + ACE_Incremental_Key_Generator (); /// Functor method: generates a new key. int operator () (T &t); /// Returns the current value. - const T& current_value (void) const; + const T& current_value () const; protected: @@ -83,22 +83,22 @@ class ACE_Iterator_Impl public: /// Destructor. - virtual ~ACE_Iterator_Impl (void); + virtual ~ACE_Iterator_Impl (); /// Clone. - virtual ACE_Iterator_Impl<T> *clone (void) const = 0; + virtual ACE_Iterator_Impl<T> *clone () const = 0; /// Comparison. virtual int compare (const ACE_Iterator_Impl<T> &rhs) const = 0; /// Dereference. - virtual T dereference (void) const = 0; + virtual T dereference () const = 0; /// Advance. - virtual void plus_plus (void) = 0; + virtual void plus_plus () = 0; /// Reverse. - virtual void minus_minus (void) = 0; + virtual void minus_minus () = 0; }; /** @@ -114,22 +114,22 @@ class ACE_Reverse_Iterator_Impl public: /// Destructor. - virtual ~ACE_Reverse_Iterator_Impl (void); + virtual ~ACE_Reverse_Iterator_Impl (); /// Clone. - virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const = 0; + virtual ACE_Reverse_Iterator_Impl<T> *clone () const = 0; /// Comparison. virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const = 0; /// Dereference. - virtual T dereference (void) const = 0; + virtual T dereference () const = 0; /// Advance. - virtual void plus_plus (void) = 0; + virtual void plus_plus () = 0; /// Reverse. - virtual void minus_minus (void) = 0; + virtual void minus_minus () = 0; }; /** @@ -155,7 +155,7 @@ public: ACE_Iterator (const ACE_Iterator<T> &rhs); /// Destructor. - ~ACE_Iterator (void); + ~ACE_Iterator (); /// Assignment operator. ACE_Iterator<T> &operator= (const ACE_Iterator<T> &rhs); @@ -168,19 +168,19 @@ public: T operator *() const; /// Prefix advance. - ACE_Iterator<T> &operator++ (void); + ACE_Iterator<T> &operator++ (); /// Postfix advance. ACE_Iterator<T> operator++ (int); /// Prefix reverse. - ACE_Iterator<T> &operator-- (void); + ACE_Iterator<T> &operator-- (); /// Postfix reverse. ACE_Iterator<T> operator-- (int); /// Accessor to implementation object. - ACE_Iterator_Impl<T> &impl (void); + ACE_Iterator_Impl<T> &impl (); protected: @@ -211,7 +211,7 @@ public: ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rhs); /// Destructor. - ~ACE_Reverse_Iterator (void); + ~ACE_Reverse_Iterator (); /// Assignment operator. ACE_Reverse_Iterator<T> &operator= (const ACE_Reverse_Iterator<T> &rhs); @@ -230,19 +230,19 @@ public: T operator *() const; /// Prefix advance. - ACE_Reverse_Iterator<T> &operator++ (void); + ACE_Reverse_Iterator<T> &operator++ (); /// Postfix advance. ACE_Reverse_Iterator<T> operator++ (int); /// Prefix reverse. - ACE_Reverse_Iterator<T> &operator-- (void); + ACE_Reverse_Iterator<T> &operator-- (); /// Postfix reverse. ACE_Reverse_Iterator<T> operator-- (int); /// Accessor to implementation object. - ACE_Reverse_Iterator_Impl<T> &impl (void); + ACE_Reverse_Iterator_Impl<T> &impl (); protected: @@ -279,14 +279,14 @@ public: reverse_iterator_implementation; /// Close down and release dynamically allocated resources. - virtual ~ACE_Map (void); + virtual ~ACE_Map (); /// Initialize a map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0) = 0; /// Close down a <Map> and release dynamically allocated resources. - virtual int close (void) = 0; + virtual int close () = 0; /** * Add @a key / @a value pair to the map. If @a key is already in the @@ -404,36 +404,36 @@ public: VALUE &value) = 0; /// Return the current size of the map. - virtual size_t current_size (void) const = 0; + virtual size_t current_size () const = 0; /// Return the total size of the map. - virtual size_t total_size (void) const = 0; + virtual size_t total_size () const = 0; /// Dump the state of an object. - virtual void dump (void) const = 0; + virtual void dump () const = 0; // = STL styled iterator factory functions. /// Return forward iterator. - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); /// Return reverse iterator. - reverse_iterator rbegin (void); - reverse_iterator rend (void); + reverse_iterator rbegin (); + reverse_iterator rend (); protected: // = Protected no-op constructor. - ACE_Map (void); + ACE_Map (); /// Return forward iterator. - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void) = 0; - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void) = 0; + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl () = 0; + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl () = 0; /// Return reverse iterator. - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void) = 0; - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void) = 0; + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl () = 0; + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl () = 0; private: @@ -462,25 +462,25 @@ public: ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl); /// Destructor. - virtual ~ACE_Map_Impl_Iterator_Adapter (void); + virtual ~ACE_Map_Impl_Iterator_Adapter (); /// Clone. - virtual ACE_Iterator_Impl<T> *clone (void) const; + virtual ACE_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - IMPLEMENTATION &impl (void); + IMPLEMENTATION &impl (); protected: @@ -508,25 +508,25 @@ public: ACE_Map_Impl_Reverse_Iterator_Adapter (const IMPLEMENTATION &impl); /// Destructor. - virtual ~ACE_Map_Impl_Reverse_Iterator_Adapter (void); + virtual ~ACE_Map_Impl_Reverse_Iterator_Adapter (); /// Clone. - virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const; + virtual ACE_Reverse_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - IMPLEMENTATION &impl (void); + IMPLEMENTATION &impl (); protected: @@ -563,14 +563,14 @@ public: ACE_Allocator *alloc = 0); /// Close down and release dynamically allocated resources. - virtual ~ACE_Map_Impl (void); + virtual ~ACE_Map_Impl (); /// Initialize a <Map> with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); /// Close down a <Map> and release dynamically allocated resources. - virtual int close (void); + virtual int close (); /** * Add @a key / @a value pair to the map. If @a key is already in the @@ -688,16 +688,16 @@ public: VALUE &value); /// Return the current size of the map. - virtual size_t current_size (void) const; + virtual size_t current_size () const; /// Return the total size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size () const; /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Accessor to implementation object. - IMPLEMENTATION &impl (void); + IMPLEMENTATION &impl (); protected: @@ -707,12 +707,12 @@ protected: // = STL styled iterator factory functions. /// Return forward iterator. - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void); - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (); /// Return reverse iterator. - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void); - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (); private: @@ -741,25 +741,25 @@ public: ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Active_Map_Manager_Iterator_Adapter (void); + virtual ~ACE_Active_Map_Manager_Iterator_Adapter (); /// Clone. - virtual ACE_Iterator_Impl<T> *clone (void) const; + virtual ACE_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (void); + ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (); protected: @@ -787,25 +787,25 @@ public: ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (void); + virtual ~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (); /// Clone. - virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const; + virtual ACE_Reverse_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (void); + ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (); protected: @@ -843,14 +843,14 @@ public: ACE_Allocator *alloc = 0); /// Close down and release dynamically allocated resources. - virtual ~ACE_Active_Map_Manager_Adapter (void); + virtual ~ACE_Active_Map_Manager_Adapter (); /// Initialize a Map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); /// Close down a Map and release dynamically allocated resources. - virtual int close (void); + virtual int close (); /** * Add @a key / @a value pair to the map. If @a key is already in the @@ -967,19 +967,19 @@ public: VALUE &value); /// Return the current size of the map. - virtual size_t current_size (void) const; + virtual size_t current_size () const; /// Return the total size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size () const; /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Accessor to implementation object. - ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl (void); + ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl (); /// Accessor to key adapter. - KEY_ADAPTER &key_adapter (void); + KEY_ADAPTER &key_adapter (); protected: @@ -1000,12 +1000,12 @@ protected: // = STL styled iterator factory functions. /// Return forward iterator. - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void); - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (); /// Return reverse iterator. - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void); - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (); private: @@ -1034,25 +1034,25 @@ public: ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (void); + virtual ~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (); /// Clone. - virtual ACE_Iterator_Impl<T> *clone (void) const; + virtual ACE_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void); + ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (); protected: @@ -1080,25 +1080,25 @@ public: ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (void); + virtual ~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (); /// Clone. - virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const; + virtual ACE_Reverse_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void); + ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (); protected: @@ -1134,14 +1134,14 @@ public: ACE_Allocator *alloc = 0); /// Close down and release dynamically allocated resources. - virtual ~ACE_Hash_Map_Manager_Ex_Adapter (void); + virtual ~ACE_Hash_Map_Manager_Ex_Adapter (); /// Initialize a Map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); /// Close down a Map and release dynamically allocated resources. - virtual int close (void); + virtual int close (); /** * Add @a key / @a value pair to the map. If @a key is already in the @@ -1259,19 +1259,19 @@ public: VALUE &value); /// Return the current size of the map. - virtual size_t current_size (void) const; + virtual size_t current_size () const; /// Return the total size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size () const; /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Accessor to implementation object. - ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (void); + ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl (); /// Accessor to key generator. - KEY_GENERATOR &key_generator (void); + KEY_GENERATOR &key_generator (); protected: @@ -1284,12 +1284,12 @@ protected: // = STL styled iterator factory functions. /// Return forward iterator. - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void); - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (); /// Return reverse iterator. - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void); - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (); private: @@ -1318,25 +1318,25 @@ public: ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Map_Manager_Iterator_Adapter (void); + virtual ~ACE_Map_Manager_Iterator_Adapter (); /// Clone. - virtual ACE_Iterator_Impl<T> *clone (void) const; + virtual ACE_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (void); + ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (); protected: @@ -1364,25 +1364,25 @@ public: ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl); /// Destructor. - virtual ~ACE_Map_Manager_Reverse_Iterator_Adapter (void); + virtual ~ACE_Map_Manager_Reverse_Iterator_Adapter (); /// Clone. - virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const; + virtual ACE_Reverse_Iterator_Impl<T> *clone () const; /// Comparison. virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const; /// Dereference. - virtual T dereference (void) const; + virtual T dereference () const; /// Advance. - virtual void plus_plus (void); + virtual void plus_plus (); /// Reverse. - virtual void minus_minus (void); + virtual void minus_minus (); /// Accessor to implementation object. - ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (void); + ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl (); protected: @@ -1418,14 +1418,14 @@ public: ACE_Allocator *alloc = 0); /// Close down and release dynamically allocated resources. - virtual ~ACE_Map_Manager_Adapter (void); + virtual ~ACE_Map_Manager_Adapter (); /// Initialize a <Map> with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, ACE_Allocator *alloc = 0); /// Close down a <Map> and release dynamically allocated resources. - virtual int close (void); + virtual int close (); /** * Add @a key / @a value pair to the map. If @a key is already in the @@ -1543,19 +1543,19 @@ public: VALUE &value); /// Return the current size of the map. - virtual size_t current_size (void) const; + virtual size_t current_size () const; /// Return the total size of the map. - virtual size_t total_size (void) const; + virtual size_t total_size () const; /// Dump the state of an object. - virtual void dump (void) const; + virtual void dump () const; /// Accessor to implementation object. - ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> &impl (void); + ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> &impl (); /// Accessor to key generator. - KEY_GENERATOR &key_generator (void); + KEY_GENERATOR &key_generator (); protected: @@ -1568,12 +1568,12 @@ protected: // = STL styled iterator factory functions. /// Return forward iterator. - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (void); - virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (void); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *begin_impl (); + virtual ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *end_impl (); /// Return reverse iterator. - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (void); - virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (void); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rbegin_impl (); + virtual ACE_Reverse_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *rend_impl (); private: diff --git a/ACE/ace/Map_T.inl b/ACE/ace/Map_T.inl index 1e4ae9b8173..076819c4d2c 100644 --- a/ACE/ace/Map_T.inl +++ b/ACE/ace/Map_T.inl @@ -8,7 +8,7 @@ ACE_Noop_Key_Generator<T>::operator() (T &) } template <class T> ACE_INLINE -ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator (void) +ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator () : t_ (0) { } @@ -21,7 +21,7 @@ ACE_Incremental_Key_Generator<T>::operator() (T &t) } template <class T> ACE_INLINE const T & -ACE_Incremental_Key_Generator<T>::current_value (void) const +ACE_Incremental_Key_Generator<T>::current_value () const { return this->t_; } @@ -39,7 +39,7 @@ ACE_Iterator<T>::ACE_Iterator (const ACE_Iterator<T> &rhs) } template <class T> ACE_INLINE -ACE_Iterator<T>::~ACE_Iterator (void) +ACE_Iterator<T>::~ACE_Iterator () { delete this->implementation_; } @@ -65,13 +65,13 @@ ACE_Iterator<T>::operator!= (const ACE_Iterator<T> &rhs) const } template <class T> ACE_INLINE T -ACE_Iterator<T>::operator* (void) const +ACE_Iterator<T>::operator* () const { return this->implementation_->dereference (); } template <class T> ACE_INLINE ACE_Iterator<T> & -ACE_Iterator<T>::operator++ (void) +ACE_Iterator<T>::operator++ () { this->implementation_->plus_plus (); return *this; @@ -86,7 +86,7 @@ ACE_Iterator<T>::operator++ (int) } template <class T> ACE_INLINE ACE_Iterator<T> & -ACE_Iterator<T>::operator-- (void) +ACE_Iterator<T>::operator-- () { this->implementation_->minus_minus (); return *this; @@ -101,7 +101,7 @@ ACE_Iterator<T>::operator-- (int) } template <class T> ACE_INLINE ACE_Iterator_Impl<T> & -ACE_Iterator<T>::impl (void) +ACE_Iterator<T>::impl () { return *this->implementation_; } @@ -119,7 +119,7 @@ ACE_Reverse_Iterator<T>::ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rh } template <class T> ACE_INLINE -ACE_Reverse_Iterator<T>::~ACE_Reverse_Iterator (void) +ACE_Reverse_Iterator<T>::~ACE_Reverse_Iterator () { delete this->implementation_; } @@ -145,13 +145,13 @@ ACE_Reverse_Iterator<T>::operator!= (const ACE_Reverse_Iterator<T> &rhs) const } template <class T> ACE_INLINE T -ACE_Reverse_Iterator<T>::operator* (void) const +ACE_Reverse_Iterator<T>::operator* () const { return this->implementation_->dereference (); } template <class T> ACE_INLINE ACE_Reverse_Iterator<T> & -ACE_Reverse_Iterator<T>::operator++ (void) +ACE_Reverse_Iterator<T>::operator++ () { this->implementation_->plus_plus (); return *this; @@ -166,7 +166,7 @@ ACE_Reverse_Iterator<T>::operator++ (int) } template <class T> ACE_INLINE ACE_Reverse_Iterator<T> & -ACE_Reverse_Iterator<T>::operator-- (void) +ACE_Reverse_Iterator<T>::operator-- () { this->implementation_->minus_minus (); return *this; @@ -181,36 +181,36 @@ ACE_Reverse_Iterator<T>::operator-- (int) } template <class T> ACE_INLINE ACE_Reverse_Iterator_Impl<T> & -ACE_Reverse_Iterator<T>::impl (void) +ACE_Reverse_Iterator<T>::impl () { return *this->implementation_; } template <class KEY, class VALUE> ACE_INLINE -ACE_Map<KEY, VALUE>::ACE_Map (void) +ACE_Map<KEY, VALUE>::ACE_Map () { } template <class KEY, class VALUE> ACE_INLINE ACE_Iterator<ACE_Reference_Pair<const KEY, VALUE> > -ACE_Map<KEY, VALUE>::begin (void) +ACE_Map<KEY, VALUE>::begin () { return iterator (this->begin_impl ()); } template <class KEY, class VALUE> ACE_INLINE ACE_Iterator<ACE_Reference_Pair<const KEY, VALUE> > -ACE_Map<KEY, VALUE>::end (void) +ACE_Map<KEY, VALUE>::end () { return iterator (this->end_impl ()); } template <class KEY, class VALUE> ACE_INLINE ACE_Reverse_Iterator<ACE_Reference_Pair<const KEY, VALUE> > -ACE_Map<KEY, VALUE>::rbegin (void) +ACE_Map<KEY, VALUE>::rbegin () { return reverse_iterator (this->rbegin_impl ()); } template <class KEY, class VALUE> ACE_INLINE ACE_Reverse_Iterator<ACE_Reference_Pair<const KEY, VALUE> > -ACE_Map<KEY, VALUE>::rend (void) +ACE_Map<KEY, VALUE>::rend () { return reverse_iterator (this->rend_impl ()); } @@ -222,7 +222,7 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Iterator_A } template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE IMPLEMENTATION & -ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void) +ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl () { return this->implementation_; } @@ -234,7 +234,7 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::ACE_Map_Impl_Re } template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE IMPLEMENTATION & -ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void) +ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl () { return this->implementation_; } @@ -254,7 +254,7 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ACE } template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE IMPLEMENTATION & -ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::impl (void) +ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::impl () { return this->implementation_; } @@ -266,7 +266,7 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manager_Iterat } template <class T, class VALUE> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> & -ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl (void) +ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::impl () { return this->implementation_; } @@ -278,7 +278,7 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::ACE_Active_Map_Manage } template <class T, class VALUE> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> & -ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl (void) +ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl () { return this->implementation_; } @@ -298,13 +298,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::ACE_Active_Map_Manager_ } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Active_Map_Manager<std::pair<KEY, VALUE> > & -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::impl (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::impl () { return this->implementation_; } template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE KEY_ADAPTER & -ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter (void) +ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::key_adapter () { return this->key_adapter_; } @@ -316,7 +316,7 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>: } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> & -ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl (void) +ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl () { return this->implementation_; } @@ -328,7 +328,7 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR } template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> & -ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl (void) +ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::impl () { return this->implementation_; } @@ -348,13 +348,13 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> & -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::impl (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::impl () { return this->implementation_; } template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE KEY_GENERATOR & -ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::key_generator (void) +ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::key_generator () { return this->key_generator_; } @@ -366,7 +366,7 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Iterator_Adapte } template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> & -ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl (void) +ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::impl () { return this->implementation_; } @@ -378,7 +378,7 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::ACE_Map_Manager_Reverse } template <class T, class KEY, class VALUE> ACE_INLINE ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> & -ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl (void) +ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl () { return this->implementation_; } @@ -398,13 +398,13 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::ACE_Map_Manager_Adapter (siz } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> & -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::impl (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::impl () { return this->implementation_; } template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE KEY_GENERATOR & -ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator (void) +ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::key_generator () { return this->key_generator_; } diff --git a/ACE/ace/Message_Block.h b/ACE/ace/Message_Block.h index 1ad30dd0338..954071060f4 100644 --- a/ACE/ace/Message_Block.h +++ b/ACE/ace/Message_Block.h @@ -241,22 +241,22 @@ public: * @note Note that release() is designed to release the continuation * chain; the destructor is not. See release() for details. */ - virtual ~ACE_Message_Block (void); + virtual ~ACE_Message_Block (); // = Message Type accessors and mutators. /// Get type of the message. - ACE_Message_Type msg_type (void) const; + ACE_Message_Type msg_type () const; /// Set type of the message. void msg_type (ACE_Message_Type type); /// Find out what type of message this is. - int is_data_msg (void) const; + int is_data_msg () const; /// Find out what class of message this is (there are two classes, /// @c normal messages and @c high-priority messages). - ACE_Message_Type msg_class (void) const; + ACE_Message_Type msg_class () const; // = Message flag accessors and mutators. /// Bitwise-or the @a more_flags into the existing message flags and @@ -268,7 +268,7 @@ public: Message_Flags clr_flags (Message_Flags less_flags); /// Get the current message flags. - Message_Flags flags (void) const; + Message_Flags flags () const; // = Data Block flag accessors and mutators. /// Bitwise-or the @a more_flags into the existing message flags and @@ -285,22 +285,22 @@ public: Message_Flags clr_self_flags (ACE_Message_Block::Message_Flags less_flags); /// Get the current message flags. - Message_Flags self_flags (void) const; + Message_Flags self_flags () const; /// Get priority of the message. - unsigned long msg_priority (void) const; + unsigned long msg_priority () const; /// Set priority of the message. void msg_priority (unsigned long priority); /// Get execution time associated with the message. - const ACE_Time_Value &msg_execution_time (void) const; + const ACE_Time_Value &msg_execution_time () const; /// Set execution time associated with the message. void msg_execution_time (const ACE_Time_Value &et); /// Get absolute time of deadline associated with the message. - const ACE_Time_Value &msg_deadline_time (void) const; + const ACE_Time_Value &msg_deadline_time () const; /// Set absolute time of deadline associated with the message. void msg_deadline_time (const ACE_Time_Value &dt); @@ -312,7 +312,7 @@ public: virtual ACE_Message_Block *clone (Message_Flags mask = 0) const; /// Return a "shallow" copy that increments our reference count by 1. - virtual ACE_Message_Block *duplicate (void) const; + virtual ACE_Message_Block *duplicate () const; /** * Return a "shallow" copy that increments our reference count by 1. @@ -349,7 +349,7 @@ public: * @retval 0, always, and the object this method was invoked on is no * longer valid. */ - virtual ACE_Message_Block *release (void); + virtual ACE_Message_Block *release (); /** * This behaves like the non-static method release(), except that it @@ -395,11 +395,11 @@ public: /// then readjusts <rd_ptr> to point to <base> and <wr_ptr> to point /// to <base> + the length of the moved data. Returns -1 and does /// nothing if the <rd_ptr> is > <wr_ptr>, else 0 on success. - int crunch (void); + int crunch (); /// Resets the Message Block data to contain nothing, i.e., sets the /// read and write pointers to align with the base. - void reset (void); + void reset (); /// Access all the allocators in the message block. /// @todo Not sure whether we would need finer control while @@ -433,7 +433,7 @@ public: ACE_Allocator *message_block_allocator = 0); /// Get message data. - char *base (void) const; + char *base () const; /// Set message data (doesn't reallocate). void base (char *data, @@ -441,17 +441,17 @@ public: Message_Flags = DONT_DELETE); /// Return a pointer to 1 past the end of the allocated data in a message. - char *end (void) const; + char *end () const; /** * Return a pointer to 1 past the end of the allotted data in a message. * Allotted data may be less than allocated data if a value smaller than * capacity() to is passed to size(). */ - char *mark (void) const; + char *mark () const; /// Get the read pointer. - char *rd_ptr (void) const; + char *rd_ptr () const; /// Set the read pointer to @a ptr. void rd_ptr (char *ptr); @@ -460,7 +460,7 @@ public: void rd_ptr (size_t n); /// Get the write pointer. - char *wr_ptr (void) const; + char *wr_ptr () const; /// Set the write pointer to @a ptr. void wr_ptr (char *ptr); @@ -478,18 +478,18 @@ public: */ //@{ /// Get the length of the message - size_t length (void) const; + size_t length () const; /// Set the length of the message void length (size_t n); /// Get the length of the Message_Blocks, including chained /// Message_Blocks. - size_t total_length (void) const; + size_t total_length () const; /// Get the total number of bytes in all Message_Blocks, including /// chained Message_Blocks. - size_t total_size (void) const; + size_t total_size () const; /// Get the total number of bytes and total length in all /// Message_Blocks, including chained Message_Blocks. @@ -498,7 +498,7 @@ public: /// Get the number of bytes in the top-level Message_Block (i.e., /// does not consider the bytes in chained Message_Blocks). - size_t size (void) const; + size_t size () const; /** * Set the number of bytes in the top-level Message_Block, @@ -510,14 +510,14 @@ public: /// Get the number of allocated bytes in all Message_Block, including /// chained Message_Blocks. - size_t total_capacity (void) const; + size_t total_capacity () const; /// Get the number of allocated bytes in the top-level Message_Block. - size_t capacity (void) const; + size_t capacity () const; /// Get the number of bytes available after the <wr_ptr_> in the /// top-level Message_Block. - size_t space (void) const; + size_t space () const; //@} // = ACE_Data_Block methods. @@ -527,7 +527,7 @@ public: * still references the block; this call does not change the reference * count. */ - ACE_Data_Block *data_block (void) const; + ACE_Data_Block *data_block () const; /** * Set a new data block pointer. The original ACE_Data_Block is released @@ -544,37 +544,37 @@ public: // = The continuation field chains together composite messages. /// Get the continuation field. - ACE_Message_Block *cont (void) const; + ACE_Message_Block *cont () const; /// Set the continuation field. void cont (ACE_Message_Block *); // = Pointer to the Message_Block directly ahead in the ACE_Message_Queue. /// Get link to next message. - ACE_Message_Block *next (void) const; + ACE_Message_Block *next () const; /// Set link to next message. void next (ACE_Message_Block *); // = Pointer to the Message_Block directly behind in the ACE_Message_Queue. /// Get link to prev message. - ACE_Message_Block *prev (void) const; + ACE_Message_Block *prev () const; /// Set link to prev message. void prev (ACE_Message_Block *); // = The locking strategy prevents race conditions. /// Get the locking strategy. - ACE_Lock *locking_strategy (void); + ACE_Lock *locking_strategy (); /// Set a new locking strategy and return the hold one. ACE_Lock *locking_strategy (ACE_Lock *); /// Get the current reference count. - int reference_count (void) const; + int reference_count () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -675,7 +675,7 @@ class ACE_Export ACE_Data_Block { public: /// Default "do-nothing" constructor. - ACE_Data_Block (void); + ACE_Data_Block (); /// Initialize. ACE_Data_Block (size_t size, @@ -687,16 +687,16 @@ public: ACE_Allocator *data_block_allocator); /// Delete all the resources held in the message. - virtual ~ACE_Data_Block (void); + virtual ~ACE_Data_Block (); /// Get type of the message. - ACE_Message_Block::ACE_Message_Type msg_type (void) const; + ACE_Message_Block::ACE_Message_Type msg_type () const; /// Set type of the message. void msg_type (ACE_Message_Block::ACE_Message_Type type); /// Get message data pointer - char *base (void) const; + char *base () const; /// Set message data pointer (doesn't reallocate). void base (char *data, @@ -704,27 +704,27 @@ public: ACE_Message_Block::Message_Flags mflags = ACE_Message_Block::DONT_DELETE); /// Return a pointer to 1 past the end of the allocated data in a message. - char *end (void) const; + char *end () const; /** * Return a pointer to 1 past the end of the allotted data in a message. * The allotted data may be less than allocated data if <size()> is passed * an argument less than <capacity()>. */ - char *mark (void) const; + char *mark () const; // = Message size is the total amount of space allocated. /// Get the total amount of allotted space in the message. The amount of /// allotted space may be less than allocated space. - size_t size (void) const; + size_t size () const; /// Set the total amount of space in the message. Returns 0 if /// successful, else -1. int size (size_t length); /// Get the total amount of allocated space. - size_t capacity (void) const; + size_t capacity () const; /** * Return an exact "deep copy" of the message, i.e., create fresh @@ -747,7 +747,7 @@ public: size_t max_size = 0) const; /// Return a "shallow" copy that increments our reference count by 1. - ACE_Data_Block *duplicate (void); + ACE_Data_Block *duplicate (); /** * Decrease the shared reference count by 1. If the reference count @@ -767,33 +767,33 @@ public: ACE_Message_Block::Message_Flags clr_flags (ACE_Message_Block::Message_Flags less_flags); /// Get the current message flags. - ACE_Message_Block::Message_Flags flags (void) const; + ACE_Message_Block::Message_Flags flags () const; /// Obtain the allocator strategy. - ACE_Allocator *allocator_strategy (void) const; + ACE_Allocator *allocator_strategy () const; // = The locking strategy prevents race conditions. /// Get the locking strategy. - ACE_Lock *locking_strategy (void); + ACE_Lock *locking_strategy (); /// Set a new locking strategy and return the hold one. ACE_Lock *locking_strategy (ACE_Lock *); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Get the current reference count. - int reference_count (void) const; + int reference_count () const; /// Get the allocator used to create this object - ACE_Allocator *data_block_allocator (void) const; + ACE_Allocator *data_block_allocator () const; protected: /// Internal release implementation - virtual ACE_Data_Block *release_i (void); + virtual ACE_Data_Block *release_i (); /// Internal get the current reference count. - int reference_count_i (void) const; + int reference_count_i () const; /** * Decrease the reference count, but don't delete the object. diff --git a/ACE/ace/Message_Block.inl b/ACE/ace/Message_Block.inl index 1bc636fbd7a..f6d69e9cf01 100644 --- a/ACE/ace/Message_Block.inl +++ b/ACE/ace/Message_Block.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Data_Block * -ACE_Message_Block::data_block (void) const +ACE_Message_Block::data_block () const { ACE_TRACE ("ACE_Message_Block::data_block"); return this->data_block_; @@ -27,40 +27,40 @@ ACE_Message_Block::clr_self_flags (ACE_Message_Block::Message_Flags less_flags) } ACE_INLINE ACE_Message_Block::Message_Flags -ACE_Message_Block::self_flags (void) const +ACE_Message_Block::self_flags () const { ACE_TRACE ("ACE_Message_Block::self_flags"); return this->flags_; } ACE_INLINE int -ACE_Data_Block::reference_count_i (void) const +ACE_Data_Block::reference_count_i () const { return reference_count_; } ACE_INLINE int -ACE_Message_Block::reference_count (void) const +ACE_Message_Block::reference_count () const { return data_block () ? data_block ()->reference_count () : 0; } ACE_INLINE char * -ACE_Data_Block::base (void) const +ACE_Data_Block::base () const { ACE_TRACE ("ACE_Data_Block::base"); return this->base_; } ACE_INLINE size_t -ACE_Data_Block::size (void) const +ACE_Data_Block::size () const { ACE_TRACE ("ACE_Data_Block::size"); return this->cur_size_; } ACE_INLINE size_t -ACE_Data_Block::capacity (void) const +ACE_Data_Block::capacity () const { ACE_TRACE ("ACE_Data_Block::capacity"); return this->max_size_; @@ -85,14 +85,14 @@ ACE_Data_Block::clr_flags (ACE_Message_Block::Message_Flags less_flags) } ACE_INLINE ACE_Message_Block::Message_Flags -ACE_Data_Block::flags (void) const +ACE_Data_Block::flags () const { ACE_TRACE ("ACE_Data_Block::flags"); return this->flags_; } ACE_INLINE ACE_Allocator* -ACE_Data_Block::data_block_allocator (void) const +ACE_Data_Block::data_block_allocator () const { ACE_TRACE ("ACE_Data_Block::data_block_allocator"); return this->data_block_allocator_; @@ -113,7 +113,7 @@ ACE_Message_Block::clr_flags (ACE_Message_Block::Message_Flags less_flags) } ACE_INLINE ACE_Message_Block::Message_Flags -ACE_Message_Block::flags (void) const +ACE_Message_Block::flags () const { ACE_TRACE ("ACE_Message_Block::flags"); return this->data_block ()->flags (); @@ -122,7 +122,7 @@ ACE_Message_Block::flags (void) const // Return the length of the "active" portion of the message. ACE_INLINE size_t -ACE_Message_Block::length (void) const +ACE_Message_Block::length () const { ACE_TRACE ("ACE_Message_Block::length"); return this->wr_ptr_ - this->rd_ptr_; @@ -141,21 +141,21 @@ ACE_Message_Block::length (size_t len) // Return the length of the potential size of the message. ACE_INLINE size_t -ACE_Message_Block::size (void) const +ACE_Message_Block::size () const { ACE_TRACE ("ACE_Message_Block::size"); return this->data_block ()->size (); } ACE_INLINE size_t -ACE_Message_Block::capacity (void) const +ACE_Message_Block::capacity () const { ACE_TRACE ("ACE_Message_Block::capacity"); return this->data_block ()->capacity (); } ACE_INLINE ACE_Message_Block::ACE_Message_Type -ACE_Data_Block::msg_type (void) const +ACE_Data_Block::msg_type () const { ACE_TRACE ("ACE_Data_Block::msg_type"); return this->type_; @@ -169,7 +169,7 @@ ACE_Data_Block::msg_type (ACE_Message_Block::ACE_Message_Type t) } ACE_INLINE ACE_Message_Block::ACE_Message_Type -ACE_Message_Block::msg_type (void) const +ACE_Message_Block::msg_type () const { ACE_TRACE ("ACE_Message_Block::msg_type"); return this->data_block ()->msg_type (); @@ -183,7 +183,7 @@ ACE_Message_Block::msg_type (ACE_Message_Block::ACE_Message_Type t) } ACE_INLINE ACE_Message_Block::ACE_Message_Type -ACE_Message_Block::msg_class (void) const +ACE_Message_Block::msg_class () const { ACE_TRACE ("ACE_Message_Block::msg_class"); @@ -196,7 +196,7 @@ ACE_Message_Block::msg_class (void) const } ACE_INLINE int -ACE_Message_Block::is_data_msg (void) const +ACE_Message_Block::is_data_msg () const { ACE_TRACE ("ACE_Message_Block::is_data_msg"); ACE_Message_Type mt = this->msg_type (); @@ -207,7 +207,7 @@ ACE_Message_Block::is_data_msg (void) const } ACE_INLINE unsigned long -ACE_Message_Block::msg_priority (void) const +ACE_Message_Block::msg_priority () const { ACE_TRACE ("ACE_Message_Block::msg_priority"); return this->priority_; @@ -221,7 +221,7 @@ ACE_Message_Block::msg_priority (unsigned long pri) } ACE_INLINE const ACE_Time_Value & -ACE_Message_Block::msg_execution_time (void) const +ACE_Message_Block::msg_execution_time () const { ACE_TRACE ("ACE_Message_Block::msg_execution_time (void)"); #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) @@ -243,7 +243,7 @@ ACE_Message_Block::msg_execution_time (const ACE_Time_Value &et) } ACE_INLINE const ACE_Time_Value & -ACE_Message_Block::msg_deadline_time (void) const +ACE_Message_Block::msg_deadline_time () const { ACE_TRACE ("ACE_Message_Block::msg_deadline_time (void)"); @@ -279,7 +279,7 @@ ACE_Message_Block::access_allocators (ACE_Allocator *& allocator_strategy, } ACE_INLINE char * -ACE_Message_Block::base (void) const +ACE_Message_Block::base () const { ACE_TRACE ("ACE_Message_Block::base"); return this->data_block ()->base (); @@ -297,7 +297,7 @@ ACE_Message_Block::base (char *msg_data, } ACE_INLINE char * -ACE_Message_Block::rd_ptr (void) const +ACE_Message_Block::rd_ptr () const { ACE_TRACE ("ACE_Message_Block::rd_ptr"); return this->base () + this->rd_ptr_; @@ -313,28 +313,28 @@ ACE_Message_Block::wr_ptr (char *new_ptr) // Return a pointer to 1 past the end of the data buffer. ACE_INLINE char * -ACE_Data_Block::mark (void) const +ACE_Data_Block::mark () const { ACE_TRACE ("ACE_Data_Block::mark"); return this->base_ + this->cur_size_; } ACE_INLINE char * -ACE_Message_Block::mark (void) const +ACE_Message_Block::mark () const { ACE_TRACE ("ACE_Message_Block::mark"); return this->data_block ()->mark (); } ACE_INLINE char * -ACE_Data_Block::end (void) const +ACE_Data_Block::end () const { ACE_TRACE ("ACE_Data_Block::end"); return this->base_ + this->max_size_; } ACE_INLINE char * -ACE_Message_Block::end (void) const +ACE_Message_Block::end () const { ACE_TRACE ("ACE_Message_Block::end"); return this->data_block ()->end (); @@ -356,7 +356,7 @@ ACE_Message_Block::rd_ptr (size_t n) } ACE_INLINE char * -ACE_Message_Block::wr_ptr (void) const +ACE_Message_Block::wr_ptr () const { ACE_TRACE ("ACE_Message_Block::wr_ptr"); return this->base () + this->wr_ptr_; @@ -370,7 +370,7 @@ ACE_Message_Block::wr_ptr (size_t n) } ACE_INLINE void -ACE_Message_Block::reset (void) +ACE_Message_Block::reset () { ACE_TRACE ("ACE_Message_Block::reset"); this->rd_ptr_ = 0; @@ -378,7 +378,7 @@ ACE_Message_Block::reset (void) } ACE_INLINE size_t -ACE_Message_Block::space (void) const +ACE_Message_Block::space () const { ACE_TRACE ("ACE_Message_Block::space"); return this->mark () - this->wr_ptr (); @@ -410,7 +410,7 @@ ACE_Message_Block::cont (ACE_Message_Block *cont_msg) } ACE_INLINE ACE_Message_Block * -ACE_Message_Block::cont (void) const +ACE_Message_Block::cont () const { ACE_TRACE ("ACE_Message_Block::cont"); return this->cont_; @@ -442,7 +442,7 @@ ACE_Message_Block::next (ACE_Message_Block *next_msg) } ACE_INLINE ACE_Message_Block * -ACE_Message_Block::next (void) const +ACE_Message_Block::next () const { ACE_TRACE ("ACE_Message_Block::next"); return this->next_; @@ -456,21 +456,21 @@ ACE_Message_Block::prev (ACE_Message_Block *next_msg) } ACE_INLINE ACE_Message_Block * -ACE_Message_Block::prev (void) const +ACE_Message_Block::prev () const { ACE_TRACE ("ACE_Message_Block::prev"); return this->prev_; } ACE_INLINE ACE_Allocator * -ACE_Data_Block::allocator_strategy (void) const +ACE_Data_Block::allocator_strategy () const { ACE_TRACE ("ACE_Data_Block::allocator_strategy"); return this->allocator_strategy_; } ACE_INLINE ACE_Lock * -ACE_Data_Block::locking_strategy (void) +ACE_Data_Block::locking_strategy () { ACE_TRACE ("ACE_Data_Block::locking_strategy"); return this->locking_strategy_; @@ -487,7 +487,7 @@ ACE_Data_Block::locking_strategy (ACE_Lock *nls) } ACE_INLINE ACE_Lock * -ACE_Message_Block::locking_strategy (void) +ACE_Message_Block::locking_strategy () { ACE_TRACE ("ACE_Message_Block::locking_strategy"); return this->data_block ()->locking_strategy (); diff --git a/ACE/ace/Message_Block_T.cpp b/ACE/ace/Message_Block_T.cpp index e4161efed1c..57a9923a257 100644 --- a/ACE/ace/Message_Block_T.cpp +++ b/ACE/ace/Message_Block_T.cpp @@ -12,7 +12,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class L> -ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void) +ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block () { } diff --git a/ACE/ace/Message_Block_T.h b/ACE/ace/Message_Block_T.h index eebb9408192..d2e854d82cd 100644 --- a/ACE/ace/Message_Block_T.h +++ b/ACE/ace/Message_Block_T.h @@ -37,7 +37,7 @@ class ACE_Locked_Data_Block : public ACE_Data_Block { public: /// Default "do-nothing" constructor. - ACE_Locked_Data_Block (void); + ACE_Locked_Data_Block (); /// Initialize. ACE_Locked_Data_Block (size_t size, @@ -48,7 +48,7 @@ public: ACE_Allocator *data_block_allocator); /// Delete all the resources held in the message. - virtual ~ACE_Locked_Data_Block (void); + virtual ~ACE_Locked_Data_Block (); /** * Return an exact "deep copy" of the message, the dynamic type is diff --git a/ACE/ace/Message_Block_T.inl b/ACE/ace/Message_Block_T.inl index cdc1b73872f..af729e9f450 100644 --- a/ACE/ace/Message_Block_T.inl +++ b/ACE/ace/Message_Block_T.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template<class ACE_LOCK> ACE_INLINE -ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block (void) +ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block () { this->locking_strategy_ = &this->lock_; } 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_NT.h b/ACE/ace/Message_Queue_NT.h index 9cf0520033a..62975cfdc64 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -182,10 +182,10 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - - // Disallow copying and assignment. - ACE_Message_Queue_NT (const ACE_Message_Queue_NT &); - void operator= (const ACE_Message_Queue_NT &); + ACE_Message_Queue_NT (const ACE_Message_Queue_NT &) = delete; + void operator= (const ACE_Message_Queue_NT &) = delete; + ACE_Message_Queue_NT (ACE_Message_Queue_NT &&) = delete; + void operator= (ACE_Message_Queue_NT &&) = delete; private: // = Internal states. 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/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h index 2ff5a390650..73ccc957720 100644 --- a/ACE/ace/Message_Queue_Vx.h +++ b/ACE/ace/Message_Queue_Vx.h @@ -190,10 +190,10 @@ protected: MSG_Q_ID msgq (void); private: - - // Disallow copying and assignment. - ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &); - void operator= (const ACE_Message_Queue_Vx &); + ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &) = delete; + void operator= (const ACE_Message_Queue_Vx &) = delete; + ACE_Message_Queue_Vx (ACE_Message_Queue_Vx &&) = delete; + void operator= (ACE_Message_Queue_Vx &&) = delete; virtual int peek_dequeue_head (ACE_Message_Block *&first_item, ACE_Time_Value *tv = 0); diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h index c742dcd92e7..2b59488e9e7 100644 --- a/ACE/ace/Method_Request.h +++ b/ACE/ace/Method_Request.h @@ -79,10 +79,10 @@ public: virtual int call (void) = 0; private: - - /// Disallow copying and assignment. - ACE_Method_Request (const ACE_Method_Request &); - void operator= (const ACE_Method_Request &); + ACE_Method_Request (const ACE_Method_Request &) = delete; + void operator= (const ACE_Method_Request &) = delete; + ACE_Method_Request (ACE_Method_Request &&) = delete; + void operator= (ACE_Method_Request &&) = delete; protected: /// The priority of the request. 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/Mutex.h b/ACE/ace/Mutex.h index 159f57da038..2f371a772a5 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -55,17 +55,17 @@ public: mode_t mode = ACE_DEFAULT_FILE_PERMS); /// Implicitly destroy the mutex. - ~ACE_Mutex (void); + ~ACE_Mutex (); /// Explicitly destroy the mutex. /** * @note Only one thread should call this method since it doesn't * protect against race conditions. */ - int remove (void); + int remove (); /// Acquire lock ownership (wait on queue if necessary). - int acquire (void); + int acquire (); /// Block the thread until the mutex is acquired or @a tv times out, /// in which case -1 is returned and @c errno == @c ETIME. @@ -94,24 +94,24 @@ public: * @return -1 on failure. If we "failed" because someone * else already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock and unblock a thread at head of queue. - int release (void); + int release (); /// Acquire mutex ownership. /** * This calls @c acquire and is only here to make the @c ACE_Mutex * interface consistent with the other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /// Acquire mutex ownership. /** * This calls @c acquire and is only here to make the @c ACE_Mutex * interface consistent with the other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /// Conditionally acquire mutex (i.e., won't block). /** @@ -121,7 +121,7 @@ public: * @return -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /// Conditionally acquire mutex (i.e., won't block). /** @@ -131,25 +131,25 @@ public: * @return -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here for consistency with the other synchronization * APIs and usability with Lock adapters. Assumes the caller already has * acquired the mutex and returns 0 in all cases. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// Return the underlying mutex. - const ACE_mutex_t &lock (void) const; - ACE_mutex_t &lock (void); + const ACE_mutex_t &lock () const; + ACE_mutex_t &lock (); /// If a file was created as the underlying storage for the mutex, /// remove it from the filesystem (for process-shared mutexes). static int unlink (const ACE_TCHAR *name); /// 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/Mutex.inl b/ACE/ace/Mutex.inl index 42870709716..7adfceaa12c 100644 --- a/ACE/ace/Mutex.inl +++ b/ACE/ace/Mutex.inl @@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_Mutex::acquire_read (void) +ACE_Mutex::acquire_read () { // ACE_TRACE ("ACE_Mutex::acquire_read"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -23,7 +23,7 @@ ACE_Mutex::acquire_read (void) } ACE_INLINE int -ACE_Mutex::acquire_write (void) +ACE_Mutex::acquire_write () { // ACE_TRACE ("ACE_Mutex::acquire_write"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -37,7 +37,7 @@ ACE_Mutex::acquire_write (void) } ACE_INLINE int -ACE_Mutex::tryacquire_read (void) +ACE_Mutex::tryacquire_read () { // ACE_TRACE ("ACE_Mutex::tryacquire_read"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -51,7 +51,7 @@ ACE_Mutex::tryacquire_read (void) } ACE_INLINE const ACE_mutex_t & -ACE_Mutex::lock (void) const +ACE_Mutex::lock () const { // ACE_TRACE ("ACE_Mutex::lock"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -62,7 +62,7 @@ ACE_Mutex::lock (void) const } ACE_INLINE ACE_mutex_t & -ACE_Mutex::lock (void) +ACE_Mutex::lock () { // ACE_TRACE ("ACE_Mutex::lock"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -73,7 +73,7 @@ ACE_Mutex::lock (void) } ACE_INLINE int -ACE_Mutex::tryacquire_write (void) +ACE_Mutex::tryacquire_write () { // ACE_TRACE ("ACE_Mutex::tryacquire_write"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -87,14 +87,14 @@ ACE_Mutex::tryacquire_write (void) } ACE_INLINE int -ACE_Mutex::tryacquire_write_upgrade (void) +ACE_Mutex::tryacquire_write_upgrade () { // ACE_TRACE ("ACE_Mutex::tryacquire_write_upgrade"); return 0; } ACE_INLINE int -ACE_Mutex::acquire (void) +ACE_Mutex::acquire () { // ACE_TRACE ("ACE_Mutex::acquire"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -135,7 +135,7 @@ ACE_Mutex::acquire (ACE_Time_Value *tv) } ACE_INLINE int -ACE_Mutex::tryacquire (void) +ACE_Mutex::tryacquire () { // ACE_TRACE ("ACE_Mutex::tryacquire"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -149,7 +149,7 @@ ACE_Mutex::tryacquire (void) } ACE_INLINE int -ACE_Mutex::release (void) +ACE_Mutex::release () { // ACE_TRACE ("ACE_Mutex::release"); #ifdef ACE_MUTEX_PROCESS_LOCK_IS_MUTEX @@ -163,7 +163,7 @@ ACE_Mutex::release (void) } ACE_INLINE int -ACE_Mutex::remove (void) +ACE_Mutex::remove () { // ACE_TRACE ("ACE_Mutex::remove"); int result = 0; diff --git a/ACE/ace/Node.cpp b/ACE/ace/Node.cpp index f1ca0de37bb..b23dd0a9462 100644 --- a/ACE/ace/Node.cpp +++ b/ACE/ace/Node.cpp @@ -16,7 +16,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Node) template <class T, class C> -ACE_Node<T, C>::~ACE_Node (void) +ACE_Node<T, C>::~ACE_Node () { } diff --git a/ACE/ace/Node.h b/ACE/ace/Node.h index aecc69d83d1..d81e189d1f2 100644 --- a/ACE/ace/Node.h +++ b/ACE/ace/Node.h @@ -50,7 +50,7 @@ public: friend class ACE_Unbounded_Stack_Iterator<T>; /// This isn't necessary, but it keeps some compilers happy. - ~ACE_Node (void); + ~ACE_Node (); ACE_ALLOC_HOOK_DECLARE; 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/Null_Barrier.h b/ACE/ace/Null_Barrier.h index 50e4e2789ea..c1147907f4e 100644 --- a/ACE/ace/Null_Barrier.h +++ b/ACE/ace/Null_Barrier.h @@ -30,14 +30,14 @@ public: void * = 0) {}; /// Default dtor. - ~ACE_Null_Barrier (void) {}; + ~ACE_Null_Barrier () {}; /// Block the caller until all <count> threads have called <wait> and /// then allow all the caller threads to continue in parallel. - int wait (void) { return 0; }; + int wait () { return 0; }; /// 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/Null_Condition.h b/ACE/ace/Null_Condition.h index a86e0c54bec..bf4d4313a4e 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -49,10 +49,10 @@ public: void * = 0) : mutex_ ((ACE_Null_Mutex &) m) {} - ~ACE_Condition (void) {} + ~ACE_Condition () {} /// Returns 0. - int remove (void) {return 0;} + int remove () {return 0;} /// Returns -1 with @c errno == @c ETIME. int wait (const ACE_Time_Value * = 0) {errno = ETIME; return -1;} @@ -62,14 +62,14 @@ public: const ACE_Time_Value * = 0) {errno = ETIME; return -1;} /// Returns 0. - int signal (void) {return 0;} + int signal () {return 0;} /// Returns 0. - int broadcast (void) {return 0;} - ACE_Null_Mutex &mutex (void) {return this->mutex_;}; + int broadcast () {return 0;} + ACE_Null_Mutex &mutex () {return this->mutex_;}; /// Dump the state of an object. - void dump (void) const {} + void dump () const {} // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h index cf2ab6c0e25..63d449ecd1e 100644 --- a/ACE/ace/Null_Mutex.h +++ b/ACE/ace/Null_Mutex.h @@ -38,12 +38,12 @@ class ACE_Export ACE_Null_Mutex public: ACE_Null_Mutex (const ACE_TCHAR * = 0) : lock_ (0) {} - ~ACE_Null_Mutex (void) {} + ~ACE_Null_Mutex () {} /// Return 0. - int remove (void) {return 0;} + int remove () {return 0;} /// Return 0. - int acquire (void) {return 0;} + int acquire () {return 0;} /// Return -1 with @c errno == @c ETIME. int acquire (ACE_Time_Value &) {errno = ETIME; return -1;} @@ -52,28 +52,28 @@ public: int acquire (ACE_Time_Value *) {errno = ETIME; return -1;} /// Return 0. - int tryacquire (void) {return 0;} + int tryacquire () {return 0;} /// Return 0. - int release (void) {return 0;} + int release () {return 0;} /// Return 0. - int acquire_write (void) {return 0;} + int acquire_write () {return 0;} /// Return 0. - int tryacquire_write (void) {return 0;} + int tryacquire_write () {return 0;} /// Return 0. - int tryacquire_write_upgrade (void) {return 0;} + int tryacquire_write_upgrade () {return 0;} /// Return 0. - int acquire_read (void) {return 0;} + int acquire_read () {return 0;} /// Return 0. - int tryacquire_read (void) {return 0;} + int tryacquire_read () {return 0;} /// Dump the state of an object. - void dump (void) const {} + void dump () const {} /// Declare the dynamic allocation hooks. //ACE_ALLOC_HOOK_DECLARE; @@ -106,20 +106,19 @@ public: ~ACE_Guard (void) {} #endif /* ACE_WIN32 */ - int acquire (void) { return 0; } - int tryacquire (void) { return 0; } - int release (void) { return 0; } - void disown (void) {} - int locked (void) { return 1; } - int remove (void) { return 0; } - void dump (void) const {} + int acquire () { return 0; } + int tryacquire () { return 0; } + int release () { return 0; } + void disown () {} + int locked () { return 1; } + int remove () { return 0; } + void dump () const {} private: - - // Disallow copying and assignment. - ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &); - void operator= (const ACE_Guard<ACE_Null_Mutex> &); - + ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &) = delete; + void operator= (const ACE_Guard<ACE_Null_Mutex> &) = delete; + ACE_Guard (ACE_Guard<ACE_Null_Mutex> &&) = delete; + void operator= (ACE_Guard<ACE_Null_Mutex> &&) = delete; }; template <class ACE_LOCK> @@ -139,11 +138,11 @@ public: ACE_Write_Guard (ACE_Null_Mutex &m, int blocked) : ACE_Guard<ACE_Null_Mutex> (m, blocked) {} - int acquire_write (void) { return 0; } - int acquire (void) { return 0; } - int tryacquire_write (void) { return 0; } - int tryacquire (void) { return 0; } - void dump (void) const {} + int acquire_write () { return 0; } + int acquire () { return 0; } + int tryacquire_write () { return 0; } + int tryacquire () { return 0; } + void dump () const {} }; template <class ACE_LOCK> @@ -163,11 +162,11 @@ public: ACE_Read_Guard (ACE_Null_Mutex &m, int blocked) : ACE_Guard<ACE_Null_Mutex> (m, blocked) {} - int acquire_read (void) { return 0; } - int acquire (void) { return 0; } - int tryacquire_read (void) { return 0; } - int tryacquire (void) { return 0; } - void dump (void) const {} + int acquire_read () { return 0; } + int acquire () { return 0; } + int tryacquire_read () { return 0; } + int tryacquire () { return 0; } + void dump () const {} }; // FUZZ: enable check_for_ACE_Guard diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h index 3e35bdff291..8656098ead9 100644 --- a/ACE/ace/Null_Semaphore.h +++ b/ACE/ace/Null_Semaphore.h @@ -51,12 +51,12 @@ public: const ACE_TCHAR * = 0, void * = 0, int = 0x7fffffff) {} - ~ACE_Null_Semaphore (void) {} + ~ACE_Null_Semaphore () {} /// Return 0. - int remove (void) {return 0;} + int remove () {return 0;} /// Return 0. - int acquire (void) {return 0;} + int acquire () {return 0;} /// Return -1 with @c errno == @c ETIME. int acquire (ACE_Time_Value &) {errno = ETIME; return -1;} @@ -65,31 +65,31 @@ public: int acquire (ACE_Time_Value *) {errno = ETIME; return -1;} /// Return 0. - int tryacquire (void) {return 0;} + int tryacquire () {return 0;} /// Return 0. - int release (void) {return 0;} + int release () {return 0;} /// Return 0. int release (size_t) {return 0;} /// Return 0. - int acquire_write (void) {return 0;} + int acquire_write () {return 0;} /// Return 0. - int tryacquire_write (void) {return 0;} + int tryacquire_write () {return 0;} /// Return 0. - int tryacquire_write_upgrade (void) {return 0;} + int tryacquire_write_upgrade () {return 0;} /// Return 0. - int acquire_read (void) {return 0;} + int acquire_read () {return 0;} /// Return 0. - int tryacquire_read (void) {return 0;} + int tryacquire_read () {return 0;} /// 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/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h index d8e7ca6adf4..b842ef71de9 100644 --- a/ACE/ace/Numeric_Limits.h +++ b/ACE/ace/Numeric_Limits.h @@ -210,8 +210,8 @@ struct ACE_Export ACE_Numeric_Limits<long double> template <typename T> struct ACE_Numeric_Limits { - static T min (void) { return std::numeric_limits<T>::min (); } - static T max (void) { return std::numeric_limits<T>::max (); } + static T min () { return std::numeric_limits<T>::min (); } + static T max () { return std::numeric_limits<T>::max (); } }; #endif /* ACE_LACKS_NUMERIC_LIMITS */ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index be1a5eee3c3..de7d8420a4c 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -53,7 +53,7 @@ public: ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref); /// Reset the value of @c errno to <error>. - ~ACE_Errno_Guard (void); + ~ACE_Errno_Guard (); #if defined (ACE_HAS_WINCE_BROKEN_ERRNO) /// Assign @a errno_ref to <error_>. diff --git a/ACE/ace/OS_Errno.inl b/ACE/ace/OS_Errno.inl index 9fd2af39b92..0a7fa0f4ff2 100644 --- a/ACE/ace/OS_Errno.inl +++ b/ACE/ace/OS_Errno.inl @@ -26,7 +26,7 @@ ACE_Errno_Guard::ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref) } ACE_INLINE -ACE_Errno_Guard::~ACE_Errno_Guard (void) +ACE_Errno_Guard::~ACE_Errno_Guard () { #if defined (ACE_MT_SAFE) *errno_ptr_ = this->error_; diff --git a/ACE/ace/OS_Log_Msg_Attributes.h b/ACE/ace/OS_Log_Msg_Attributes.h index 6ef922b1ace..356c9a7b7f8 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.h +++ b/ACE/ace/OS_Log_Msg_Attributes.h @@ -42,7 +42,7 @@ class ACE_Export ACE_OS_Log_Msg_Attributes { public: /// Constructor - ACE_OS_Log_Msg_Attributes (void); + ACE_OS_Log_Msg_Attributes (); protected: friend class ACE_Log_Msg; diff --git a/ACE/ace/OS_Log_Msg_Attributes.inl b/ACE/ace/OS_Log_Msg_Attributes.inl index 222609f53d8..744ac94870f 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.inl +++ b/ACE/ace/OS_Log_Msg_Attributes.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes (void) : +ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes () : ostream_ (0), ostream_refcount_ (0), priority_mask_ (0), diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 98a24079307..e01e8a2b4f7 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -701,7 +701,7 @@ public: ACE_hthread_t thr_handle); /// Initialize the object using calls to ACE_OS::thr_self(). - ACE_Thread_ID (void); + ACE_Thread_ID (); /// Copy constructor. ACE_Thread_ID (const ACE_Thread_ID &id); @@ -710,13 +710,13 @@ public: ACE_Thread_ID& operator= (const ACE_Thread_ID &id); /// Get the thread id. - ACE_thread_t id (void) const; + ACE_thread_t id () const; /// Set the thread id. void id (ACE_thread_t); /// Get the thread handle. - ACE_hthread_t handle (void) const; + ACE_hthread_t handle () const; /// Set the thread handle. void handle (ACE_hthread_t); @@ -1629,7 +1629,7 @@ namespace ACE_OS { void thr_exit (ACE_THR_FUNC_RETURN status = 0); ACE_NAMESPACE_INLINE_FUNCTION - int thr_getconcurrency (void); + int thr_getconcurrency (); ACE_NAMESPACE_INLINE_FUNCTION int thr_getprio (ACE_hthread_t id, @@ -1740,16 +1740,16 @@ namespace ACE_OS { int thr_kill (ACE_thread_t thr_id, int signum); ACE_NAMESPACE_INLINE_FUNCTION - size_t thr_min_stack (void); + size_t thr_min_stack (); ACE_NAMESPACE_INLINE_FUNCTION - ACE_thread_t thr_self (void); + ACE_thread_t thr_self (); ACE_NAMESPACE_INLINE_FUNCTION void thr_self (ACE_hthread_t &); ACE_NAMESPACE_INLINE_FUNCTION - const char* thr_name (void); + const char* thr_name (); /// Stores a string version of the current thread id into buffer and /// returns the size of this thread id in bytes. @@ -1809,10 +1809,10 @@ namespace ACE_OS { int thr_suspend (ACE_hthread_t target_thread); ACE_NAMESPACE_INLINE_FUNCTION - void thr_testcancel (void); + void thr_testcancel (); ACE_NAMESPACE_INLINE_FUNCTION - void thr_yield (void); + void thr_yield (); //@{ @name A set of wrappers for mutex locks that only work within a single process. @@ -1952,17 +1952,17 @@ class ACE_Export ACE_event_t public: /// Constructor initializing all pointer fields to null - ACE_event_t (void); + ACE_event_t (); private: /// Lock the internal mutex/semaphore - int lock (void); + int lock (); /// Unlock the internal mutex/semaphore - int unlock (void); + int unlock (); /// Use the internal semaphore or condition variable to unblock one thread - int wake_one (void); + int wake_one (); /// Event name if process shared. char *name_; @@ -2014,13 +2014,13 @@ public: ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m); /// Implicitly release the lock. - ~ACE_OS_Thread_Mutex_Guard (void); + ~ACE_OS_Thread_Mutex_Guard (); /// Explicitly acquire the lock. - int acquire (void); + int acquire (); /// Explicitly release the lock. - int release (void); + int release (); protected: /// Reference to the mutex. @@ -2059,13 +2059,13 @@ public: ACE_OS_Recursive_Thread_Mutex_Guard (ACE_recursive_thread_mutex_t &m); /// Implicitly release the lock. - ~ACE_OS_Recursive_Thread_Mutex_Guard (void); + ~ACE_OS_Recursive_Thread_Mutex_Guard (); /// Explicitly acquire the lock. - int acquire (void); + int acquire (); /// Explicitly release the lock. - int release (void); + int release (); protected: /// Reference to the mutex. diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 8e1e1e94204..4b34fdeea11 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2821,7 +2821,7 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread) } ACE_INLINE int -ACE_OS::thr_getconcurrency (void) +ACE_OS::thr_getconcurrency () { ACE_OS_TRACE ("ACE_OS::thr_getconcurrency"); #if defined (ACE_HAS_THREADS) @@ -3108,7 +3108,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum) } ACE_INLINE size_t -ACE_OS::thr_min_stack (void) +ACE_OS::thr_min_stack () { ACE_OS_TRACE ("ACE_OS::thr_min_stack"); #if defined (ACE_HAS_THREADS) @@ -3180,7 +3180,7 @@ ACE_OS::thr_gettid (char buffer[], size_t buffer_length) } ACE_INLINE ACE_thread_t -ACE_OS::thr_self (void) +ACE_OS::thr_self () { // ACE_OS_TRACE ("ACE_OS::thr_self"); #if defined (ACE_HAS_THREADS) @@ -3200,7 +3200,7 @@ ACE_OS::thr_self (void) } ACE_INLINE const char* -ACE_OS::thr_name (void) +ACE_OS::thr_name () { #if defined (ACE_HAS_THREADS) #if defined (ACE_HAS_VXTHREADS) @@ -3555,7 +3555,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread) } ACE_INLINE void -ACE_OS::thr_testcancel (void) +ACE_OS::thr_testcancel () { ACE_OS_TRACE ("ACE_OS::thr_testcancel"); #if defined (ACE_HAS_THREADS) @@ -3572,7 +3572,7 @@ ACE_OS::thr_testcancel (void) } ACE_INLINE void -ACE_OS::thr_yield (void) +ACE_OS::thr_yield () { ACE_OS_TRACE ("ACE_OS::thr_yield"); #if defined (ACE_HAS_THREADS) @@ -3800,14 +3800,14 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m) ACE_INLINE int -ACE_OS_Thread_Mutex_Guard::acquire (void) +ACE_OS_Thread_Mutex_Guard::acquire () { return owner_ = ACE_OS::thread_mutex_lock (&lock_); } ACE_INLINE int -ACE_OS_Thread_Mutex_Guard::release (void) +ACE_OS_Thread_Mutex_Guard::release () { if (owner_ == -1) return 0; @@ -3836,14 +3836,14 @@ ACE_OS_Thread_Mutex_Guard::~ACE_OS_Thread_Mutex_Guard () ACE_INLINE int -ACE_OS_Recursive_Thread_Mutex_Guard::acquire (void) +ACE_OS_Recursive_Thread_Mutex_Guard::acquire () { return owner_ = ACE_OS::recursive_mutex_lock (&lock_); } ACE_INLINE int -ACE_OS_Recursive_Thread_Mutex_Guard::release (void) +ACE_OS_Recursive_Thread_Mutex_Guard::release () { if (owner_ == -1) return 0; @@ -3903,7 +3903,7 @@ ACE_Thread_ID::operator= (const ACE_Thread_ID &id) } ACE_INLINE -ACE_Thread_ID::ACE_Thread_ID (void) +ACE_Thread_ID::ACE_Thread_ID () : thread_id_ (ACE_OS::thr_self ()) { ACE_OS::thr_self (thread_handle_); @@ -3911,7 +3911,7 @@ ACE_Thread_ID::ACE_Thread_ID (void) ACE_INLINE ACE_thread_t -ACE_Thread_ID::id (void) const +ACE_Thread_ID::id () const { return this->thread_id_; } @@ -3923,7 +3923,7 @@ ACE_Thread_ID::id (ACE_thread_t thread_id) } ACE_INLINE ACE_hthread_t -ACE_Thread_ID::handle (void) const +ACE_Thread_ID::handle () const { return this->thread_handle_; } @@ -3951,7 +3951,7 @@ ACE_Thread_ID::operator!= (const ACE_Thread_ID &rhs) const #if !defined (ACE_WIN32) ACE_INLINE -ACE_event_t::ACE_event_t (void) : +ACE_event_t::ACE_event_t () : name_ (0), eventdata_ (0) { 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/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index a240a7fa9ff..407f68a2ee0 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -36,16 +36,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION - int last_error (void); + int last_error (); ACE_NAMESPACE_INLINE_FUNCTION void last_error (int error); ACE_NAMESPACE_INLINE_FUNCTION - int set_errno_to_last_error (void); + int set_errno_to_last_error (); ACE_NAMESPACE_INLINE_FUNCTION - int set_errno_to_wsa_last_error (void); + int set_errno_to_wsa_last_error (); #ifdef ACE_MQX int mqx_error_to_errno(int mqx_error); diff --git a/ACE/ace/OS_NS_errno.inl b/ACE/ace/OS_NS_errno.inl index cad5d49789b..408039c5526 100644 --- a/ACE/ace/OS_NS_errno.inl +++ b/ACE/ace/OS_NS_errno.inl @@ -4,7 +4,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_OS::last_error (void) +ACE_OS::last_error () { // ACE_OS_TRACE ("ACE_OS::last_error"); @@ -33,7 +33,7 @@ ACE_OS::last_error (int error) } ACE_INLINE int -ACE_OS::set_errno_to_last_error (void) +ACE_OS::set_errno_to_last_error () { # if defined (ACE_WIN32) return errno = ::GetLastError (); @@ -43,7 +43,7 @@ ACE_OS::set_errno_to_last_error (void) } ACE_INLINE int -ACE_OS::set_errno_to_wsa_last_error (void) +ACE_OS::set_errno_to_wsa_last_error () { # if defined (ACE_WIN32) return errno = ::WSAGetLastError (); diff --git a/ACE/ace/OS_NS_pwd.h b/ACE/ace/OS_NS_pwd.h index 4bdaf900107..86b91883639 100644 --- a/ACE/ace/OS_NS_pwd.h +++ b/ACE/ace/OS_NS_pwd.h @@ -40,10 +40,10 @@ namespace ACE_OS //@{ @name A set of wrappers for password routines. ACE_NAMESPACE_INLINE_FUNCTION - void endpwent (void); + void endpwent (); ACE_NAMESPACE_INLINE_FUNCTION - struct passwd *getpwent (void); + struct passwd *getpwent (); ACE_NAMESPACE_INLINE_FUNCTION struct passwd *getpwnam (const char *user); @@ -56,7 +56,7 @@ namespace ACE_OS struct passwd **result); ACE_NAMESPACE_INLINE_FUNCTION - void setpwent (void); + void setpwent (); //@} } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl index 3d680bba97b..ed75cfdc961 100644 --- a/ACE/ace/OS_NS_pwd.inl +++ b/ACE/ace/OS_NS_pwd.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Accessors to PWD file. ACE_INLINE void -ACE_OS::endpwent (void) +ACE_OS::endpwent () { #if !defined (ACE_LACKS_PWD_FUNCTIONS) ::endpwent (); @@ -14,7 +14,7 @@ ACE_OS::endpwent (void) } ACE_INLINE struct passwd * -ACE_OS::getpwent (void) +ACE_OS::getpwent () { #if !defined (ACE_LACKS_PWD_FUNCTIONS) return ::getpwent (); @@ -70,7 +70,7 @@ ACE_OS::getpwnam_r (const char *name, } ACE_INLINE void -ACE_OS::setpwent (void) +ACE_OS::setpwent () { #if !defined (ACE_LACKS_PWD_FUNCTIONS) ::setpwent (); diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index a7705077d04..68a7b56a0cd 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -189,7 +189,7 @@ namespace ACE_OS { { public: /// Dump state of the object. - void dump (void) const; + void dump () const; # if defined (ACE_WIN32) ACE_OVERLAPPED overlapped_; diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index ef50095ccf5..0b682b7485f 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -103,7 +103,7 @@ namespace ACE_OS { void _exit (int status = 0) ACE_GCC_NO_RETURN; ACE_NAMESPACE_INLINE_FUNCTION - void abort (void) ACE_GCC_NO_RETURN; + void abort () ACE_GCC_NO_RETURN; /** * Register an at exit hook. The @a name can be used to analyze shutdown @@ -195,7 +195,7 @@ namespace ACE_OS { // not in spec extern ACE_Export - ACE_TCHAR *getenvstrings (void); + ACE_TCHAR *getenvstrings (); // itoa not in spec /// Converts an integer to a string. @@ -276,7 +276,7 @@ namespace ACE_OS { int unsetenv(const char *name); ACE_NAMESPACE_INLINE_FUNCTION - int rand (void); + int rand (); ACE_NAMESPACE_INLINE_FUNCTION int rand_r (unsigned int *seed); diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 6e15308e442..356b258ae69 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -37,7 +37,7 @@ ACE_OS::_exit (int status) } ACE_INLINE void -ACE_OS::abort (void) +ACE_OS::abort () { #if defined (ACE_ANDROID) && (__ANDROID_API__ < 19) ACE_OS::_exit (128 + SIGABRT); @@ -407,7 +407,7 @@ ACE_OS::qsort (void *base, } ACE_INLINE int -ACE_OS::rand (void) +ACE_OS::rand () { ACE_OS_TRACE ("ACE_OS::rand"); #if !defined (ACE_LACKS_RAND) diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index faa6cd9bdfb..757a3bb1cd1 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -281,7 +281,7 @@ namespace ACE_OS char *if_indextoname (unsigned int ifindex, char *ifname); ACE_NAMESPACE_INLINE_FUNCTION - struct if_nameindex *if_nameindex (void); + struct if_nameindex *if_nameindex (); ACE_NAMESPACE_INLINE_FUNCTION void if_freenameindex (struct if_nameindex *ptr); @@ -294,7 +294,7 @@ namespace ACE_OS /// Finalize WinSock after last use (e.g., when a DLL is unloaded). extern ACE_Export - int socket_fini (void); + int socket_fini (); /// Create a BSD-style socket (no QoS). ACE_NAMESPACE_INLINE_FUNCTION diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 3da4104198e..53036af3b8f 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -1046,7 +1046,7 @@ ACE_OS::if_indextoname (unsigned int ifindex, char *ifname) } ACE_INLINE struct if_nameindex * -ACE_OS::if_nameindex (void) +ACE_OS::if_nameindex () { ACE_OS_TRACE ("ACE_OS::if_nameindex"); #ifdef ACE_LACKS_IF_NAMEINDEX diff --git a/ACE/ace/OS_NS_sys_time.h b/ACE/ace/OS_NS_sys_time.h index 02d63331478..f873d1044e7 100644 --- a/ACE/ace/OS_NS_sys_time.h +++ b/ACE/ace/OS_NS_sys_time.h @@ -36,10 +36,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION - ACE_Time_Value gettimeofday (void); + ACE_Time_Value gettimeofday (); ACE_NAMESPACE_INLINE_FUNCTION - ACE_Time_Value gettimeofday_ (void); + ACE_Time_Value gettimeofday_ (); } /* namespace ACE_OS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_sys_time.inl b/ACE/ace/OS_NS_sys_time.inl index 488e6a1f205..1f7efda9fcb 100644 --- a/ACE/ace/OS_NS_sys_time.inl +++ b/ACE/ace/OS_NS_sys_time.inl @@ -9,7 +9,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Time_Value -ACE_OS::gettimeofday (void) +ACE_OS::gettimeofday () { // ACE_OS_TRACE ("ACE_OS::gettimeofday"); @@ -81,7 +81,7 @@ ACE_OS::gettimeofday (void) } ACE_INLINE ACE_Time_Value -ACE_OS::gettimeofday_ (void) +ACE_OS::gettimeofday_ () { return ACE_OS::gettimeofday (); } diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index 867336e7e19..a6c1f40dc21 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -293,11 +293,11 @@ namespace ACE_OS time_t time (time_t *tloc = 0); ACE_NAMESPACE_INLINE_FUNCTION - long timezone (void); + long timezone (); // wrapper for time zone information. ACE_NAMESPACE_INLINE_FUNCTION - void tzset (void); + void tzset (); //@} } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 6bd482761ea..2214a6c873d 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -470,7 +470,7 @@ ACE_OS::time (time_t *tloc) #if defined (__GNUG__) namespace ACE_OS { ACE_INLINE long - timezone (void) + timezone () { return ::ace_timezone (); } @@ -484,7 +484,7 @@ ACE_OS::timezone (void) #endif /* ACE_LINUX */ ACE_INLINE void -ACE_OS::tzset (void) +ACE_OS::tzset () { #if defined (ACE_LACKS_TZSET) errno = ENOTSUP; diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index 460d767d90f..091cc708452 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -51,7 +51,7 @@ namespace ACE_OS unsigned int alarm (u_int secs); ACE_NAMESPACE_INLINE_FUNCTION - long allocation_granularity (void); + long allocation_granularity (); /// used by ARGV::argv_to_string() and ACE_OS::fork_exec() extern ACE_Export @@ -125,7 +125,7 @@ namespace ACE_OS /// Forks and exec's a process in a manner that works on Solaris and /// NT. argv[0] must be the full path name to the executable. ACE_NAMESPACE_INLINE_FUNCTION - pid_t fork (void); + pid_t fork (); // not in susv3 extern ACE_Export @@ -150,10 +150,10 @@ namespace ACE_OS #endif /* ACE_HAS_WCHAR */ ACE_NAMESPACE_INLINE_FUNCTION - gid_t getgid (void); + gid_t getgid (); ACE_NAMESPACE_INLINE_FUNCTION - gid_t getegid (void); + gid_t getegid (); ACE_NAMESPACE_INLINE_FUNCTION int getopt (int argc, @@ -161,22 +161,22 @@ namespace ACE_OS const char *optstring); ACE_NAMESPACE_INLINE_FUNCTION - long getpagesize (void); + long getpagesize (); ACE_NAMESPACE_INLINE_FUNCTION pid_t getpgid (pid_t pid); ACE_NAMESPACE_INLINE_FUNCTION - pid_t getpid (void); + pid_t getpid (); ACE_NAMESPACE_INLINE_FUNCTION - pid_t getppid (void); + pid_t getppid (); ACE_NAMESPACE_INLINE_FUNCTION - uid_t getuid (void); + uid_t getuid (); ACE_NAMESPACE_INLINE_FUNCTION - uid_t geteuid (void); + uid_t geteuid (); // should call gethostname() ACE_NAMESPACE_INLINE_FUNCTION @@ -211,11 +211,11 @@ namespace ACE_OS /// Get the number of CPUs configured in the machine. extern ACE_Export - long num_processors (void); + long num_processors (); /// Get the number of CPUs currently online. extern ACE_Export - long num_processors_online (void); + long num_processors_online (); ACE_NAMESPACE_INLINE_FUNCTION int pipe (ACE_HANDLE handles[]); @@ -281,7 +281,7 @@ namespace ACE_OS int setreuid (uid_t ruid, uid_t euid); ACE_NAMESPACE_INLINE_FUNCTION - pid_t setsid (void); + pid_t setsid (); ACE_NAMESPACE_INLINE_FUNCTION int setuid (uid_t); diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 035f19baf11..bb29b1cfcee 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -94,7 +94,7 @@ ACE_OS::alarm (u_int secs) } ACE_INLINE long -ACE_OS::getpagesize (void) +ACE_OS::getpagesize () { ACE_OS_TRACE ("ACE_OS::getpagesize"); #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) @@ -112,7 +112,7 @@ ACE_OS::getpagesize (void) } ACE_INLINE long -ACE_OS::allocation_granularity (void) +ACE_OS::allocation_granularity () { #if defined (ACE_WIN32) SYSTEM_INFO sys_info; @@ -361,7 +361,7 @@ ACE_OS::execvp (const char *file, } ACE_INLINE pid_t -ACE_OS::fork (void) +ACE_OS::fork () { ACE_OS_TRACE ("ACE_OS::fork"); #if defined (ACE_LACKS_FORK) @@ -451,7 +451,7 @@ ACE_OS::getcwd (wchar_t *buf, size_t size) #endif /* ACE_HAS_WCHAR */ ACE_INLINE gid_t -ACE_OS::getgid (void) +ACE_OS::getgid () { ACE_OS_TRACE ("ACE_OS::getgid"); #if defined (ACE_LACKS_GETGID) @@ -462,7 +462,7 @@ ACE_OS::getgid (void) } ACE_INLINE gid_t -ACE_OS::getegid (void) +ACE_OS::getegid () { ACE_OS_TRACE ("ACE_OS::getegid"); #if defined (ACE_LACKS_GETEGID) @@ -505,7 +505,7 @@ ACE_OS::getpgid (pid_t pid) } ACE_INLINE pid_t -ACE_OS::getpid (void) +ACE_OS::getpid () { // ACE_OS_TRACE ("ACE_OS::getpid"); #if defined (ACE_LACKS_GETPID) @@ -518,7 +518,7 @@ ACE_OS::getpid (void) } ACE_INLINE pid_t -ACE_OS::getppid (void) +ACE_OS::getppid () { ACE_OS_TRACE ("ACE_OS::getppid"); #if defined (ACE_LACKS_GETPPID) @@ -529,7 +529,7 @@ ACE_OS::getppid (void) } ACE_INLINE uid_t -ACE_OS::getuid (void) +ACE_OS::getuid () { ACE_OS_TRACE ("ACE_OS::getuid"); #if defined (ACE_LACKS_GETUID) @@ -540,7 +540,7 @@ ACE_OS::getuid (void) } ACE_INLINE uid_t -ACE_OS::geteuid (void) +ACE_OS::geteuid () { ACE_OS_TRACE ("ACE_OS::geteuid"); #if defined (ACE_LACKS_GETEUID) @@ -931,7 +931,7 @@ ACE_OS::setreuid (uid_t ruid, uid_t euid) } ACE_INLINE pid_t -ACE_OS::setsid (void) +ACE_OS::setsid () { ACE_OS_TRACE ("ACE_OS::setsid"); #if defined (ACE_LACKS_SETSID) diff --git a/ACE/ace/OS_QoS.h b/ACE/ace/OS_QoS.h index 3173eadba0c..e84c633b806 100644 --- a/ACE/ace/OS_QoS.h +++ b/ACE/ace/OS_QoS.h @@ -165,7 +165,7 @@ class ACE_Export ACE_Flow_Spec { public: /// Default constructor. - ACE_Flow_Spec (void); + ACE_Flow_Spec (); /// Constructor that initializes all the fields. ACE_Flow_Spec (unsigned long token_rate, @@ -180,61 +180,61 @@ public: int priority); /// Get the token rate in bytes/sec. - unsigned long token_rate (void) const; + unsigned long token_rate () const; /// Set the token rate in bytes/sec. void token_rate (unsigned long tr); /// Get the token bucket size in bytes. - unsigned long token_bucket_size (void) const; + unsigned long token_bucket_size () const; /// Set the token bucket size in bytes. void token_bucket_size (unsigned long tbs); /// Get the PeakBandwidth in bytes/sec. - unsigned long peak_bandwidth (void) const; + unsigned long peak_bandwidth () const; /// Set the PeakBandwidth in bytes/sec. void peak_bandwidth (unsigned long pb); /// Get the latency in microseconds. - unsigned long latency (void) const; + unsigned long latency () const; /// Set the latency in microseconds. void latency (unsigned long l); /// Get the delay variation in microseconds. - unsigned long delay_variation (void) const; + unsigned long delay_variation () const; /// Set the delay variation in microseconds. void delay_variation (unsigned long dv); /// Get the service type. - ACE_SERVICE_TYPE service_type (void) const; + ACE_SERVICE_TYPE service_type () const; /// Set the service type. void service_type (ACE_SERVICE_TYPE st); /// Get the maximum SDU size in bytes. - unsigned long max_sdu_size (void) const; + unsigned long max_sdu_size () const; /// Set the maximum SDU size in bytes. void max_sdu_size (unsigned long mss); /// Get the minimum policed size in bytes. - unsigned long minimum_policed_size (void) const; + unsigned long minimum_policed_size () const; /// Set the minimum policed size in bytes. void minimum_policed_size (unsigned long mps); /// Get the time-to-live. - int ttl (void) const; + int ttl () const; /// Set the time-to-live. void ttl (int t); /// Get the priority. - int priority (void) const; + int priority () const; /// Set the priority. void priority (int p); @@ -270,22 +270,22 @@ class ACE_Export ACE_QoS { public: /// Constructor - ACE_QoS (void); + ACE_QoS (); /// Get the flow spec for data sending. - ACE_Flow_Spec *sending_flowspec (void) const; + ACE_Flow_Spec *sending_flowspec () const; /// Set the flow spec for data sending. void sending_flowspec (ACE_Flow_Spec *fs); /// Get the flow spec for data receiving. - ACE_Flow_Spec *receiving_flowspec (void) const; + ACE_Flow_Spec *receiving_flowspec () const; /// Set the flow spec for data receiving. void receiving_flowspec (ACE_Flow_Spec *fs); /// Get the provider specific information. - iovec provider_specific (void) const; + iovec provider_specific () const; /// Set the provider specific information. void provider_specific (const iovec &ps); @@ -327,31 +327,31 @@ public: unsigned long flags = 0); /// Get caller data. - iovec *caller_data (void) const; + iovec *caller_data () const; /// Set caller data. void caller_data (iovec *); /// Get callee data. - iovec *callee_data (void) const; + iovec *callee_data () const; /// Set callee data. void callee_data (iovec *); /// Get socket qos. - ACE_QoS *socket_qos (void) const; + ACE_QoS *socket_qos () const; /// Set socket qos. void socket_qos (ACE_QoS *); /// Get group socket qos. - ACE_QoS *group_socket_qos (void) const; + ACE_QoS *group_socket_qos () const; /// Set group socket qos. void group_socket_qos (ACE_QoS *); /// Get flags. - unsigned long flags (void) const; + unsigned long flags () const; /// Set flags. void flags (unsigned long); @@ -412,13 +412,13 @@ public: unsigned long callback_data = 0); /// Get QoS condition callback. - ACE_QOS_CONDITION_FUNC qos_condition_callback (void) const; + ACE_QOS_CONDITION_FUNC qos_condition_callback () const; /// Set QoS condition callback. void qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc); /// Get callback data. - unsigned long callback_data (void) const; + unsigned long callback_data () const; /// Set callback data. void callback_data (unsigned long cd); diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h index 33171fae85e..3f571874587 100644 --- a/ACE/ace/Object_Manager.h +++ b/ACE/ace/Object_Manager.h @@ -204,14 +204,14 @@ public: * ACE_Object_Manager. Returns 0 on success, -1 on failure, and 1 * if it had already been called. */ - virtual int init (void); + virtual int init (); /** * Explicitly destroy the singleton instance of the * ACE_Object_Manager. Returns 0 on success, -1 on failure, and 1 * if it had already been called. */ - virtual int fini (void); + virtual int fini (); /** * Returns 1 before the ACE_Object_Manager has been constructed. @@ -222,7 +222,7 @@ public: * this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not * defined.) */ - static int starting_up (void); + static int starting_up (); /** * Returns 1 after the ACE_Object_Manager has been destroyed. This @@ -231,7 +231,7 @@ public: * some static objects before this flag can return 1, if * ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.) */ - static int shutting_down (void); + static int shutting_down (); /** * Register an ACE_Cleanup object for cleanup at process @@ -332,7 +332,7 @@ public: * in ACE_Sig_Guard methods. * Deprecated: use ACE_Object_Manager::default_mask () instead. */ - static ACE_Sig_Set &default_mask (void); + static ACE_Sig_Set &default_mask (); private: /// For at_exit support. @@ -403,7 +403,7 @@ public: * are provided in the interface, this should not be public. However, * it is public so that ACE_Managed_Object<TYPE> can access it. */ - static ACE_Object_Manager *instance (void); + static ACE_Object_Manager *instance (); /// Table of preallocated objects. static void *preallocated_object[ACE_PREALLOCATED_OBJECTS]; @@ -416,8 +416,8 @@ public: /// hidden here. They're public so that the ACE_Object_Manager can /// be constructed/destructed in <main> with /// ACE_HAS_NONSTATIC_OBJECT_MANAGER. - ACE_Object_Manager (void); - ~ACE_Object_Manager (void); + ACE_Object_Manager (); + ~ACE_Object_Manager (); private: /// Singleton pointer. @@ -445,9 +445,10 @@ private: friend class ACE_Object_Manager_Manager; #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ - /// Disallow copying by not implementing the following . . . - ACE_Object_Manager (const ACE_Object_Manager &); - ACE_Object_Manager &operator= (const ACE_Object_Manager &); + ACE_Object_Manager (const ACE_Object_Manager &) = delete; + ACE_Object_Manager &operator= (const ACE_Object_Manager &) = delete; + ACE_Object_Manager (ACE_Object_Manager &&) = delete; + ACE_Object_Manager &operator= (ACE_Object_Manager &&) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Object_Manager.inl b/ACE/ace/Object_Manager.inl index a65098a6fa0..bd27ee65a87 100644 --- a/ACE/ace/Object_Manager.inl +++ b/ACE/ace/Object_Manager.inl @@ -37,7 +37,7 @@ ACE_Object_Manager::remove_at_exit (void *object) ACE_INLINE ACE_Sig_Set & -ACE_Object_Manager::default_mask (void) +ACE_Object_Manager::default_mask () { // A safe cast, but this static method shouldn't be used anyways. // Use ACE_Object_Manager::default_mask () instead. diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index 50c52309ec6..a1758e0a616 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -47,10 +47,10 @@ class ACE_Export ACE_Object_Manager_Base { protected: /// Default constructor. - ACE_Object_Manager_Base (void); + ACE_Object_Manager_Base (); /// Destructor. - virtual ~ACE_Object_Manager_Base (void); + virtual ~ACE_Object_Manager_Base (); public: /** @@ -58,14 +58,14 @@ public: * to dynamic allocation failure (in which case errno is set to * ENOMEM), or 1 if it had already been called. */ - virtual int init (void) = 0; + virtual int init () = 0; /** * Explicitly destroy. Returns 0 on success, -1 on failure because * the number of fini () calls hasn't reached the number of init () * calls, or 1 if it had already been called. */ - virtual int fini (void) = 0; + virtual int fini () = 0; enum Object_Manager_State { @@ -86,7 +86,7 @@ protected: * this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not * defined.) */ - int starting_up_i (void); + int starting_up_i (); /** * Returns 1 after ACE_Object_Manager_Base has been destroyed. This @@ -95,7 +95,7 @@ protected: * some static objects before this flag can return 1, if * ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.) */ - int shutting_down_i (void); + int shutting_down_i (); /// State of the Object_Manager; Object_Manager_State object_manager_state_; @@ -111,9 +111,10 @@ protected: /// Link to next Object_Manager, for chaining. ACE_Object_Manager_Base *next_; private: - // Disallow copying by not implementing the following . . . - ACE_Object_Manager_Base (const ACE_Object_Manager_Base &); - ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &); + ACE_Object_Manager_Base (const ACE_Object_Manager_Base &) = delete; + ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &) = delete; + ACE_Object_Manager_Base (ACE_Object_Manager_Base &&) = delete; + ACE_Object_Manager_Base &operator= (ACE_Object_Manager_Base &&) = delete; }; extern "C" @@ -128,21 +129,21 @@ public: ACE_ALLOC_HOOK_DECLARE; /// Explicitly initialize. - virtual int init (void); + virtual int init (); /// Explicitly destroy. - virtual int fini (void); + virtual int fini (); /** * Returns 1 before the ACE_OS_Object_Manager has been * constructed. See <ACE_Object_Manager::starting_up> for more * information. */ - static int starting_up (void); + static int starting_up (); /// Returns 1 after the ACE_OS_Object_Manager has been destroyed. /// See <ACE_Object_Manager::shutting_down> for more information. - static int shutting_down (void); + static int shutting_down (); /// Unique identifiers for preallocated objects. enum Preallocated_Object @@ -170,10 +171,10 @@ public: /// Accesses a default signal set used, for example, in /// ACE_Sig_Guard methods. - static sigset_t *default_mask (void); + static sigset_t *default_mask (); /// Returns the current thread hook for the process. - static ACE_Thread_Hook *thread_hook (void); + static ACE_Thread_Hook *thread_hook (); /// Returns the existing thread hook and assign a <new_thread_hook>. static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *new_thread_hook); @@ -194,13 +195,13 @@ public: // constructed/destructed in <main> with // <ACE_HAS_NONSTATIC_OBJECT_MANAGER>. /// Constructor. - ACE_OS_Object_Manager (void); + ACE_OS_Object_Manager (); /// Destructor. - ~ACE_OS_Object_Manager (void); + ~ACE_OS_Object_Manager (); /// Accessor to singleton instance. - static ACE_OS_Object_Manager *instance (void); + static ACE_OS_Object_Manager *instance (); /// For <ACE_OS::atexit> support. int at_exit (ACE_EXIT_HOOK func, const char* name = 0); diff --git a/ACE/ace/Pair_T.h b/ACE/ace/Pair_T.h index 6f60ed76ed7..36c32500e37 100644 --- a/ACE/ace/Pair_T.h +++ b/ACE/ace/Pair_T.h @@ -41,10 +41,10 @@ public: ACE_Reference_Pair (T1 &t1, T2 &t2); /// Access first. - T1 &first (void) const; + T1 &first () const; /// Access second. - T2 &second (void) const; + T2 &second () const; // Compare pairs. bool operator== (const ACE_Reference_Pair<T1, T2> &rhs) const; diff --git a/ACE/ace/Pair_T.inl b/ACE/ace/Pair_T.inl index a8f620350f6..bb7f763633d 100644 --- a/ACE/ace/Pair_T.inl +++ b/ACE/ace/Pair_T.inl @@ -10,13 +10,13 @@ ACE_Reference_Pair<T1, T2>::ACE_Reference_Pair (T1 &t1, } template <class T1, class T2> ACE_INLINE T1 & -ACE_Reference_Pair<T1, T2>::first (void) const +ACE_Reference_Pair<T1, T2>::first () const { return this->first_; } template <class T1, class T2> ACE_INLINE T2 & -ACE_Reference_Pair<T1, T2>::second (void) const +ACE_Reference_Pair<T1, T2>::second () const { return this->second_; } diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 1465103ef63..90adcae52fc 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -86,7 +86,7 @@ public: size_t max_cmdline_args = MAX_COMMAND_LINE_OPTIONS); /// Destructor. - ~ACE_Process_Options (void); + ~ACE_Process_Options (); // = Methods to set process creation options portably. @@ -112,7 +112,7 @@ public: ACE_HANDLE std_err = ACE_INVALID_HANDLE); /// Release the standard handles previously set with set_handles; - void release_handles (void); + void release_handles (); #ifndef ACE_LACKS_VA_FUNCTIONS /// @param format must be of the form "VARIABLE=VALUE". There can not be @@ -189,10 +189,10 @@ public: /// Return the process_name. If the <process_name(name)> set /// method is not called, this method will return argv[0]. - const ACE_TCHAR *process_name (void); + const ACE_TCHAR *process_name (); /// Get the creation flags. - u_long creation_flags (void) const; + u_long creation_flags () const; /** * Set the creation flags to affect how a new process is spawned. @@ -208,7 +208,7 @@ public: void creation_flags (u_long); /// Current working directory. Returns "" if nothing has been set. - ACE_TCHAR *working_directory (void); + ACE_TCHAR *working_directory (); /// Buffer of command-line options. Returns a pointer to a buffer that /// contains the list of command line options. Prior to a call to @@ -229,18 +229,18 @@ public: * and returned with each entry pointing to the start of * null-terminated string. Returns { 0 } if nothing has been set. */ - ACE_TCHAR * const *command_line_argv (void); + ACE_TCHAR * const *command_line_argv (); /** * Null-terminated buffer of null terminated strings. Each string * is an environment assignment "VARIABLE=value". This buffer * should end with two null characters. */ - ACE_TCHAR *env_buf (void); + ACE_TCHAR *env_buf (); /// Get the process group. On UNIX, these methods are used by the /// ACE_Process_Manager to manage groups of processes. - pid_t getgroup (void) const; + pid_t getgroup () const; /// Set the process group. On UNIX, these methods are used by the /// ACE_Process_Manager to manage groups of processes. @@ -254,7 +254,7 @@ public: /// ACE_Process_Options::set_handles() you must not call /// handle_inheritance(false). Doing so will prevent the duplicated handles /// from surviving in the created process. - int handle_inheritance (void); + int handle_inheritance (); void handle_inheritance (int); /// Cause the specified handle to be passed to a child process @@ -291,17 +291,17 @@ public: void avoid_zombies (int); /// Get current value for avoid_zombies. - int avoid_zombies (void); + int avoid_zombies (); /// Enable the use of a Unicode environment. This only makes sense /// for Win32 when ACE_USES_WCHAR is not defined. - void enable_unicode_environment (void); + void enable_unicode_environment (); /// Disable the use of a Unicode environment. - void disable_unicode_environment (void); + void disable_unicode_environment (); /// Return the unicode environment status - bool use_unicode_environment (void) const; + bool use_unicode_environment () const; #if defined (ACE_WIN32) // = Non-portable accessors for when you "just have to use them." @@ -336,12 +336,12 @@ public: #else /* All things not WIN32 */ /// argv-style array of environment settings. - ACE_TCHAR *const *env_argv (void); + ACE_TCHAR *const *env_argv (); // = Accessors for the standard handles. - ACE_HANDLE get_stdin (void) const; - ACE_HANDLE get_stdout (void) const; - ACE_HANDLE get_stderr (void) const; + ACE_HANDLE get_stdin () const; + ACE_HANDLE get_stdout () const; + ACE_HANDLE get_stderr () const; // = Set/get real & effective user & group id associated with user. int setreugid (const ACE_TCHAR* user); @@ -349,15 +349,15 @@ public: void seteuid (uid_t id); void setrgid (uid_t id); void setegid (uid_t id); - uid_t getruid (void) const; - uid_t geteuid (void) const; - uid_t getrgid (void) const; - uid_t getegid (void) const; + uid_t getruid () const; + uid_t geteuid () const; + uid_t getrgid () const; + uid_t getegid () const; /** * Get the inherit_environment flag. */ - bool inherit_environment (void) const; + bool inherit_environment () const; /** * Set the inherit_environment flag. @@ -517,10 +517,10 @@ public: friend class ACE_Process_Manager; /// Default construction. Use ACE_Process::spawn() to start a process. - ACE_Process (void); + ACE_Process (); /// Destructor. - virtual ~ACE_Process (void); + virtual ~ACE_Process (); /** * Called back from spawn() just before spawning the child. If this @@ -563,7 +563,7 @@ public: /// Called by a ACE_Process_Manager that is removing this object from /// its table of managed processes. Default is to do nothing. - virtual void unmanage (void); + virtual void unmanage (); /** * Wait for a previously spawned process to exit. @@ -608,44 +608,44 @@ public: * This call doesn't give the process a chance to cleanup, so use it * with caution. */ - int terminate (void); + int terminate (); /// Return the process id of the new child process. - pid_t getpid (void) const; + pid_t getpid () const; /// Return the handle of the process, if it has one. - ACE_HANDLE gethandle (void) const; + ACE_HANDLE gethandle () const; /// Return 1 if running; 0 otherwise. - int running (void) const; + int running () const; /// Return the process's exit code. This method returns the raw /// exit status returned from system APIs (such as @c wait() or /// @c waitpid() ). This value is system dependent. - ACE_exitcode exit_code (void) const; + ACE_exitcode exit_code () const; /// Return the process's return value. This method returns the /// actual return value that a child process returns or exits with. - int return_value (void) const; + int return_value () const; /// Close all the handles in the set obtained from the /// @a ACE_Process_Options::dup_handles object used to spawn /// the process. - void close_dup_handles (void); + void close_dup_handles (); /// Close all the passed handles in the set obtained from the /// ACE_Process_Options object used to spawn the process. - void close_passed_handles (void); + void close_passed_handles (); #if defined (ACE_WIN32) PROCESS_INFORMATION process_info (void); #endif /* ACE_WIN32 */ private: - - // Disallow copying and assignment since we don't support this (yet). - ACE_Process (const ACE_Process &); - void operator= (const ACE_Process &); + ACE_Process (const ACE_Process &) = delete; + void operator= (const ACE_Process &) = delete; + ACE_Process (ACE_Process &&) = delete; + void operator= (ACE_Process &&) = delete; protected: /// Set this process's exit code. ACE_Process_Manager uses this @@ -689,14 +689,14 @@ class ACE_Export ACE_Managed_Process : public ACE_Process public: /// Cleanup by deleting @c this. - virtual void unmanage (void); + virtual void unmanage (); ACE_ALLOC_HOOK_DECLARE; protected: /// Make sure that we're allocated dynamically! - virtual ~ACE_Managed_Process (void); + virtual ~ACE_Managed_Process (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl index 66241f43661..f1bacf8d431 100644 --- a/ACE/ace/Process.inl +++ b/ACE/ace/Process.inl @@ -8,19 +8,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -ACE_Process_Options::enable_unicode_environment (void) +ACE_Process_Options::enable_unicode_environment () { this->use_unicode_environment_ = true; } ACE_INLINE void -ACE_Process_Options::disable_unicode_environment (void) +ACE_Process_Options::disable_unicode_environment () { this->use_unicode_environment_ = false; } ACE_INLINE bool -ACE_Process_Options::use_unicode_environment (void) const +ACE_Process_Options::use_unicode_environment () const { return this->use_unicode_environment_; } @@ -35,7 +35,7 @@ ACE_Process::process_info (void) #endif /* ACE_WIN32 */ ACE_INLINE ACE_HANDLE -ACE_Process::gethandle (void) const +ACE_Process::gethandle () const { #if defined (ACE_WIN32) return process_info_.hProcess; @@ -45,7 +45,7 @@ ACE_Process::gethandle (void) const } ACE_INLINE pid_t -ACE_Process::getpid (void) const +ACE_Process::getpid () const { #if defined (ACE_WIN32) return process_info_.dwProcessId; @@ -82,7 +82,7 @@ ACE_Process::kill (int signum) } ACE_INLINE int -ACE_Process::terminate (void) +ACE_Process::terminate () { if (this->getpid () != -1) return ACE::terminate_process (this->getpid ()); @@ -91,7 +91,7 @@ ACE_Process::terminate (void) } ACE_INLINE int -ACE_Process::return_value (void) const +ACE_Process::return_value () const { #if defined (ACE_WIN32) return this->exit_code_; @@ -101,7 +101,7 @@ ACE_Process::return_value (void) const } ACE_INLINE ACE_exitcode -ACE_Process::exit_code (void) const +ACE_Process::exit_code () const { return this->exit_code_; } @@ -113,7 +113,7 @@ ACE_Process::exit_code (ACE_exitcode code) } ACE_INLINE u_long -ACE_Process_Options::creation_flags (void) const +ACE_Process_Options::creation_flags () const { #if defined (ACE_USES_WCHAR) && defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) return creation_flags_ | CREATE_UNICODE_ENVIRONMENT; @@ -129,7 +129,7 @@ ACE_Process_Options::creation_flags (u_long cf) } ACE_INLINE pid_t -ACE_Process_Options::getgroup (void) const +ACE_Process_Options::getgroup () const { return process_group_; } @@ -143,7 +143,7 @@ ACE_Process_Options::setgroup (pid_t pgrp) } ACE_INLINE int -ACE_Process_Options::handle_inheritance (void) +ACE_Process_Options::handle_inheritance () { return handle_inheritance_; } @@ -155,7 +155,7 @@ ACE_Process_Options::handle_inheritance (int hi) } ACE_INLINE int -ACE_Process_Options::avoid_zombies (void) +ACE_Process_Options::avoid_zombies () { return avoid_zombies_; } @@ -227,25 +227,25 @@ ACE_INLINE HANDLE ACE_Process_Options::get_user_token (void) const #else /* !defined (ACE_WIN32) */ ACE_INLINE ACE_HANDLE -ACE_Process_Options::get_stdin (void) const +ACE_Process_Options::get_stdin () const { return stdin_; } ACE_INLINE ACE_HANDLE -ACE_Process_Options::get_stdout (void) const +ACE_Process_Options::get_stdout () const { return stdout_; } ACE_INLINE ACE_HANDLE -ACE_Process_Options::get_stderr (void) const +ACE_Process_Options::get_stderr () const { return stderr_; } ACE_INLINE bool -ACE_Process_Options::inherit_environment (void) const +ACE_Process_Options::inherit_environment () const { return inherit_environment_; } @@ -303,25 +303,25 @@ ACE_Process_Options::setegid (uid_t id) } ACE_INLINE uid_t -ACE_Process_Options::getruid (void) const +ACE_Process_Options::getruid () const { return this->ruid_; } ACE_INLINE uid_t -ACE_Process_Options::geteuid (void) const +ACE_Process_Options::geteuid () const { return this->euid_; } ACE_INLINE uid_t -ACE_Process_Options::getrgid (void) const +ACE_Process_Options::getrgid () const { return this->rgid_; } ACE_INLINE uid_t -ACE_Process_Options::getegid (void) const +ACE_Process_Options::getegid () const { return this->egid_; } @@ -336,7 +336,7 @@ ACE_Process_Options::command_line_buf (size_t *max_lenp) } ACE_INLINE ACE_TCHAR * -ACE_Process_Options::working_directory (void) +ACE_Process_Options::working_directory () { #if !defined (ACE_HAS_WINCE) if (working_directory_[0] == '\0') @@ -377,7 +377,7 @@ ACE_Process_Options::process_name (const ACE_TCHAR *p) } ACE_INLINE const ACE_TCHAR * -ACE_Process_Options::process_name (void) +ACE_Process_Options::process_name () { if (process_name_[0] == '\0') this->process_name (this->command_line_argv ()[0]); diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h index 721fdeae978..90fc88d5472 100644 --- a/ACE/ace/Process_Manager.h +++ b/ACE/ace/Process_Manager.h @@ -130,11 +130,11 @@ public: ACE_Reactor *r = 0); /// Release all resources. Do not wait for processes to exit. - int close (void); + int close (); /// Destructor releases all resources and does not wait for processes /// to exit. - virtual ~ACE_Process_Manager (void); + virtual ~ACE_Process_Manager (); //@} @@ -143,14 +143,14 @@ public: */ //@{ /// Get pointer to a process-wide ACE_Process_Manager. - static ACE_Process_Manager *instance (void); + static ACE_Process_Manager *instance (); /// Set pointer to a process-wide ACE_Process_Manager and return /// existing pointer. static ACE_Process_Manager *instance (ACE_Process_Manager *); /// Delete the dynamically allocated singleton. - static void close_singleton (void); + static void close_singleton (); /// Cleanup method, used by the ACE_Object_Manager to destroy the /// singleton. @@ -318,7 +318,7 @@ public: int remove (pid_t pid); /// Return the number of managed processes. - size_t managed (void) const; + size_t managed () const; /** * Sets the scheduling parameters for process identified by @a pid by @@ -339,7 +339,7 @@ public: int set_scheduler_all (const ACE_Sched_Params ¶ms); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -406,8 +406,8 @@ private: struct Process_Descriptor { /// Default ctor/dtor. - Process_Descriptor (void); - ~Process_Descriptor (void); + Process_Descriptor (); + ~Process_Descriptor (); /// Describes the process itself. ACE_Process *process_; @@ -416,7 +416,7 @@ private: ACE_Event_Handler *exit_notify_; /// Dump the state of an object. - void dump (void) const; + void dump () const; ACE_ALLOC_HOOK_DECLARE; }; diff --git a/ACE/ace/Process_Manager.inl b/ACE/ace/Process_Manager.inl index 33d2c034be7..18bbe7a4ffe 100644 --- a/ACE/ace/Process_Manager.inl +++ b/ACE/ace/Process_Manager.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE size_t -ACE_Process_Manager::managed (void) const +ACE_Process_Manager::managed () const { return current_count_; } diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp index 0c8c2a713b6..b953a0e6cbe 100644 --- a/ACE/ace/RB_Tree.cpp +++ b/ACE/ace/RB_Tree.cpp @@ -40,7 +40,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_I // Destructor. template <class EXT_ID, class INT_ID> -ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node (void) +ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node () { ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node"); } @@ -906,7 +906,7 @@ dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const /// Tests the red-black invariant(s) throughout the whole tree. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant"); ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -1167,7 +1167,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i () const { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i"); diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index b3b08f19aab..4c7b773ef27 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -56,34 +56,34 @@ public: ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t); /// Destructor. - ~ACE_RB_Tree_Node (void); + ~ACE_RB_Tree_Node (); /// Key accessor. - EXT_ID &key (void); + EXT_ID &key (); /// Item accessor. - INT_ID &item (void); + INT_ID &item (); /// Set color of the node. void color (RB_Tree_Node_Color c); /// Get color of the node. - RB_Tree_Node_Color color (void); + RB_Tree_Node_Color color (); /// Accessor for node's parent pointer. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent (void); + ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent (); /// Mutator for node's parent pointer. void parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p); /// Accessor for node's left child pointer. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *left (void); + ACE_RB_Tree_Node<EXT_ID, INT_ID> *left (); /// Mutator for node's left child pointer. void left (ACE_RB_Tree_Node<EXT_ID, INT_ID> *l); /// Accessor for node's right child pointer. - ACE_RB_Tree_Node<EXT_ID, INT_ID> *right (void); + ACE_RB_Tree_Node<EXT_ID, INT_ID> *right (); /// Mutator for node's right child pointer void right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r); @@ -125,7 +125,7 @@ public: * of this method occurred. Placing the definition inline in * the header avoids such errors. */ - ACE_Allocator * allocator (void) const { return this->allocator_; } + ACE_Allocator * allocator () const { return this->allocator_; } protected: // = Protected members. @@ -210,10 +210,10 @@ public: /// Close down an RB_Tree and release dynamically allocated /// resources. - int close (void); + int close (); /// Destructor. - virtual ~ACE_RB_Tree (void); + virtual ~ACE_RB_Tree (); // = insertion, removal, and search methods. @@ -352,7 +352,7 @@ public: // = Public helper methods. /// Returns the current number of nodes in the tree. - size_t current_size (void) const; + size_t current_size () const; /// Assignment operator. void operator= (const ACE_RB_Tree<EXT_ID, @@ -368,31 +368,31 @@ public: * guard the state of an iterator. * @note The right name would be <lock>, but HP/C++ will choke on that! */ - ACE_LOCK &mutex (void); + ACE_LOCK &mutex (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL styled iterator factory functions. /// Return forward iterator positioned at first node in tree. - ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> begin (void); + ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> begin (); /// Return forward iterator positioned at last node in tree. - ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> end (void); + ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> end (); /// Return reverse iterator positioned at last node in tree. - ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rbegin (void); + ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rbegin (); /// Return reverse iterator positioned at first node in tree. - ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (void); + ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (); /// Recursively tests the invariant red-black properties at each /// node of the tree. Returns 0 if invariant holds, else -1. /// This method is computationally expensive, and should only be /// called for testing purposes, and not in code that depends on the /// algorithmic complexity bounds provided by the other methods. - int test_invariant (void); + int test_invariant (); // = DEPRECATED methods. // Please migrate your code to use the new methods instead @@ -431,7 +431,7 @@ public: /// @deprecated /// Destroys all nodes and sets the root pointer null. - void clear (void); + void clear (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -504,7 +504,7 @@ protected: /// Close down an RB_Tree. this method should /// only be called with locks already held. - int close_i (void); + int close_i (); /** * Retrieves a pointer to the item corresponding to the @@ -599,18 +599,18 @@ public: // = Iteration methods. /// Returns 1 when the iteration has completed, otherwise 0. - int done (void) const; + int done () const; /// STL-like iterator dereference operator: returns a reference /// to the node underneath the iterator. - ACE_RB_Tree_Node<EXT_ID, INT_ID> & operator* (void) const; + ACE_RB_Tree_Node<EXT_ID, INT_ID> & operator* () const; /// STL-like iterator dereference operator: returns a pointer /// to the node underneath the iterator. - ACE_RB_Tree_Node<EXT_ID, INT_ID> * operator-> (void) const; + ACE_RB_Tree_Node<EXT_ID, INT_ID> * operator-> () const; /// Returns a const reference to the tree over which we're iterating. - const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree (void); + const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree (); /// Comparison operator: returns 1 if both iterators point to the same position, otherwise 0. bool operator== (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &) const; @@ -624,7 +624,7 @@ public: protected: /// Create the singular iterator. No valid iterator can be equal to /// it, it is illegal to dereference a singular iterator, etc. etc. - ACE_RB_Tree_Iterator_Base (void); + ACE_RB_Tree_Iterator_Base (); /** * Constructor. Takes an ACE_RB_Tree over which to iterate, and @@ -650,20 +650,20 @@ protected: ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS,ACE_LOCK> &tree); /// Destructor. - ~ACE_RB_Tree_Iterator_Base (void); + ~ACE_RB_Tree_Iterator_Base (); // = Internal methods /// Move forward by one element in the tree. Returns 0 when /// there are no more elements in the tree, otherwise 1. - int forward_i (void); + int forward_i (); /// Move back by one element in the tree. Returns 0 when /// there are no more elements in the tree, otherwise 1. - int reverse_i (void); + int reverse_i (); /// Dump the state of an object. - void dump_i (void) const; + void dump_i () const; // = Protected members. @@ -689,7 +689,7 @@ public: * It is illegal to deference the iterator, no valid iterator is * equal to a singular iterator, etc. etc. */ - ACE_RB_Tree_Iterator (void); + ACE_RB_Tree_Iterator (); /** * Constructor. Takes an ACE_RB_Tree over which to iterate, and @@ -714,27 +714,27 @@ public: ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree); /// Destructor. - ~ACE_RB_Tree_Iterator (void); + ~ACE_RB_Tree_Iterator (); // = ACE-style iteration methods. /// Move forward by one element in the tree. Returns /// 0 when all elements have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL-style iteration methods. /// Prefix advance. - ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void); + ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (); /// Postfix advance. ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void); + ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (); /// Postfix reverse. ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int); @@ -759,34 +759,34 @@ public: /// @deprecated /// Accessor for key of node under iterator (if any). - EXT_ID *key (void); + EXT_ID *key (); /// @deprecated /// Accessor for item of node under iterator (if any). - INT_ID *item (void); + INT_ID *item (); /// @deprecated /// Move to the first item in the iteration (and in the tree). - int first (void); + int first (); /// @deprecated /// Move to the last item in the iteration (and in the tree). - int last (void); + int last (); /// @deprecated /// Move to the next item in the iteration (and in the tree). - int next (void); + int next (); /// @deprecated /// Move to the previous item in the iteration (and in the tree). - int previous (void); + int previous (); /** * @deprecated: use the base class <done> method instead. * Returns 0 if the iterator is positioned over a valid ACE_RB_Tree * node, returns 1 if not. */ - int is_done (void); + int is_done (); }; @@ -804,7 +804,7 @@ public: * It is illegal to deference the iterator, no valid iterator is * equal to a singular iterator, etc. etc. */ - ACE_RB_Tree_Reverse_Iterator (void); + ACE_RB_Tree_Reverse_Iterator (); /** * Constructor. Takes an ACE_RB_Tree over which to iterate, and @@ -830,27 +830,27 @@ public: ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree); /// Destructor. - ~ACE_RB_Tree_Reverse_Iterator (void); + ~ACE_RB_Tree_Reverse_Iterator (); // = ACE-style iteration methods. /// Move forward by one element in the tree. Returns /// 0 when all elements have been seen, else 1. - int advance (void); + int advance (); /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL-style iteration methods. /// Prefix advance. - ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void); + ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (); /// Postfix advance. ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int); /// Prefix reverse. - ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void); + ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (); /// Postfix reverse. ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int); diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl index dcebea5e71a..4e31894eb4d 100644 --- a/ACE/ace/RB_Tree.inl +++ b/ACE/ace/RB_Tree.inl @@ -154,7 +154,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open (ACE_Allocator *alloc) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close"); ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); @@ -550,7 +550,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (ACE_RB_Tree_Node<EX template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_LOCK & -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex"); return this->lock_; @@ -561,7 +561,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -580,7 +580,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin"); @@ -592,7 +592,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end"); @@ -604,7 +604,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin"); @@ -616,7 +616,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> -ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend (void) +ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend () { ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend"); @@ -719,7 +719,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size () const template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (void) +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base () : tree_ (0), node_ (0) { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (void)"); @@ -729,7 +729,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_I template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) const +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done () const { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done"); @@ -742,7 +742,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) c template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> & -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (void) const +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* () const { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator*"); return *(this->node_); @@ -754,7 +754,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (vo template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> * -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> (void) const +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> () const { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator->"); return this->node_; @@ -764,7 +764,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-> (v // Returns a reference to the tree over which we're iterating. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>ACE_INLINE const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree (void) +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree () { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree"); return *tree_; @@ -800,7 +800,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator!= template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (void) +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i () { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i"); @@ -818,7 +818,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (vo template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (void) +ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i () { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i"); @@ -838,7 +838,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (vo template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (void) +ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator () : ACE_RB_Tree_Iterator_Base<EXT_ID,INT_ID,COMPARE_KEYS,ACE_LOCK> () { ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (void)"); @@ -849,7 +849,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterat template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance"); @@ -861,7 +861,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -875,7 +875,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (void)"); @@ -902,7 +902,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int) template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & -ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (void)"); @@ -1043,7 +1043,7 @@ ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::is_done () template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (void) +ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator () : ACE_RB_Tree_Iterator_Base<EXT_ID,INT_ID,COMPARE_KEYS,ACE_LOCK> () { ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (void)"); @@ -1054,7 +1054,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tre template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void) +ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance () { ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance"); @@ -1066,7 +1066,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (v template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const +ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); @@ -1080,7 +1080,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void) +ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ () { ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)"); @@ -1107,7 +1107,7 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & -ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void) +ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- () { ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)"); diff --git a/ACE/ace/RW_Mutex.h b/ACE/ace/RW_Mutex.h index 46f7458ed39..f01f4dc035f 100644 --- a/ACE/ace/RW_Mutex.h +++ b/ACE/ace/RW_Mutex.h @@ -45,31 +45,31 @@ public: void *arg = 0); /// Implicitly destroy a readers/writer lock - ~ACE_RW_Mutex (void); + ~ACE_RW_Mutex (); /** * Explicitly destroy a readers/writer lock. Note that only one * thread should call this method since it doesn't protect against * race conditions. */ - int remove (void); + int remove (); /// Acquire a read lock, but block if a writer hold the lock. - int acquire_read (void); + int acquire_read (); /// Acquire a write lock, but block if any readers or a /// writer hold the lock. - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire a read lock (i.e., won't block). Returns * -1 on failure. If we "failed" because someone else already had * the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /// Conditionally acquire a write lock (i.e., won't block). - int tryacquire_write (void); + int tryacquire_write (); /** * Conditionally upgrade a read lock to a write lock. This only @@ -79,14 +79,14 @@ public: * already possess this lock as a read lock (but this condition is * not checked by the current implementation). */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /** * Note, for interface uniformity with other synchronization * wrappers we include the <acquire> method. This is implemented as * a write-lock to safe... */ - int acquire (void); + int acquire (); /** * Note, for interface uniformity with other synchronization @@ -95,16 +95,16 @@ public: * "failed" because someone else already had the lock, @c errno is * set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Unlock a readers/writer lock. - int release (void); + int release (); /// Return the underlying lock. - const ACE_rwlock_t &lock (void) const; + const ACE_rwlock_t &lock () 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/RW_Mutex.inl b/ACE/ace/RW_Mutex.inl index 3939b8c23fd..6d3566bb8d9 100644 --- a/ACE/ace/RW_Mutex.inl +++ b/ACE/ace/RW_Mutex.inl @@ -2,14 +2,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_rwlock_t & -ACE_RW_Mutex::lock (void) const +ACE_RW_Mutex::lock () const { // ACE_TRACE ("ACE_RW_Mutex::lock"); return this->lock_; } ACE_INLINE int -ACE_RW_Mutex::remove (void) +ACE_RW_Mutex::remove () { // ACE_TRACE ("ACE_RW_Mutex::remove"); int result = 0; @@ -22,56 +22,56 @@ ACE_RW_Mutex::remove (void) } ACE_INLINE int -ACE_RW_Mutex::acquire_read (void) +ACE_RW_Mutex::acquire_read () { // ACE_TRACE ("ACE_RW_Mutex::acquire_read"); return ACE_OS::rw_rdlock (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::acquire_write (void) +ACE_RW_Mutex::acquire_write () { // ACE_TRACE ("ACE_RW_Mutex::acquire_write"); return ACE_OS::rw_wrlock (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::acquire (void) +ACE_RW_Mutex::acquire () { // ACE_TRACE ("ACE_RW_Mutex::acquire"); return ACE_OS::rw_wrlock (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::tryacquire_read (void) +ACE_RW_Mutex::tryacquire_read () { // ACE_TRACE ("ACE_RW_Mutex::tryacquire_read"); return ACE_OS::rw_tryrdlock (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::tryacquire_write (void) +ACE_RW_Mutex::tryacquire_write () { // ACE_TRACE ("ACE_RW_Mutex::tryacquire_write"); return ACE_OS::rw_trywrlock (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::tryacquire_write_upgrade (void) +ACE_RW_Mutex::tryacquire_write_upgrade () { // ACE_TRACE ("ACE_RW_Mutex::tryacquire_write_upgrade"); return ACE_OS::rw_trywrlock_upgrade (&this->lock_); } ACE_INLINE int -ACE_RW_Mutex::tryacquire (void) +ACE_RW_Mutex::tryacquire () { // ACE_TRACE ("ACE_RW_Mutex::tryacquire"); return this->tryacquire_write (); } ACE_INLINE int -ACE_RW_Mutex::release (void) +ACE_RW_Mutex::release () { // ACE_TRACE ("ACE_RW_Mutex::release"); return ACE_OS::rw_unlock (&this->lock_); diff --git a/ACE/ace/RW_Thread_Mutex.h b/ACE/ace/RW_Thread_Mutex.h index d54997e7b03..54a4ebcfaa5 100644 --- a/ACE/ace/RW_Thread_Mutex.h +++ b/ACE/ace/RW_Thread_Mutex.h @@ -41,7 +41,7 @@ public: void *arg = 0); /// Default dtor. - ~ACE_RW_Thread_Mutex (void); + ~ACE_RW_Thread_Mutex (); /** * Conditionally upgrade a read lock to a write lock. This only @@ -51,10 +51,10 @@ public: * already possess this lock as a read lock (but this condition is * not checked by the current implementation). */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// 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/RW_Thread_Mutex.inl b/ACE/ace/RW_Thread_Mutex.inl index a69c8b597c0..0531f9063d2 100644 --- a/ACE/ace/RW_Thread_Mutex.inl +++ b/ACE/ace/RW_Thread_Mutex.inl @@ -2,14 +2,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -ACE_RW_Thread_Mutex::tryacquire_write_upgrade (void) +ACE_RW_Thread_Mutex::tryacquire_write_upgrade () { // ACE_TRACE ("ACE_RW_Thread_Mutex::tryacquire_write_upgrade"); return ACE_OS::rw_trywrlock_upgrade (&this->lock_); } ACE_INLINE -ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex (void) +ACE_RW_Thread_Mutex::~ACE_RW_Thread_Mutex () { } 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/Read_Buffer.h b/ACE/ace/Read_Buffer.h index b22d3f2d85a..0bc07aa5c93 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -89,10 +89,10 @@ public: void dump (void) const; private: - - // Disallow copying and assignment... - void operator= (const ACE_Read_Buffer &); - ACE_Read_Buffer (const ACE_Read_Buffer &); + void operator= (const ACE_Read_Buffer &) = delete; + ACE_Read_Buffer (const ACE_Read_Buffer &) = delete; + void operator= (ACE_Read_Buffer &&) = delete; + ACE_Read_Buffer (ACE_Read_Buffer &&) = delete; private: /// Recursive helper method that does the work... diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h index 8c4c867ff12..f88e7b79a1c 100644 --- a/ACE/ace/Recursive_Thread_Mutex.h +++ b/ACE/ace/Recursive_Thread_Mutex.h @@ -44,21 +44,21 @@ public: ACE_mutexattr_t *arg = 0); /// Implicitly release a recursive mutex. - ~ACE_Recursive_Thread_Mutex (void); + ~ACE_Recursive_Thread_Mutex (); /** * Implicitly release a recursive mutex. Note that only one thread * should call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /** * Acquire a recursive mutex (will increment the nesting level and * not deadmutex if the owner of the mutex calls this method more * than once). */ - int acquire (void); + int acquire (); /** * Block the thread until we acquire the mutex or until @a tv times @@ -84,21 +84,21 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /** * Acquire mutex ownership. This calls acquire() and is only * here to make the ACE_Recusive_Thread_Mutex interface consistent * with the other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /** * Acquire mutex ownership. This calls acquire() and is only * here to make the ACE_Recusive_Thread_Mutex interface consistent * with the other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire mutex (i.e., won't block). This calls @@ -108,7 +108,7 @@ public: * because someone else already had the lock, @c errno is set to * @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire mutex (i.e., won't block). This calls @@ -118,7 +118,7 @@ public: * because someone else already had the lock, @c errno is set to * @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here to make the ACE_Recursive_Thread_Mutex @@ -126,17 +126,17 @@ public: * Assumes the caller has already acquired the mutex using one of * the above calls, and returns 0 (success) always. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /** * Releases a recursive mutex (will not release mutex until all the * nesting level drops to 0, which means the mutex is no longer * held). */ - int release (void); + int release (); /// Return the id of the thread that currently owns the mutex. - ACE_thread_t get_thread_id (void); + ACE_thread_t get_thread_id (); /** * Return the nesting level of the recursion. When a thread has @@ -146,16 +146,16 @@ public: * macro is enabled then this method may return -1 on platforms that * do not expose the internal count. */ - int get_nesting_level (void); + int get_nesting_level (); /// Returns a reference to the recursive mutex; - ACE_recursive_thread_mutex_t &lock (void); + ACE_recursive_thread_mutex_t &lock (); /// Returns a reference to the recursive mutex's internal mutex; - ACE_thread_mutex_t &get_nesting_mutex (void); + ACE_thread_mutex_t &get_nesting_mutex (); /// 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/Recursive_Thread_Mutex.inl b/ACE/ace/Recursive_Thread_Mutex.inl index 739e7756930..53fae98e083 100644 --- a/ACE/ace/Recursive_Thread_Mutex.inl +++ b/ACE/ace/Recursive_Thread_Mutex.inl @@ -2,13 +2,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_recursive_thread_mutex_t & -ACE_Recursive_Thread_Mutex::lock (void) +ACE_Recursive_Thread_Mutex::lock () { return lock_; } ACE_INLINE ACE_thread_mutex_t & -ACE_Recursive_Thread_Mutex::get_nesting_mutex (void) +ACE_Recursive_Thread_Mutex::get_nesting_mutex () { #if defined (ACE_HAS_RECURSIVE_MUTEXES) return static_cast<ACE_thread_mutex_t &> (lock_); @@ -29,19 +29,19 @@ ACE_Recursive_Thread_Mutex::set_thread_id (ACE_thread_t t) } ACE_INLINE int -ACE_Recursive_Thread_Mutex::acquire (void) +ACE_Recursive_Thread_Mutex::acquire () { return ACE_OS::recursive_mutex_lock (&this->lock_); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::release (void) +ACE_Recursive_Thread_Mutex::release () { return ACE_OS::recursive_mutex_unlock (&this->lock_); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire (void) +ACE_Recursive_Thread_Mutex::tryacquire () { return ACE_OS::recursive_mutex_trylock (&this->lock_); } @@ -59,31 +59,31 @@ ACE_Recursive_Thread_Mutex::acquire (ACE_Time_Value *tv) } ACE_INLINE int -ACE_Recursive_Thread_Mutex::acquire_read (void) +ACE_Recursive_Thread_Mutex::acquire_read () { return this->acquire (); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::acquire_write (void) +ACE_Recursive_Thread_Mutex::acquire_write () { return this->acquire (); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_read (void) +ACE_Recursive_Thread_Mutex::tryacquire_read () { return this->tryacquire (); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_write (void) +ACE_Recursive_Thread_Mutex::tryacquire_write () { return this->tryacquire (); } ACE_INLINE int -ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade (void) +ACE_Recursive_Thread_Mutex::tryacquire_write_upgrade () { return 0; } 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/Refcounted_Auto_Ptr.cpp b/ACE/ace/Refcounted_Auto_Ptr.cpp index d97c128b99a..ae40c485ad5 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.cpp +++ b/ACE/ace/Refcounted_Auto_Ptr.cpp @@ -9,7 +9,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Refcounted_Auto_Ptr) ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Refcounted_Auto_Ptr_Rep) template <class X, class ACE_LOCK> -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr (void) +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr () { AUTO_REFCOUNTED_PTR_REP::detach (rep_); } diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h index 670243dc1b5..b52872806ab 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.h +++ b/ACE/ace/Refcounted_Auto_Ptr.h @@ -57,7 +57,7 @@ public: /// Destructor. Releases the reference to the underlying representation. /// If the release of that reference causes its reference count to reach 0, /// the representation object will also be destroyed. - virtual ~ACE_Refcounted_Auto_Ptr (void); + virtual ~ACE_Refcounted_Auto_Ptr (); /// Assignment operator that binds the current object and @a r to the same /// ACE_Refcounted_Auto_Ptr_Rep. An ACE_Refcounted_Auto_Ptr_Rep @@ -77,7 +77,7 @@ public: bool operator != (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r) const; /// Redirection operator - X *operator-> (void) const; + X *operator-> () const; /// Accessor method. X &operator *() const; @@ -90,20 +90,20 @@ public: /// Releases the reference to the underlying representation object. /// @retval The pointer value prior to releasing it. - X *release (void); + X *release (); /// Releases the current pointer value and then sets a new /// pointer value specified by @a p. void reset (X *p = 0); /// Get the pointer value. - X *get (void) const; + X *get () const; /// Get the reference count value. - long count (void) const; + long count () const; /// Returns @c true if this object does not contain a valid pointer. - bool null (void) const; + bool null () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -133,10 +133,10 @@ private: friend class ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>; /// Get the pointer value. - X *get (void) const; + X *get () const; /// Get the reference count value. - long count (void) const; + long count () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -174,7 +174,7 @@ private: private: // = Constructor and destructor private. ACE_Refcounted_Auto_Ptr_Rep (X *p = 0); - ~ACE_Refcounted_Auto_Ptr_Rep (void); + ~ACE_Refcounted_Auto_Ptr_Rep (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl index f495076b153..2c46bbb5d3f 100644 --- a/ACE/ace/Refcounted_Auto_Ptr.inl +++ b/ACE/ace/Refcounted_Auto_Ptr.inl @@ -5,19 +5,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class X, class ACE_LOCK> inline long -ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count (void) const +ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::count () const { return this->ref_count_.value(); } template <class X, class ACE_LOCK> inline long -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::count (void) const +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::count () const { return this->rep_->count (); } template <class X, class ACE_LOCK> inline bool -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::null (void) const +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::null () const { return (this->rep_ == 0 || this->rep_->get () == 0); } @@ -75,12 +75,12 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr_Rep (X *p) } template <class X, class ACE_LOCK> inline -ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr_Rep (void) +ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr_Rep () { } template <class X, class ACE_LOCK> inline X * -ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get (void) const +ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::get () const { return this->ptr_.get (); } @@ -110,7 +110,7 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator!= (const ACE_Refcounted_Auto_Ptr< } template <class X, class ACE_LOCK> inline X * -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator-> (void) const +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator-> () const { return this->rep_->get(); } @@ -134,14 +134,14 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator bool () const } template <class X, class ACE_LOCK> inline X* -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::get (void) const +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::get () const { // We return the ACE_Future_rep. return this->rep_->get (); } template<class X, class ACE_LOCK> inline X * -ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::release (void) +ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::release () { X *p = this->get (); AUTO_REFCOUNTED_PTR_REP::detach (this->rep_); diff --git a/ACE/ace/Reverse_Lock_T.cpp b/ACE/ace/Reverse_Lock_T.cpp index e55e1f47261..eac8be2976b 100644 --- a/ACE/ace/Reverse_Lock_T.cpp +++ b/ACE/ace/Reverse_Lock_T.cpp @@ -14,34 +14,34 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_LOCKING_MECHANISM> -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock () { } // Explicitly destroy the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove () { return this->lock_.remove (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire () { return this->lock_.release (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire () { ACE_NOTSUP_RETURN (-1); } // Acquire the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release () { if (this->acquire_method_ == ACE_Acquire_Method::ACE_READ) return this->lock_.acquire_read (); @@ -53,35 +53,35 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void) // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read () { ACE_NOTSUP_RETURN (-1); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write () { ACE_NOTSUP_RETURN (-1); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read () { ACE_NOTSUP_RETURN (-1); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write () { ACE_NOTSUP_RETURN (-1); } // Release the lock. template <class ACE_LOCKING_MECHANISM> int -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade () { ACE_NOTSUP_RETURN (-1); } diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index f582c3f4986..571deb0de85 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -81,35 +81,35 @@ public: /// Destructor. If <lock_> was not passed in by the user, it will be /// deleted. - virtual ~ACE_Reverse_Lock (void); + virtual ~ACE_Reverse_Lock (); // = Lock accessors. /// Release the lock. - virtual int acquire (void); + virtual int acquire (); /// Release the lock. - virtual int tryacquire (void); + virtual int tryacquire (); /// Acquire the lock. - virtual int release (void); + virtual int release (); /// Release the lock. - virtual int acquire_read (void); + virtual int acquire_read (); /// Release the lock. - virtual int acquire_write (void); + virtual int acquire_write (); /// Release the lock. - virtual int tryacquire_read (void); + virtual int tryacquire_read (); /// Release the lock. - virtual int tryacquire_write (void); + virtual int tryacquire_write (); /// Release the lock. - virtual int tryacquire_write_upgrade (void); + virtual int tryacquire_write_upgrade (); /// Explicitly destroy the lock. - virtual int remove (void); + virtual int remove (); private: /// The concrete locking mechanism that all the methods delegate to. diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h index 1f4f6749e83..2d599c6e54a 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -95,11 +95,11 @@ public: /// Transform into a copy of the ASCII character representation. /// (caller must delete) - char *char_rep (void) const; + char *char_rep () const; /// Transform into a copy of a USHORT16 representation (caller must /// delete). Note, behavior is undefined when sizeof (wchar_t) != 2. - ACE_UINT16 *ushort_rep (void) const; + ACE_UINT16 *ushort_rep () const; }; ACE_Export @@ -152,7 +152,7 @@ public: ACE_SString (char c, ACE_Allocator *alloc = 0); /// Default destructor. - ~ACE_SString (void); + ~ACE_SString (); /// Return the slot'th character in the string (doesn't perform /// bounds checking). @@ -176,23 +176,23 @@ public: ACE_SString substr (size_type offset, size_type length = npos) const; /// Returns a hash value for this string. - u_long hash (void) const; + u_long hash () const; /// Return the length of the string. - size_type length (void) const; + size_type length () const; /// Set the underlying pointer. Since this does not copy memory or /// delete existing memory use with extreme caution!!! void rep (char *s); /// Get the underlying pointer. - const char *rep (void) const; + const char *rep () const; /// Get the underlying pointer. - const char *fast_rep (void) const; + const char *fast_rep () const; /// Same as STL String's c_str() and fast_rep(). - const char *c_str (void) const; + const char *c_str () const; /// Comparison operator that will match substrings. Returns the /// slot of the first location that matches, else @c npos. @@ -230,7 +230,7 @@ public: int compare (const ACE_SString &s) const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -277,12 +277,12 @@ public: explicit ACE_Auto_String_Free (char* p = 0); ACE_Auto_String_Free (ACE_Auto_String_Free &rhs); ACE_Auto_String_Free& operator= (ACE_Auto_String_Free &rhs); - ~ACE_Auto_String_Free (void); + ~ACE_Auto_String_Free (); char* operator* () const; char operator[] (size_t i) const; - char* get (void) const; - char* release (void); + char* get () const; + char* release (); void reset (char* p = 0); private: diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index c5685c0905b..5079e51a174 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -60,7 +60,7 @@ operator+ (const ACE_NS_WString &s, const ACE_NS_WString &t) // ------------------------------------------------------- ACE_INLINE -ACE_SString::~ACE_SString (void) +ACE_SString::~ACE_SString () { } @@ -92,7 +92,7 @@ ACE_SString::operator[] (size_type slot) // Get the underlying pointer (does not make a copy, so beware!). ACE_INLINE const char * -ACE_SString::rep (void) const +ACE_SString::rep () const { ACE_TRACE ("ACE_SString::rep"); return this->rep_; @@ -101,7 +101,7 @@ ACE_SString::rep (void) const // Get the underlying pointer (does not make a copy, so beware!). ACE_INLINE const char * -ACE_SString::fast_rep (void) const +ACE_SString::fast_rep () const { ACE_TRACE ("ACE_SString::fast_rep"); return this->rep_; @@ -110,7 +110,7 @@ ACE_SString::fast_rep (void) const // Get the underlying pointer (does not make a copy, so beware!). ACE_INLINE const char * -ACE_SString::c_str (void) const +ACE_SString::c_str () const { ACE_TRACE ("ACE_SString::c_str"); return this->rep_; @@ -218,13 +218,13 @@ ACE_SString::rfind (char c, size_type pos) const } ACE_INLINE u_long -ACE_SString::hash (void) const +ACE_SString::hash () const { return ACE::hash_pjw (this->rep_); } ACE_INLINE ACE_SString::size_type -ACE_SString::length (void) const +ACE_SString::length () const { ACE_TRACE ("ACE_SString::length"); return this->len_; @@ -266,13 +266,13 @@ ACE_Auto_String_Free::operator= (ACE_Auto_String_Free& rhs) } ACE_INLINE -ACE_Auto_String_Free::~ACE_Auto_String_Free (void) +ACE_Auto_String_Free::~ACE_Auto_String_Free () { this->reset (0); } ACE_INLINE char* -ACE_Auto_String_Free::operator* (void) const +ACE_Auto_String_Free::operator* () const { return this->p_; } @@ -284,13 +284,13 @@ ACE_Auto_String_Free::operator[] (size_t i) const } ACE_INLINE char* -ACE_Auto_String_Free::get (void) const +ACE_Auto_String_Free::get () const { return this->p_; } ACE_INLINE char* -ACE_Auto_String_Free::release (void) +ACE_Auto_String_Free::release () { char* p = this->p_; this->p_ = 0; diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h index ea43ca118e4..687ef4d382e 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -56,10 +56,10 @@ public: void dump (void) const {} private: - // Disallow copying and assignment. - ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &); - void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &); - + ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete; + void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete; + ACE_Guard (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete; + void operator= (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete; }; // FUZZ: enable check_for_ACE_Guard #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */ diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h index a8fc282fa74..9b3c0dc1215 100644 --- a/ACE/ace/Semaphore.h +++ b/ACE/ace/Semaphore.h @@ -42,18 +42,18 @@ public: int max = 0x7fffffff); /// Implicitly destroy the semaphore. - ~ACE_Semaphore (void); + ~ACE_Semaphore (); /** * Explicitly destroy the semaphore. Note that only one thread * should call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Block the thread until the semaphore count becomes /// greater than 0, then decrement it. - int acquire (void); + int acquire (); /** * Block the thread until the semaphore count becomes greater than 0 @@ -95,11 +95,11 @@ public: * because someone else already had the lock, @c errno is set to * @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Increment the semaphore by 1, potentially unblocking a waiting /// thread. - int release (void); + int release (); /// Increment the semaphore by @a release_count, potentially /// unblocking waiting threads. @@ -110,14 +110,14 @@ public: * here to make the ACE_Semaphore interface consistent with the * other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /** * Acquire semaphore ownership. This calls <acquire> and is only * here to make the ACE_Semaphore interface consistent with the * other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -126,7 +126,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire semaphore (i.e., won't block). This calls @@ -135,7 +135,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here to make the ACE_Semaphore @@ -143,16 +143,16 @@ public: * Assumes the caller has already acquired the semaphore using one of * the above calls, and returns 0 (success) always. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; /// Return the underlying lock. - const ACE_sema_t &lock (void) const; + const ACE_sema_t &lock () const; protected: ACE_sema_t semaphore_; diff --git a/ACE/ace/Semaphore.inl b/ACE/ace/Semaphore.inl index 8de0beef334..ba38cc96bd7 100644 --- a/ACE/ace/Semaphore.inl +++ b/ACE/ace/Semaphore.inl @@ -2,14 +2,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_sema_t & -ACE_Semaphore::lock (void) const +ACE_Semaphore::lock () const { // ACE_TRACE ("ACE_Semaphore::lock"); return this->semaphore_; } ACE_INLINE int -ACE_Semaphore::remove (void) +ACE_Semaphore::remove () { // ACE_TRACE ("ACE_Semaphore::remove"); int result = 0; @@ -22,7 +22,7 @@ ACE_Semaphore::remove (void) } ACE_INLINE int -ACE_Semaphore::acquire (void) +ACE_Semaphore::acquire () { // ACE_TRACE ("ACE_Semaphore::acquire"); return ACE_OS::sema_wait (&this->semaphore_); @@ -43,14 +43,14 @@ ACE_Semaphore::acquire (ACE_Time_Value *tv) } ACE_INLINE int -ACE_Semaphore::tryacquire (void) +ACE_Semaphore::tryacquire () { // ACE_TRACE ("ACE_Semaphore::tryacquire"); return ACE_OS::sema_trywait (&this->semaphore_); } ACE_INLINE int -ACE_Semaphore::release (void) +ACE_Semaphore::release () { // ACE_TRACE ("ACE_Semaphore::release"); return ACE_OS::sema_post (&this->semaphore_); @@ -68,7 +68,7 @@ ACE_Semaphore::release (unsigned int release_count) // other synchronization APIs. ACE_INLINE int -ACE_Semaphore::acquire_read (void) +ACE_Semaphore::acquire_read () { return this->acquire (); } @@ -78,7 +78,7 @@ ACE_Semaphore::acquire_read (void) // other synchronization APIs. ACE_INLINE int -ACE_Semaphore::acquire_write (void) +ACE_Semaphore::acquire_write () { return this->acquire (); } @@ -88,7 +88,7 @@ ACE_Semaphore::acquire_write (void) // interface consistent with the other synchronization APIs. ACE_INLINE int -ACE_Semaphore::tryacquire_read (void) +ACE_Semaphore::tryacquire_read () { return this->tryacquire (); } @@ -98,7 +98,7 @@ ACE_Semaphore::tryacquire_read (void) // interface consistent with the other synchronization APIs. ACE_INLINE int -ACE_Semaphore::tryacquire_write (void) +ACE_Semaphore::tryacquire_write () { return this->tryacquire (); } @@ -108,7 +108,7 @@ ACE_Semaphore::tryacquire_write (void) // already acquired the semaphore using one of the above calls, and // returns 0 (success) always. ACE_INLINE int -ACE_Semaphore::tryacquire_write_upgrade (void) +ACE_Semaphore::tryacquire_write_upgrade () { return 0; } diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 3b27c1391d6..062fdd07daf 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -177,7 +177,7 @@ public: int active_; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -215,11 +215,11 @@ template<> class ACE_Export ACE_Threading_Helper<ACE_Thread_Mutex> { public: - ACE_Threading_Helper (void); - ~ACE_Threading_Helper (void); + ACE_Threading_Helper (); + ~ACE_Threading_Helper (); void set (void*); - void* get (void); + void* get (); private: /// Key for the thread-specific data, which is a simple pointer to @@ -234,11 +234,11 @@ template<> class ACE_Export ACE_Threading_Helper<ACE_Null_Mutex> { public: - ACE_Threading_Helper (void); - ~ACE_Threading_Helper (void); + ACE_Threading_Helper (); + ~ACE_Threading_Helper (); void set (void*); - void* get (void); + void* get (); }; #define ACE_Component_Config ACE_Service_Config @@ -308,7 +308,7 @@ public: /// Perform user-specified close activities and remove dynamic /// memory. - virtual ~ACE_Service_Config (void); + virtual ~ACE_Service_Config (); private: /** @@ -343,7 +343,7 @@ private: * Returns the process-wide global singleton instance. It would * have been created and will be managed by the Object Manager. */ - static ACE_Service_Config* singleton (void); + static ACE_Service_Config* singleton (); /** * Mutator for the currently active configuration context instance @@ -357,7 +357,7 @@ private: /** * Accessor for the "current" service gestalt */ - static ACE_Service_Gestalt* current (void); + static ACE_Service_Gestalt* current (); /** * This is what the static service initializators are hard-wired to @@ -370,7 +370,7 @@ private: * * @deprecated Use current() instead. */ - static ACE_Service_Gestalt* instance (void); + static ACE_Service_Gestalt* instance (); /** * Returns a process-wide global singleton instance in contrast with @@ -380,7 +380,7 @@ private: * for dynamically loading services. If you must, use with extreme * caution! */ - static ACE_Service_Gestalt* global (void); + static ACE_Service_Gestalt* global (); /** * Performs an open without parsing command-line arguments. The @@ -469,20 +469,20 @@ private: /// Tidy up and perform last rites when ACE_Service_Config is shut /// down. This method calls close_svcs(). Returns 0. - static int close (void); + static int close (); /// Perform user-specified close hooks and possibly delete all of the /// configured services in the <Service_Repository>. - static int fini_svcs (void); + static int fini_svcs (); /// True if reconfiguration occurred. - static int reconfig_occurred (void); + static int reconfig_occurred (); /// Indicate that reconfiguration occurred. static void reconfig_occurred (int); /// Perform the reconfiguration process. - static void reconfigure (void); + static void reconfigure (); // = The following methods are static in order to enforce Singleton // semantics for the Reactor, Service_Repository, Thread_Manager, @@ -504,7 +504,7 @@ private: /// idiom for registering static services: /// /// ACE_Service_Config::static_svcs ()->insert (...); - static ACE_Service_Gestalt* static_svcs (void); + static ACE_Service_Gestalt* static_svcs (); /// Insert a static service descriptor for processing on open_i(). The /// corresponding ACE_STATIC_SVC_* macros were changed to use this method @@ -553,7 +553,7 @@ private: #endif /* ACE_HAS_WINCE */ /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Set the signal_handler for internal use by ACE_Object_Manager only. static ACE_INLINE void signal_handler (ACE_Sig_Adapter *); @@ -589,7 +589,7 @@ private: * provided in the svc.conf file(s). Returns the number of errors * that occurred. */ - static int process_directives (void); + static int process_directives (); /// Handles signals to trigger reconfigurations. static void handle_signal (int sig, siginfo_t *, ucontext_t *); @@ -630,15 +630,15 @@ private: /// @deprecated /// Process service configuration requests that were provided on the /// command-line. Returns the number of errors that occurred. - static int process_commandline_directives (void); + static int process_commandline_directives (); /// Become a daemon. - static int start_daemon (void); + static int start_daemon (); // @deprecated // Add the default statically-linked services to the // ACE_Service_Repository. - static int load_static_svcs (void); + static int load_static_svcs (); protected: #if (ACE_USES_CLASSIC_SVC_CONF == 1) @@ -715,7 +715,7 @@ class ACE_Export ACE_Service_Config_Guard { public: ACE_Service_Config_Guard (ACE_Service_Gestalt* psg); - ~ACE_Service_Config_Guard (void); + ~ACE_Service_Config_Guard (); private: // Private AND not implemented to disable copying diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index 5cffe43449f..4f187015bcc 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -67,7 +67,7 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) /// Return the global configuration instance. Allways returns the same /// instance ACE_INLINE ACE_Service_Gestalt * -ACE_Service_Config::global (void) +ACE_Service_Config::global () { return ACE_Service_Config::singleton()->instance_.get (); } @@ -78,7 +78,7 @@ ACE_Service_Config::global (void) /// ACE_Service_Config_Guard provides a way of temporarily replacing /// the "current" configuration instance in the context of a thread. ACE_INLINE ACE_Service_Gestalt * -ACE_Service_Config::instance (void) +ACE_Service_Config::instance () { return ACE_Service_Config::current (); } @@ -92,7 +92,7 @@ ACE_Service_Config::instance (void) // service registration problems. ACE_INLINE ACE_Service_Gestalt* -ACE_Service_Config::static_svcs (void) +ACE_Service_Config::static_svcs () { return ACE_Service_Config::current (); } @@ -154,7 +154,7 @@ ACE_Service_Config::process_directive (const ACE_TCHAR directive[]) /// Process service configuration requests as indicated in the queue of /// svc.conf files. ACE_INLINE int -ACE_Service_Config::process_directives (void) +ACE_Service_Config::process_directives () { return ACE_Service_Config::current ()->process_directives (false); } diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h index 9946c460ec8..97af53c33ab 100644 --- a/ACE/ace/Service_Gestalt.h +++ b/ACE/ace/Service_Gestalt.h @@ -85,10 +85,10 @@ public: /// Perform user-specified close activities and remove dynamic /// memory. - ~ACE_Service_Gestalt (void); + ~ACE_Service_Gestalt (); /// Dump the state of an object. - void dump (void) const; + void dump () const; /** * Performs an open without parsing command-line arguments. The @@ -185,7 +185,7 @@ public: /// Has it been opened? Returns the difference between the times /// open and close have been called on this instance - int is_opened (void); + int is_opened (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -253,7 +253,7 @@ public: /// Tidy up and perform last rites when ACE_Service_Config is shut /// down. This method calls @c close_svcs. Returns 0. - int close (void); + int close (); /// Registers a service descriptor for a static service object int insert (ACE_Static_Svc_Descriptor *stsd); @@ -318,14 +318,14 @@ public: struct Processed_Static_Svc { Processed_Static_Svc (const ACE_Static_Svc_Descriptor *); - ~Processed_Static_Svc (void); + ~Processed_Static_Svc (); ACE_TCHAR * name_; const ACE_Static_Svc_Descriptor *assd_; ACE_ALLOC_HOOK_DECLARE; }; /// Get the current ACE_Service_Repository held by this object. - ACE_Service_Repository* current_service_repository (void); + ACE_Service_Repository* current_service_repository (); protected: int parse_args_i (int, ACE_TCHAR *argv[], @@ -348,15 +348,15 @@ protected: bool ignore_debug_flag = false); /// Initialize the @c svc_conf_file_queue_ if necessary. - int init_svc_conf_file_queue (void); + int init_svc_conf_file_queue (); /// Add the default statically-linked services to the /// ACE_Service_Repository. - int load_static_svcs (void); + int load_static_svcs (); /// Process service configuration requests that were provided on the /// command-line. Returns the number of errors that occurred. - int process_commandline_directives (void); + int process_commandline_directives (); /// Process a static directive without also inserting its descriptor /// the global table. This avoids multiple additions when processing @@ -385,7 +385,7 @@ protected: /// Performs the common initialization tasks for a new or previously /// closed instance. Must not be virtual, as it is called from the /// constructor. - int init_i (void); + int init_i (); protected: /// Maintain a queue of services to be configured from the @@ -492,7 +492,7 @@ public: ACE_Service_Type_Dynamic_Guard (ACE_Service_Repository &r, ACE_TCHAR const *name); - ~ACE_Service_Type_Dynamic_Guard (void); + ~ACE_Service_Type_Dynamic_Guard (); private: ACE_Service_Repository & repo_; diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl index ec46b27060a..3add95108d6 100644 --- a/ACE/ace/Service_Gestalt.inl +++ b/ACE/ace/Service_Gestalt.inl @@ -67,7 +67,7 @@ ACE_Service_Gestalt::find (const ACE_TCHAR name[], } ACE_INLINE ACE_Service_Repository* -ACE_Service_Gestalt::current_service_repository (void) +ACE_Service_Gestalt::current_service_repository () { return this->repo_; } diff --git a/ACE/ace/Service_Object.h b/ACE/ace/Service_Object.h index 0fdbc13b91c..4f123319c2e 100644 --- a/ACE/ace/Service_Object.h +++ b/ACE/ace/Service_Object.h @@ -48,13 +48,13 @@ public: ACE_Service_Object (ACE_Reactor * = 0); /// Destructor. - virtual ~ACE_Service_Object (void); + virtual ~ACE_Service_Object (); /// Temporarily disable a service without removing it completely. - virtual int suspend (void); + virtual int suspend (); /// Re-enable a previously suspended service. - virtual int resume (void); + virtual int resume (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -99,33 +99,33 @@ public: ACE_Service_Type_Impl *o, ACE_SHLIB_HANDLE handle, bool active); - ~ACE_Service_Type (void); + ~ACE_Service_Type (); - const ACE_TCHAR *name (void) const; + const ACE_TCHAR *name () const; void name (const ACE_TCHAR *); - const ACE_Service_Type_Impl *type (void) const; + const ACE_Service_Type_Impl *type () const; void type (const ACE_Service_Type_Impl *, bool active = true); /// Is this just a stub for the real thing? - bool is_forward_declaration (void) const; + bool is_forward_declaration () const; - int suspend (void) const; - int resume (void) const; - bool active (void) const; + int suspend () const; + int resume () const; + bool active () const; void active (bool turnon); /// Calls @c fini on @c type_ - int fini (void); + int fini (); /// Check if the service has been fini'ed. - bool fini_called (void) const; + bool fini_called () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Get to the DLL's implentation - const ACE_DLL & dll (void) const; + const ACE_DLL & dll () const; /// Sets the DLL void dll (const ACE_DLL&); @@ -170,7 +170,7 @@ public: ACE_Service_Object_Ptr (ACE_Service_Object *so); /// Release the held ACE_Service_Object by calling its fini() hook. - ~ACE_Service_Object_Ptr (void); + ~ACE_Service_Object_Ptr (); /// Smart pointer to access the underlying ACE_Service_Object. ACE_Service_Object *operator-> (); diff --git a/ACE/ace/Service_Object.inl b/ACE/ace/Service_Object.inl index e5c5099f061..e4a0a9f4f7a 100644 --- a/ACE/ace/Service_Object.inl +++ b/ACE/ace/Service_Object.inl @@ -6,7 +6,7 @@ ACE_INLINE ACE_Service_Object_Ptr::ACE_Service_Object_Ptr (ACE_Service_Object *s { } -ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void) +ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr () { this->service_object_->fini (); delete this->service_object_; @@ -19,14 +19,14 @@ ACE_Service_Object_Ptr::operator-> () } ACE_INLINE const ACE_TCHAR * -ACE_Service_Type::name (void) const +ACE_Service_Type::name () const { ACE_TRACE ("ACE_Service_Type::name"); return this->name_; } ACE_INLINE const ACE_Service_Type_Impl * -ACE_Service_Type::type (void) const +ACE_Service_Type::type () const { ACE_TRACE ("ACE_Service_Type::type"); return this->type_; @@ -41,7 +41,7 @@ ACE_Service_Type::type (const ACE_Service_Type_Impl *o, bool enabled) } ACE_INLINE bool -ACE_Service_Type::active (void) const +ACE_Service_Type::active () const { ACE_TRACE ("ACE_Service_Type::active"); return this->active_; @@ -55,7 +55,7 @@ ACE_Service_Type::active (bool turnon) } ACE_INLINE bool -ACE_Service_Type::fini_called (void) const +ACE_Service_Type::fini_called () const { ACE_TRACE ("ACE_Service_Type::fini_called"); return this->fini_already_called_; diff --git a/ACE/ace/Service_Repository.h b/ACE/ace/Service_Repository.h index 241e796d699..4ed680a955c 100644 --- a/ACE/ace/Service_Repository.h +++ b/ACE/ace/Service_Repository.h @@ -64,15 +64,15 @@ public: /// Close down the repository and free up dynamically allocated /// resources. - ~ACE_Service_Repository (void); + ~ACE_Service_Repository (); /// Close down the repository and free up dynamically allocated /// resources. - int close (void); + int close (); /// Finalize all the services by calling fini() and deleting /// dynamically allocated services. - int fini (void); + int fini (); /// Get pointer to a process-wide ACE_Service_Repository. static ACE_Service_Repository * instance @@ -83,7 +83,7 @@ public: static ACE_Service_Repository *instance (ACE_Service_Repository *); /// Delete the dynamically allocated Singleton. - static void close_singleton (void); + static void close_singleton (); // = Search structure operations (all acquire locks as necessary). @@ -126,13 +126,13 @@ public: int suspend (const ACE_TCHAR name[], const ACE_Service_Type **srp = 0); /// Return the current size of the repository. - size_t current_size (void) const; + size_t current_size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Returns a reference to the lock used by the ACE_Service_Repository - ACE_SYNCH_RECURSIVE_MUTEX &lock (void) const; + ACE_SYNCH_RECURSIVE_MUTEX &lock () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -224,7 +224,7 @@ public: bool ignored_suspended = true); /// Destructor. - ~ACE_Service_Repository_Iterator (void); + ~ACE_Service_Repository_Iterator (); public: @@ -235,20 +235,20 @@ public: int next (const ACE_Service_Type *&next_item); /// Returns 1 when all items have been seen, else 0. - int done (void) const; + int done () const; /// Move forward by one element in the repository. 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; private: - bool valid (void) const; + bool valid () const; private: ACE_Service_Repository_Iterator (const ACE_Service_Repository_Iterator&); diff --git a/ACE/ace/Service_Repository.inl b/ACE/ace/Service_Repository.inl index 9cbd388215e..09fcf738876 100644 --- a/ACE/ace/Service_Repository.inl +++ b/ACE/ace/Service_Repository.inl @@ -10,7 +10,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE size_t -ACE_Service_Repository::current_size (void) const +ACE_Service_Repository::current_size () const { ACE_TRACE ("ACE_Service_Repository::current_size"); ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, @@ -20,13 +20,13 @@ ACE_Service_Repository::current_size (void) const } ACE_INLINE ACE_SYNCH_RECURSIVE_MUTEX& -ACE_Service_Repository::lock (void) const +ACE_Service_Repository::lock () const { return this->lock_; } ACE_INLINE int -ACE_Service_Repository_Iterator::done (void) const +ACE_Service_Repository_Iterator::done () const { ACE_TRACE ("ACE_Service_Repository_Iterator::done"); @@ -34,7 +34,7 @@ ACE_Service_Repository_Iterator::done (void) const } ACE_INLINE -ACE_Service_Repository_Iterator::~ACE_Service_Repository_Iterator (void) +ACE_Service_Repository_Iterator::~ACE_Service_Repository_Iterator () { } 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/Shared_Object.h b/ACE/ace/Shared_Object.h index 6497f292e36..230bdad40da 100644 --- a/ACE/ace/Shared_Object.h +++ b/ACE/ace/Shared_Object.h @@ -33,16 +33,16 @@ class ACE_Export ACE_Shared_Object { public: /// Constructor - ACE_Shared_Object (void); + ACE_Shared_Object (); /// Destructor - virtual ~ACE_Shared_Object (void); + virtual ~ACE_Shared_Object (); /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); /// Returns information on a service object. virtual int info (ACE_TCHAR **info_string, size_t length = 0) const; diff --git a/ACE/ace/Shared_Object.inl b/ACE/ace/Shared_Object.inl index 358a3fb7a4e..ec85cdfbce0 100644 --- a/ACE/ace/Shared_Object.inl +++ b/ACE/ace/Shared_Object.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Shared_Object::ACE_Shared_Object (void) +ACE_Shared_Object::ACE_Shared_Object () { } diff --git a/ACE/ace/Singleton.cpp b/ACE/ace/Singleton.cpp index 52ca2b53d36..758c647d10b 100644 --- a/ACE/ace/Singleton.cpp +++ b/ACE/ace/Singleton.cpp @@ -27,7 +27,7 @@ ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_DLL_Singleton_T) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_DLL_Singleton_Adapter_T) template <class TYPE, class ACE_LOCK> void -ACE_Singleton<TYPE, ACE_LOCK>::dump (void) +ACE_Singleton<TYPE, ACE_LOCK>::dump () { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump"); @@ -41,7 +41,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void) } template <class TYPE, class ACE_LOCK> ACE_Singleton<TYPE, ACE_LOCK> *& -ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void) +ACE_Singleton<TYPE, ACE_LOCK>::instance_i () { #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) // Pointer to the Singleton instance. This works around a bug with @@ -55,7 +55,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance_i (void) } template <class TYPE, class ACE_LOCK> TYPE * -ACE_Singleton<TYPE, ACE_LOCK>::instance (void) +ACE_Singleton<TYPE, ACE_LOCK>::instance () { ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::instance"); @@ -133,7 +133,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::cleanup (void *param) } template <class TYPE, class ACE_LOCK> void -ACE_Singleton<TYPE, ACE_LOCK>::close (void) +ACE_Singleton<TYPE, ACE_LOCK>::close () { ACE_Singleton<TYPE, ACE_LOCK> *&singleton = ACE_Singleton<TYPE, ACE_LOCK>::instance_i (); @@ -155,7 +155,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::singleton_ = 0; #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ template <class TYPE, class ACE_LOCK> void -ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void) +ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump () { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump"); @@ -170,7 +170,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void) template <class TYPE, class ACE_LOCK> ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *& -ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void) +ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i () { #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) // Pointer to the Singleton instance. This works around a bug with @@ -184,7 +184,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (void) } template <class TYPE, class ACE_LOCK> TYPE * -ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void) +ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance () { ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance"); @@ -237,7 +237,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance (void) } template <class TYPE, class ACE_LOCK> void -ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void) +ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close () { ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&singleton = ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i (); @@ -250,7 +250,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::close (void) } template <class TYPE, class ACE_LOCK> void -ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) +ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump () { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump"); @@ -264,7 +264,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) } template <class TYPE, class ACE_LOCK> ACE_TSS_Singleton<TYPE, ACE_LOCK> *& -ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void) +ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () { #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) // Pointer to the Singleton instance. This works around a bug with @@ -278,7 +278,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void) } template <class TYPE, class ACE_LOCK> TYPE * -ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) +ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance () { ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance"); @@ -343,7 +343,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::cleanup (void *) } template <class TYPE, class ACE_LOCK> void -ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) +ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump () { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump"); @@ -358,7 +358,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) template <class TYPE, class ACE_LOCK> ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *& -ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void) +ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i () { #if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) // Pointer to the Singleton instance. This works around a bug with @@ -372,7 +372,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (void) } template <class TYPE, class ACE_LOCK> TYPE * -ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) +ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance () { ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance"); @@ -426,7 +426,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) } template <class TYPE, class ACE_LOCK> void -ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close (void) +ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::close () { ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&singleton = ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i (); @@ -454,7 +454,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::singleton_ = 0; #endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */ template <class TYPE, class ACE_LOCK> void -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump () { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump"); @@ -469,7 +469,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void) template <class TYPE, class ACE_LOCK> ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *& -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i () { ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i"); @@ -485,7 +485,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i (void) } template <class TYPE, class ACE_LOCK> TYPE * -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance () { ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance"); @@ -541,7 +541,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance (void) } template <class TYPE, class ACE_LOCK> void -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close () { ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close"); @@ -553,20 +553,20 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close (void) } template <class TYPE, class ACE_LOCK> void -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton () { ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close_singleton"); ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::close (); } template <class TYPE, class ACE_LOCK> const ACE_TCHAR * -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dll_name (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dll_name () { return this->instance ()->dll_name (); } template <class TYPE, class ACE_LOCK> const ACE_TCHAR * -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name () { return this->instance ()->name (); } @@ -575,7 +575,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::name (void) /**********************************************************************/ template <class TYPE> const ACE_TCHAR* -ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name (void) +ACE_DLL_Singleton_Adapter_T<TYPE>::dll_name () { // @todo make this a constant somewhere (or it there already is one // then use it. diff --git a/ACE/ace/Singleton.h b/ACE/ace/Singleton.h index d0cd95f4ae0..68932be0fb7 100644 --- a/ACE/ace/Singleton.h +++ b/ACE/ace/Singleton.h @@ -78,24 +78,24 @@ class ACE_Singleton : public ACE_Cleanup { public: /// Global access point to the Singleton. - static TYPE *instance (void); + static TYPE *instance (); /// Cleanup method, used by @c ace_cleanup_destroyer to destroy the /// ACE_Singleton. virtual void cleanup (void *param = 0); /// Explicitly delete the Singleton instance. - static void close (void); + static void close (); /// Dump the state of the object. - static void dump (void); + static void dump (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Default constructor. - ACE_Singleton (void); + ACE_Singleton (); /// Contained instance. TYPE instance_; @@ -106,7 +106,7 @@ protected: #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ /// Get pointer to the Singleton instance. - static ACE_Singleton<TYPE, ACE_LOCK> *&instance_i (void); + static ACE_Singleton<TYPE, ACE_LOCK> *&instance_i (); }; /** @@ -131,20 +131,20 @@ class ACE_Unmanaged_Singleton : public ACE_Singleton <TYPE, ACE_LOCK> { public: /// Global access point to the Singleton. - static TYPE *instance (void); + static TYPE *instance (); /// Explicitly delete the Singleton instance. - static void close (void); + static void close (); /// Dump the state of the object. - static void dump (void); + static void dump (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Default constructor. - ACE_Unmanaged_Singleton (void); + ACE_Unmanaged_Singleton (); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) /// Pointer to the Singleton (ACE_Cleanup) instance. @@ -152,7 +152,7 @@ protected: #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ /// Get pointer to the Singleton instance. - static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i (void); + static ACE_Unmanaged_Singleton<TYPE, ACE_LOCK> *&instance_i (); }; /** @@ -178,21 +178,21 @@ class ACE_TSS_Singleton : public ACE_Cleanup { public: /// Global access point to the singleton. - static TYPE *instance (void); + static TYPE *instance (); /// Cleanup method, used by <ace_cleanup_destroyer> to destroy the /// singleton. virtual void cleanup (void *param = 0); /// Dump the state of the object. - static void dump (void); + static void dump (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Default constructor. - ACE_TSS_Singleton (void); + ACE_TSS_Singleton (); /// Contained instance. ACE_TSS_TYPE (TYPE) instance_; @@ -206,7 +206,7 @@ protected: #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ /// Get pointer to the TSS Singleton instance. - static ACE_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void); + static ACE_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (); }; /** @@ -227,20 +227,20 @@ class ACE_Unmanaged_TSS_Singleton : public ACE_TSS_Singleton <TYPE, ACE_LOCK> { public: /// Global access point to the singleton. - static TYPE *instance (void); + static TYPE *instance (); /// Explicitly delete the singleton instance. - static void close (void); + static void close (); /// Dump the state of the object. - static void dump (void); + static void dump (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Default constructor. - ACE_Unmanaged_TSS_Singleton (void); + ACE_Unmanaged_TSS_Singleton (); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) /// Pointer to the Singleton (ACE_Cleanup) instance. @@ -248,7 +248,7 @@ protected: #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ /// Get pointer to the Singleton instance. - static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (void); + static ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK> *&instance_i (); }; /** @@ -282,29 +282,29 @@ public: //void cleanup (void *param = 0); /// Global access point to the Singleton. - static TYPE *instance (void); + static TYPE *instance (); /// Explicitly delete the Singleton instance. - static void close (void); + static void close (); - static void close_singleton (void); + static void close_singleton (); /// Dump the state of the object. - static void dump (void); + static void dump (); - const ACE_TCHAR *dll_name (void); + const ACE_TCHAR *dll_name (); - const ACE_TCHAR *name (void); + const ACE_TCHAR *name (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Default constructor. - ACE_DLL_Singleton_T (void); + ACE_DLL_Singleton_T (); /// Destructor. - ~ACE_DLL_Singleton_T (void); + ~ACE_DLL_Singleton_T (); /// Contained instance. TYPE instance_; @@ -315,14 +315,14 @@ protected: #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ /// Get pointer to the singleton instance. - static ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *&instance_i (void); + static ACE_DLL_Singleton_T<TYPE, ACE_LOCK> *&instance_i (); }; template <class TYPE> class ACE_DLL_Singleton_Adapter_T : public TYPE { public: - const ACE_TCHAR *dll_name (void); + const ACE_TCHAR *dll_name (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Singleton.inl b/ACE/ace/Singleton.inl index 912271ba20f..479d38f7487 100644 --- a/ACE/ace/Singleton.inl +++ b/ACE/ace/Singleton.inl @@ -7,32 +7,32 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // have a default constructor. Let the compiler figure it out . . . template <class TYPE, class ACE_LOCK> ACE_INLINE -ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton (void) +ACE_Singleton<TYPE, ACE_LOCK>::ACE_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton (void) +ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton (void) +ACE_TSS_Singleton<TYPE, ACE_LOCK>::ACE_TSS_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton (void) +ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::ACE_Unmanaged_TSS_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::ACE_DLL_Singleton_T (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::ACE_DLL_Singleton_T () { } template <class TYPE, class ACE_LOCK> -ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::~ACE_DLL_Singleton_T (void) +ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::~ACE_DLL_Singleton_T () { } diff --git a/ACE/ace/Static_Object_Lock.h b/ACE/ace/Static_Object_Lock.h index fc167062f6e..0539e0052e2 100644 --- a/ACE/ace/Static_Object_Lock.h +++ b/ACE/ace/Static_Object_Lock.h @@ -40,11 +40,11 @@ class ACE_Export ACE_Static_Object_Lock { public: /// Static lock access point. - static ACE_Recursive_Thread_Mutex *instance (void); + static ACE_Recursive_Thread_Mutex *instance (); /// For use only by ACE_Object_Manager to clean up lock if it /// what dynamically allocated. - static void cleanup_lock (void); + static void cleanup_lock (); }; ACE_END_VERSIONED_NAMESPACE_DECL 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/String_Base.cpp b/ACE/ace/String_Base.cpp index b12d8c4caaa..c98e0b760ab 100644 --- a/ACE/ace/String_Base.cpp +++ b/ACE/ace/String_Base.cpp @@ -113,7 +113,7 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base ( } template <class ACE_CHAR_T> -ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base (void) +ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base () { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base"); @@ -250,7 +250,7 @@ ACE_String_Base<ACE_CHAR_T>::append (const ACE_CHAR_T* s, } template <class ACE_CHAR_T> u_long -ACE_String_Base<ACE_CHAR_T>::hash (void) const +ACE_String_Base<ACE_CHAR_T>::hash () const { return ACE::hash_pjw (reinterpret_cast<char *> ( @@ -345,7 +345,7 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s, bool release) } template <class ACE_CHAR_T> void -ACE_String_Base<ACE_CHAR_T>::fast_clear (void) +ACE_String_Base<ACE_CHAR_T>::fast_clear () { this->len_ = 0; if (this->release_) @@ -365,7 +365,7 @@ ACE_String_Base<ACE_CHAR_T>::fast_clear (void) // Get a copy of the underlying representation. template <class ACE_CHAR_T> ACE_CHAR_T * -ACE_String_Base<ACE_CHAR_T>::rep (void) const +ACE_String_Base<ACE_CHAR_T>::rep () const { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::rep"); @@ -495,7 +495,7 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::next (ACE_CHAR_T * & ch) const } template <class ACE_CHAR_T> -int ACE_String_Base_Iterator <ACE_CHAR_T>::advance (void) +int ACE_String_Base_Iterator <ACE_CHAR_T>::advance () { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::advance"); @@ -545,7 +545,7 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::next (const ACE_CHAR_T * & ch) } template <class ACE_CHAR_T> -int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance (void) +int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance () { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::advance"); diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h index 8005c34b768..b1915c8f2c0 100644 --- a/ACE/ace/String_Base.h +++ b/ACE/ace/String_Base.h @@ -164,7 +164,7 @@ public: /** * Deletes the memory... */ - ~ACE_String_Base (void); + ~ACE_String_Base (); /** * Return the <slot'th> character in the string (doesn't perform @@ -278,7 +278,7 @@ public: * and the next append() or +=() will cause a new buffer to be * allocated internally. */ - void fast_clear (void); + void fast_clear (); /** * Return a substring given an offset and length. @@ -344,14 +344,14 @@ public: * * @return Hash value of string */ - u_long hash (void) const; + u_long hash () const; /** * Return the length of the string. * * @return Length of stored string */ - size_type length (void) const; + size_type length () const; /** * Return the number of allocated CHARs in the string object. @@ -360,19 +360,19 @@ public: * @return Maximum number of ACE_CHAR_T units that can be stored, including * any terminating nul that may be needed. */ - size_t capacity (void) const; + size_t capacity () const; /** * Return @c true if the length of the string is zero, else @c false. */ - bool is_empty (void) const; + bool is_empty () const; /** * Return @c true if the length of the string is zero, else @c * false. We recommend using @c is_empty() instead since it's more * consistent with the ACE container naming conventions. */ - bool empty (void) const; + bool empty () const; /** * Get a copy of the underlying representation. @@ -384,7 +384,7 @@ public: * @return Pointer reference to the string data. Returned string is * zero terminated. */ - ACE_CHAR_T *rep (void) const; + ACE_CHAR_T *rep () const; /** * Get at the underlying representation directly! @@ -395,12 +395,12 @@ public: * that the string is zero terminated. * */ - const ACE_CHAR_T *fast_rep (void) const; + const ACE_CHAR_T *fast_rep () const; /** * Same as STL String's c_str() and fast_rep(). */ - const ACE_CHAR_T *c_str (void) const; + const ACE_CHAR_T *c_str () const; /** * Comparison operator that will match substrings. Returns the @@ -516,7 +516,7 @@ public: /** * Dump the state of an object. */ - void dump (void) const; + void dump () const; /** * This method is designed for high-performance. Please use with @@ -546,11 +546,11 @@ public: */ void swap (ACE_String_Base<ACE_CHAR_T> & str); - iterator begin (void); - const_iterator begin (void) const; + iterator begin (); + const_iterator begin () const; - iterator end (void); - const_iterator end (void) const; + iterator end (); + const_iterator end () const; /** * Declare the dynamic allocation hooks. @@ -627,7 +627,7 @@ public: ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter); /// Destructor. - ~ACE_String_Base_Iterator (void); + ~ACE_String_Base_Iterator (); /** * Test if the iterator has seen all characters. @@ -635,7 +635,7 @@ public: * @retval 0 Characters still remain. * @retval 1 All characters have been seen. */ - int done (void) const; + int done () const; /** * Get the current character. @@ -652,7 +652,7 @@ public: * @retval 0 All characters have been seen. * @retval 1 Items still remain to be seen. */ - int advance (void); + int advance (); /** * Assignment operator @@ -667,12 +667,12 @@ public: * * @return Reference to current character seen by iterator. */ - ACE_CHAR_T & operator * (void); + ACE_CHAR_T & operator * (); /** * Prefix operator */ - ACE_String_Base_Iterator <ACE_CHAR_T> & operator ++ (void); + ACE_String_Base_Iterator <ACE_CHAR_T> & operator ++ (); /** * Postfix operator @@ -682,7 +682,7 @@ public: /** * Prefix operator */ - ACE_String_Base_Iterator <ACE_CHAR_T> & operator -- (void); + ACE_String_Base_Iterator <ACE_CHAR_T> & operator -- (); /** * Postfix operator @@ -754,7 +754,7 @@ public: ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & iter); /// Destructor. - ~ACE_String_Base_Const_Iterator (void); + ~ACE_String_Base_Const_Iterator (); /** * Test if the iterator has seen all characters. @@ -762,7 +762,7 @@ public: * @retval 0 Characters still remain. * @retval 1 All characters have been seen. */ - int done (void) const; + int done () const; /** * Get the current character. @@ -779,7 +779,7 @@ public: * @retval 0 All characters have been seen. * @retval 1 Items still remain to be seen. */ - int advance (void); + int advance (); /** * Assignment operator @@ -794,12 +794,12 @@ public: * * @return Reference to current character seen by iterator. */ - const ACE_CHAR_T & operator * (void); + const ACE_CHAR_T & operator * (); /** * Prefix operator */ - ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator ++ (void); + ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator ++ (); /** * Postfix operator @@ -809,7 +809,7 @@ public: /** * Prefix operator */ - ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator -- (void); + ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator -- (); /** * Postfix operator diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl index 9e397d2d186..1ce4132a1e5 100644 --- a/ACE/ace/String_Base.inl +++ b/ACE/ace/String_Base.inl @@ -7,7 +7,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class ACE_CHAR_T> ACE_INLINE void -ACE_String_Base<ACE_CHAR_T>::dump (void) const +ACE_String_Base<ACE_CHAR_T>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::dump"); @@ -24,27 +24,27 @@ ACE_String_Base<ACE_CHAR_T>::assign_nocopy (const ACE_String_Base<ACE_CHAR_T> &s } template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::size_type -ACE_String_Base<ACE_CHAR_T>::length (void) const +ACE_String_Base<ACE_CHAR_T>::length () const { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::length"); return this->len_; } template <class ACE_CHAR_T> ACE_INLINE size_t -ACE_String_Base<ACE_CHAR_T>::capacity (void) const +ACE_String_Base<ACE_CHAR_T>::capacity () const { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::capacity"); return this->buf_len_; } template <class ACE_CHAR_T> ACE_INLINE bool -ACE_String_Base<ACE_CHAR_T>::is_empty (void) const +ACE_String_Base<ACE_CHAR_T>::is_empty () const { return this->len_ == 0; } template <class ACE_CHAR_T> ACE_INLINE bool -ACE_String_Base<ACE_CHAR_T>::empty (void) const +ACE_String_Base<ACE_CHAR_T>::empty () const { return this->is_empty (); } @@ -79,13 +79,13 @@ ACE_String_Base<ACE_CHAR_T>::operator[] ( } template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T * -ACE_String_Base<ACE_CHAR_T>::fast_rep (void) const +ACE_String_Base<ACE_CHAR_T>::fast_rep () const { return this->rep_; } template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T * -ACE_String_Base<ACE_CHAR_T>::c_str (void) const +ACE_String_Base<ACE_CHAR_T>::c_str () const { return this->rep_; } @@ -140,28 +140,28 @@ ACE_String_Base<ACE_CHAR_T>::strstr (const ACE_String_Base<ACE_CHAR_T> &s) const } template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator -ACE_String_Base<ACE_CHAR_T>::begin (void) +ACE_String_Base<ACE_CHAR_T>::begin () { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin"); return iterator (*this); } template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator -ACE_String_Base<ACE_CHAR_T>::begin (void) const +ACE_String_Base<ACE_CHAR_T>::begin () const { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin"); return const_iterator (*this); } template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator -ACE_String_Base<ACE_CHAR_T>::end (void) +ACE_String_Base<ACE_CHAR_T>::end () { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end"); return iterator (*this, 1); } template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator -ACE_String_Base<ACE_CHAR_T>::end (void) const +ACE_String_Base<ACE_CHAR_T>::end () const { ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end"); return const_iterator (*this, 1); @@ -188,13 +188,13 @@ ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter) } template <class ACE_CHAR_T> ACE_INLINE -ACE_String_Base_Iterator <ACE_CHAR_T>::~ACE_String_Base_Iterator (void) +ACE_String_Base_Iterator <ACE_CHAR_T>::~ACE_String_Base_Iterator () { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::~ACE_String_Base_Iterator"); } template <class ACE_CHAR_T> ACE_INLINE -int ACE_String_Base_Iterator <ACE_CHAR_T>::done (void) const +int ACE_String_Base_Iterator <ACE_CHAR_T>::done () const { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::done"); @@ -202,7 +202,7 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::done (void) const } template <class ACE_CHAR_T> ACE_INLINE -ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * (void) +ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * () { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator *"); @@ -211,7 +211,7 @@ ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * (void) template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base_Iterator <ACE_CHAR_T> & -ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (void) +ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ () { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator ++"); @@ -237,7 +237,7 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (int) template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base_Iterator <ACE_CHAR_T> & -ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (void) +ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- () { ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator --"); @@ -324,13 +324,13 @@ ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T } template <class ACE_CHAR_T> ACE_INLINE -ACE_String_Base_Const_Iterator <ACE_CHAR_T>::~ACE_String_Base_Const_Iterator (void) +ACE_String_Base_Const_Iterator <ACE_CHAR_T>::~ACE_String_Base_Const_Iterator () { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::~ACE_String_Base_Const_Iterator"); } template <class ACE_CHAR_T> ACE_INLINE -int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done (void) const +int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done () const { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::done"); @@ -338,7 +338,7 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done (void) const } template <class ACE_CHAR_T> ACE_INLINE -const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * (void) +const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * () { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator *"); @@ -347,7 +347,7 @@ const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * (void template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base_Const_Iterator <ACE_CHAR_T> & -ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (void) +ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ () { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator ++"); @@ -373,7 +373,7 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (int) template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base_Const_Iterator <ACE_CHAR_T> & -ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (void) +ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- () { ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator --"); 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/TP_Reactor.h b/ACE/ace/TP_Reactor.h index c9be2cf15f5..0a8a326443c 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -66,9 +66,10 @@ public: private: bool dispatch_; - // Disallow copying and assignment. - ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &); - ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &); + ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &) = delete; + ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &) = delete; + ACE_EH_Dispatch_Info (ACE_EH_Dispatch_Info &&) = delete; + ACE_EH_Dispatch_Info &operator= (ACE_EH_Dispatch_Info &&) = delete; }; @@ -114,13 +115,13 @@ public: int acquire_token (ACE_Time_Value *max_wait_time = 0); private: - // Disallow default construction. ACE_TP_Token_Guard (void); - // Disallow copying and assignment. - ACE_TP_Token_Guard (const ACE_TP_Token_Guard &); - ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &); + ACE_TP_Token_Guard (const ACE_TP_Token_Guard &) = delete; + ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &) = delete; + ACE_TP_Token_Guard (ACE_TP_Token_Guard &&) = delete; + ACE_TP_Token_Guard &operator= (ACE_TP_Token_Guard &&) = delete; private: diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h index 376f517924a..06abdac3803 100644 --- a/ACE/ace/TSS_Adapter.h +++ b/ACE/ace/TSS_Adapter.h @@ -41,7 +41,7 @@ public: ACE_TSS_Adapter (void *object, ACE_THR_DEST f); /// Perform the cleanup operation. - void cleanup (void); + void cleanup (); ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index bee8257b0ad..9d3444c0793 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -34,7 +34,7 @@ extern "C" ACE_Export void ACE_TSS_C_cleanup (void *); #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ template <class TYPE> -ACE_TSS<TYPE>::~ACE_TSS (void) +ACE_TSS<TYPE>::~ACE_TSS () { #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) if (this->once_) @@ -71,13 +71,13 @@ ACE_TSS<TYPE>::operator-> () const } template <class TYPE> -ACE_TSS<TYPE>::operator TYPE *(void) const +ACE_TSS<TYPE>::operator TYPE *() const { return this->ts_get (); } template <class TYPE> TYPE * -ACE_TSS<TYPE>::make_TSS_TYPE (void) const +ACE_TSS<TYPE>::make_TSS_TYPE () const { TYPE *temp = 0; ACE_NEW_RETURN (temp, @@ -87,7 +87,7 @@ ACE_TSS<TYPE>::make_TSS_TYPE (void) const } template <class TYPE> void -ACE_TSS<TYPE>::dump (void) const +ACE_TSS<TYPE>::dump () const { #if defined (ACE_HAS_DUMP) #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) @@ -110,7 +110,7 @@ ACE_TSS<TYPE>::cleanup (void *ptr) } template <class TYPE> int -ACE_TSS<TYPE>::ts_init (void) +ACE_TSS<TYPE>::ts_init () { // Ensure that we are serialized! ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->keylock_, 0); @@ -188,7 +188,7 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) } template <class TYPE> TYPE * -ACE_TSS<TYPE>::ts_get (void) const +ACE_TSS<TYPE>::ts_get () const { if (!this->once_) { @@ -269,7 +269,7 @@ ACE_TSS<TYPE>::ts_get (void) const // otherwise returns a pointer to the ts_obj. template <class TYPE> TYPE * -ACE_TSS<TYPE>::ts_object (void) const +ACE_TSS<TYPE>::ts_object () const { if (!this->once_) // Return 0 if we've never been initialized. return 0; @@ -342,7 +342,7 @@ ACE_TSS<TYPE>::ts_object (TYPE *new_ts_obj) ACE_ALLOC_HOOK_DEFINE_Tc(ACE_TSS_Guard) template <class ACE_LOCK> void -ACE_TSS_Guard<ACE_LOCK>::dump (void) const +ACE_TSS_Guard<ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); @@ -352,7 +352,7 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const } template <class ACE_LOCK> void -ACE_TSS_Guard<ACE_LOCK>::init_key (void) +ACE_TSS_Guard<ACE_LOCK>::init_key () { this->key_ = ACE_OS::NULL_key; ACE_Thread::keycreate (&this->key_, @@ -365,13 +365,13 @@ ACE_TSS_Guard<ACE_LOCK>::init_key (void) } template <class ACE_LOCK> -ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (void) +ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard () { this->init_key (); } template <class ACE_LOCK> int -ACE_TSS_Guard<ACE_LOCK>::release (void) +ACE_TSS_Guard<ACE_LOCK>::release () { Guard_Type *guard = 0; @@ -391,7 +391,7 @@ ACE_TSS_Guard<ACE_LOCK>::release (void) } template <class ACE_LOCK> int -ACE_TSS_Guard<ACE_LOCK>::remove (void) +ACE_TSS_Guard<ACE_LOCK>::remove () { Guard_Type *guard = 0; @@ -411,7 +411,7 @@ ACE_TSS_Guard<ACE_LOCK>::remove (void) } template <class ACE_LOCK> -ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void) +ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard () { Guard_Type *guard = 0; @@ -463,7 +463,7 @@ ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, bool block) } template <class ACE_LOCK> int -ACE_TSS_Guard<ACE_LOCK>::acquire (void) +ACE_TSS_Guard<ACE_LOCK>::acquire () { Guard_Type *guard = 0; @@ -483,7 +483,7 @@ ACE_TSS_Guard<ACE_LOCK>::acquire (void) } template <class ACE_LOCK> int -ACE_TSS_Guard<ACE_LOCK>::tryacquire (void) +ACE_TSS_Guard<ACE_LOCK>::tryacquire () { Guard_Type *guard = 0; @@ -523,7 +523,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard (ACE_LOCK &lock, } template <class ACE_LOCK> int -ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void) +ACE_TSS_Write_Guard<ACE_LOCK>::acquire () { Write_Guard_Type *guard = 0; @@ -543,7 +543,7 @@ ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void) } template <class ACE_LOCK> int -ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void) +ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire () { Write_Guard_Type *guard = 0; @@ -563,19 +563,19 @@ ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void) } template <class ACE_LOCK> int -ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write (void) +ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write () { return this->acquire (); } template <class ACE_LOCK> int -ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write (void) +ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write () { return this->tryacquire (); } template <class ACE_LOCK> void -ACE_TSS_Write_Guard<ACE_LOCK>::dump (void) const +ACE_TSS_Write_Guard<ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TSS_Guard<ACE_LOCK>::dump (); @@ -603,7 +603,7 @@ ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block) } template <class ACE_LOCK> int -ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void) +ACE_TSS_Read_Guard<ACE_LOCK>::acquire () { Read_Guard_Type *guard = 0; @@ -623,7 +623,7 @@ ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void) } template <class ACE_LOCK> int -ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void) +ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire () { Read_Guard_Type *guard = 0; @@ -643,19 +643,19 @@ ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void) } template <class ACE_LOCK> int -ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read (void) +ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read () { return this->acquire (); } template <class ACE_LOCK> int -ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read (void) +ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read () { return this->tryacquire (); } template <class ACE_LOCK> void -ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const +ACE_TSS_Read_Guard<ACE_LOCK>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TSS_Guard<ACE_LOCK>::dump (); diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index d3097d54439..f894912f50b 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -94,7 +94,7 @@ public: /// Deregister this object from thread-specific storage administration. /// Will cause all threads' copies of TYPE to be destroyed. - virtual ~ACE_TSS (void); + virtual ~ACE_TSS (); /** * Set the thread-specific object for the calling thread. @@ -129,7 +129,7 @@ public: * may be 0 under odd error conditions; check errno for further * information. */ - TYPE *ts_object (void) const; + TYPE *ts_object () const; /** * Use a "smart pointer" to get the thread-specific data associated @@ -156,17 +156,17 @@ public: * may be 0 under odd error conditions; check errno for further * information. */ - operator TYPE *(void) const; + operator TYPE *() const; //@} /// Hook for construction parameters. - virtual TYPE *make_TSS_TYPE (void) const; + virtual TYPE *make_TSS_TYPE () const; // = Utility methods. /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -174,11 +174,11 @@ public: protected: /// Actually implements the code that retrieves the object from /// thread-specific storage. - TYPE *ts_get (void) const; + TYPE *ts_get () const; /// Factors out common code for initializing TSS. This must NOT be /// called with the lock held... - int ts_init (void); + int ts_init (); #if !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) /// This implementation only works for non-threading systems... @@ -200,7 +200,7 @@ protected: # if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *ts_value (void) const; # else - TYPE *ts_value (void) const; + TYPE *ts_value () const; # endif /* ACE_HAS_THR_C_DEST */ /// Stores a new plain value in the thread-specific storage. diff --git a/ACE/ace/TSS_T.inl b/ACE/ace/TSS_T.inl index 7e68976c88d..9d97fc374a4 100644 --- a/ACE/ace/TSS_T.inl +++ b/ACE/ace/TSS_T.inl @@ -53,7 +53,7 @@ ACE_TSS<TYPE>::ts_value (void) const } # else template <class TYPE> ACE_INLINE TYPE * -ACE_TSS<TYPE>::ts_value (void) const +ACE_TSS<TYPE>::ts_value () const { void *temp = 0; if (ACE_Thread::getspecific (this->key_, &temp) == -1) 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/Thread.h b/ACE/ace/Thread.h index 6290de52e9f..67a190dcc41 100644 --- a/ACE/ace/Thread.h +++ b/ACE/ace/Thread.h @@ -189,7 +189,7 @@ public: static int kill (ACE_thread_t, int signum); /// Yield the thread to another. - static void yield (void); + static void yield (); /** * Return the unique kernel handle of the thread. Note that on @@ -200,14 +200,14 @@ public: static void self (ACE_hthread_t &t_handle); /// Return the unique ID of the thread. - static ACE_thread_t self (void); + static ACE_thread_t self (); /// Exit the current thread and return "status". /// Should _not_ be called by main thread. static void exit (ACE_THR_FUNC_RETURN status = 0); /// Get the LWP concurrency level of the process. - static int getconcurrency (void); + static int getconcurrency (); /// Set the LWP concurrency level of the process. static int setconcurrency (int new_level); @@ -262,11 +262,11 @@ public: static int cancel (ACE_thread_t t_id); /// Test the cancel. - static void testcancel (void); + static void testcancel (); private: /// Ensure that we don't get instantiated. - ACE_Thread (void); + ACE_Thread (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Thread.inl b/ACE/ace/Thread.inl index 33f7fcf0b73..3313bdc53f9 100644 --- a/ACE/ace/Thread.inl +++ b/ACE/ace/Thread.inl @@ -50,7 +50,7 @@ ACE_Thread::getspecific (ACE_thread_key_t key, void **valuep) } ACE_INLINE ACE_thread_t -ACE_Thread::self (void) +ACE_Thread::self () { // ACE_TRACE ("ACE_Thread::self"); return ACE_OS::thr_self (); @@ -64,7 +64,7 @@ ACE_Thread::exit (ACE_THR_FUNC_RETURN status) } ACE_INLINE void -ACE_Thread::yield (void) +ACE_Thread::yield () { ACE_TRACE ("ACE_Thread::yield"); ACE_OS::thr_yield (); @@ -135,7 +135,7 @@ ACE_Thread::join (ACE_hthread_t wait_for, } ACE_INLINE int -ACE_Thread::getconcurrency (void) +ACE_Thread::getconcurrency () { ACE_TRACE ("ACE_Thread::getconcurrency"); return ACE_OS::thr_getconcurrency (); @@ -245,7 +245,7 @@ ACE_Thread::cancel (ACE_thread_t t_id) } ACE_INLINE void -ACE_Thread::testcancel (void) +ACE_Thread::testcancel () { ACE_TRACE ("ACE_Thread::testcancel"); diff --git a/ACE/ace/Thread_Adapter.h b/ACE/ace/Thread_Adapter.h index 660f120e646..a0e6fe6a5e4 100644 --- a/ACE/ace/Thread_Adapter.h +++ b/ACE/ace/Thread_Adapter.h @@ -62,21 +62,21 @@ public: * @c this, thereby rendering the object useless after the call * returns. */ - virtual ACE_THR_FUNC_RETURN invoke (void); + virtual ACE_THR_FUNC_RETURN invoke (); /// Accessor for the optional ACE_Thread_Manager. - ACE_Thread_Manager *thr_mgr (void); + ACE_Thread_Manager *thr_mgr (); ACE_ALLOC_HOOK_DECLARE; protected: /// Ensure that this object must be allocated on the heap. - ~ACE_Thread_Adapter (void); + ~ACE_Thread_Adapter (); private: /// Called by invoke, mainly here to separate the SEH stuff because /// SEH on Win32 doesn't compile with local vars with destructors. - virtual ACE_THR_FUNC_RETURN invoke_i (void); + virtual ACE_THR_FUNC_RETURN invoke_i (); private: /// Optional thread manager. diff --git a/ACE/ace/Thread_Adapter.inl b/ACE/ace/Thread_Adapter.inl index 06751eecd9a..cd584c6f672 100644 --- a/ACE/ace/Thread_Adapter.inl +++ b/ACE/ace/Thread_Adapter.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Adapter::thr_mgr (void) +ACE_Thread_Adapter::thr_mgr () { return this->thr_mgr_; } diff --git a/ACE/ace/Thread_Control.h b/ACE/ace/Thread_Control.h index a392d83a5a5..d22a21166ff 100644 --- a/ACE/ace/Thread_Control.h +++ b/ACE/ace/Thread_Control.h @@ -47,7 +47,7 @@ public: /// Remove the thread from its associated Thread_Manager and exit /// the thread if <do_thr_exit> is enabled. - ~ACE_Thread_Control (void); + ~ACE_Thread_Control (); /// Remove this thread from its associated ACE_Thread_Manager and exit /// the thread if @a do_thr_exit is enabled. @@ -59,7 +59,7 @@ public: int insert (ACE_Thread_Manager *tm, bool insert = false); /// Returns the current Thread_Manager. - ACE_Thread_Manager *thr_mgr (void); + ACE_Thread_Manager *thr_mgr (); /// Atomically set a new Thread_Manager and return the old /// Thread_Manager. @@ -69,10 +69,10 @@ public: ACE_THR_FUNC_RETURN status (ACE_THR_FUNC_RETURN status); /// Get the current exit status. - ACE_THR_FUNC_RETURN status (void); + ACE_THR_FUNC_RETURN status (); /// 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/Thread_Control.inl b/ACE/ace/Thread_Control.inl index 20d03fe78e6..1122f7e35a3 100644 --- a/ACE/ace/Thread_Control.inl +++ b/ACE/ace/Thread_Control.inl @@ -15,7 +15,7 @@ ACE_Thread_Control::status (ACE_THR_FUNC_RETURN s) // Get the exit status. ACE_INLINE ACE_THR_FUNC_RETURN -ACE_Thread_Control::status (void) +ACE_Thread_Control::status () { ACE_OS_TRACE ("ACE_Thread_Control::status"); return this->status_; @@ -24,7 +24,7 @@ ACE_Thread_Control::status (void) // Returns the current <Thread_Manager>. ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Control::thr_mgr (void) +ACE_Thread_Control::thr_mgr () { ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr"); return this->tm_; diff --git a/ACE/ace/Thread_Exit.h b/ACE/ace/Thread_Exit.h index a6ac6516ccd..4f3882b9357 100644 --- a/ACE/ace/Thread_Exit.h +++ b/ACE/ace/Thread_Exit.h @@ -41,17 +41,17 @@ class ACE_Export ACE_Thread_Exit { public: /// Capture the Thread that will be cleaned up automatically. - ACE_Thread_Exit (void); + ACE_Thread_Exit (); /// Set the ACE_Thread_Manager. void thr_mgr (ACE_Thread_Manager *tm); /// Destructor calls the thread-specific exit hooks when a thread /// exits. - ~ACE_Thread_Exit (void); + ~ACE_Thread_Exit (); /// Singleton access point. - static ACE_Thread_Exit *instance (void); + static ACE_Thread_Exit *instance (); /// Cleanup method, used by the ACE_Object_Manager to destroy the /// singleton. @@ -90,13 +90,13 @@ public: ACE_Thread_Exit_Maybe (int flag = 0); /// Destroys the underlying ACE_Thread_Exit instance if it exists. - ~ACE_Thread_Exit_Maybe (void); + ~ACE_Thread_Exit_Maybe (); /// Delegates to underlying instance. - ACE_Thread_Exit * operator -> (void) const; + ACE_Thread_Exit * operator -> () const; /// Returns the underlying instance. - ACE_Thread_Exit * instance (void) const; + ACE_Thread_Exit * instance () const; private: diff --git a/ACE/ace/Thread_Manager.h b/ACE/ace/Thread_Manager.h index c169d0e152f..228b27711eb 100644 --- a/ACE/ace/Thread_Manager.h +++ b/ACE/ace/Thread_Manager.h @@ -90,19 +90,19 @@ class ACE_Export ACE_At_Thread_Exit friend class ACE_Thread_Manager; public: /// Default constructor - ACE_At_Thread_Exit (void); + ACE_At_Thread_Exit (); /// The destructor - virtual ~ACE_At_Thread_Exit (void); + virtual ~ACE_At_Thread_Exit (); /// At_Thread_Exit has the ownership? - bool is_owner (void) const; + bool is_owner () const; /// Set the ownership of the At_Thread_Exit. bool is_owner (bool owner); /// This At_Thread_Exit was applied? - bool was_applied (void) const; + bool was_applied () const; /// Set applied state of At_Thread_Exit. bool was_applied (bool applied); @@ -112,10 +112,10 @@ protected: ACE_At_Thread_Exit *next_; /// Do the apply if necessary - void do_apply (void); + void do_apply (); /// The apply method. - virtual void apply (void) = 0; + virtual void apply () = 0; /// The Thread_Descriptor where this at is registered. ACE_Thread_Descriptor* td_; @@ -135,7 +135,7 @@ public: ACE_CLEANUP_FUNC func, void *param = 0); - virtual ~ACE_At_Thread_Exit_Func (void); + virtual ~ACE_At_Thread_Exit_Func (); ACE_ALLOC_HOOK_DECLARE; @@ -150,7 +150,7 @@ protected: void *param_; /// The apply method - void apply (void); + void apply (); }; /** @@ -173,8 +173,8 @@ class ACE_Export ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor friend class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>; friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>; public: - ACE_Thread_Descriptor_Base (void); - virtual ~ACE_Thread_Descriptor_Base (void); + ACE_Thread_Descriptor_Base (); + virtual ~ACE_Thread_Descriptor_Base (); // = We need the following operators to make Borland happy. @@ -185,20 +185,20 @@ public: bool operator!= (const ACE_Thread_Descriptor_Base &rhs) const; /// Group ID. - int grp_id (void) const; + int grp_id () const; /// Current state of the thread. - ACE_UINT32 state (void) const; + ACE_UINT32 state () const; /// Return the pointer to an ACE_Task_Base or NULL if there's no /// ACE_Task_Base associated with this thread.; - ACE_Task_Base *task (void) const; + ACE_Task_Base *task () const; ACE_ALLOC_HOOK_DECLARE; protected: /// Reset this base thread descriptor. - void reset (void); + void reset (); /// Unique thread ID. ACE_thread_t thr_id_; @@ -235,17 +235,17 @@ class ACE_Export ACE_Thread_Descriptor : public ACE_Thread_Descriptor_Base friend class ACE_Double_Linked_List<ACE_Thread_Descriptor>; friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>; public: - ACE_Thread_Descriptor (void); + ACE_Thread_Descriptor (); // = Accessor methods. /// Unique thread id. - ACE_thread_t self (void) const; + ACE_thread_t self () const; /// Unique handle to thread (used by Win32 and AIX). void self (ACE_hthread_t &); /// Dump the state of an object. - void dump (void) const; + void dump () const; /** * This cleanup function must be called only for ACE_TSS_cleanup. @@ -281,7 +281,7 @@ public: void *param); /// Do nothing destructor to keep some compilers happy - ~ACE_Thread_Descriptor (void); + ~ACE_Thread_Descriptor (); /** * Do nothing but to acquire the thread descriptor's lock and @@ -292,23 +292,23 @@ public: * thread descriptor before it gets fully built. This function is * only called from ACE_Log_Msg::thr_desc. */ - void acquire_release (void); - void acquire (void); - void release (void); + void acquire_release (); + void acquire (); + void release (); /** * Set/get the @c next_ pointer. These are required by the * ACE_Free_List. */ void set_next (ACE_Thread_Descriptor *td); - ACE_Thread_Descriptor *get_next (void) const; + ACE_Thread_Descriptor *get_next () const; protected: /// Run the AT_Thread_Exit hooks. - void do_at_exit (void); + void do_at_exit (); /// Terminate realize the cleanup process to thread termination - void terminate (void); + void terminate (); private: /// Reset this thread descriptor. @@ -445,18 +445,18 @@ public: size_t lwm = ACE_DEFAULT_THREAD_MANAGER_LWM, size_t inc = ACE_DEFAULT_THREAD_MANAGER_INC, size_t hwm = ACE_DEFAULT_THREAD_MANAGER_HWM); - ~ACE_Thread_Manager (void); + ~ACE_Thread_Manager (); #if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) /// Get pointer to a process-wide ACE_Thread_Manager. - static ACE_Thread_Manager *instance (void); + static ACE_Thread_Manager *instance (); /// Set pointer to a process-wide ACE_Thread_Manager and return /// existing pointer. static ACE_Thread_Manager *instance (ACE_Thread_Manager *); /// Delete the dynamically allocated Singleton - static void close_singleton (void); + static void close_singleton (); #endif /* ! defined (ACE_THREAD_MANAGER_LACKS_STATICS) */ /// No-op. Currently unused. @@ -469,7 +469,7 @@ public: * are destroyed and thus, close() does not try to wait; it simply cleans * up internal thread records (the thread descriptor list). */ - int close (void); + int close (); /** * Create a new thread, which executes @a func with argument @a arg. @@ -766,14 +766,14 @@ public: * Return the unique ID of the calling thread. * Same as calling ACE_Thread::self(). */ - ACE_thread_t thr_self (void); + ACE_thread_t thr_self (); /** * Returns a pointer to the current ACE_Task_Base we're executing * in if this thread is indeed running in an ACE_Task_Base, else * return 0. */ - ACE_Task_Base *task (void); + ACE_Task_Base *task (); /** * @name Suspend and resume methods @@ -784,7 +784,7 @@ public: //@{ /// Suspend all threads - int suspend_all (void); + int suspend_all (); /// Suspend a single thread. int suspend (ACE_thread_t); @@ -799,7 +799,7 @@ public: int testsuspend (ACE_thread_t t_id); /// Resume all stopped threads - int resume_all (void); + int resume_all (); /// Resume a single thread. int resume (ACE_thread_t); @@ -1037,7 +1037,7 @@ public: /// Return a count of the current number of threads active in the /// Thread_Manager. - size_t count_threads (void) const; + size_t count_threads () const; /// Get the state of the thread. Returns false if the thread is not /// managed by this thread manager. @@ -1081,10 +1081,10 @@ public: /// Access function to determine whether the Thread_Manager will /// wait for its thread to exit or not when being closing down. void wait_on_exit (int dowait); - int wait_on_exit (void); + int wait_on_exit (); /// Dump the state of an object. - void dump (void); + void dump (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; @@ -1096,7 +1096,7 @@ protected: * This must be called from a spawn thread. This function will * fetch the info from TSS. */ - ACE_Thread_Descriptor *thread_desc_self (void); + ACE_Thread_Descriptor *thread_desc_self (); /// Return a pointer to the thread's Thread_Descriptor, /// 0 if fail. @@ -1158,7 +1158,7 @@ protected: int close_handler); /// Remove all threads from the table. - void remove_thr_all (void); + void remove_thr_all (); // = The following four methods implement a simple scheme for // operating on a collection of threads atomically. diff --git a/ACE/ace/Thread_Manager.inl b/ACE/ace/Thread_Manager.inl index e3ddda3a897..c6c93f270ee 100644 --- a/ACE/ace/Thread_Manager.inl +++ b/ACE/ace/Thread_Manager.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_At_Thread_Exit::ACE_At_Thread_Exit (void) +ACE_At_Thread_Exit::ACE_At_Thread_Exit () : next_ (0), td_ (0), was_applied_ (false), @@ -39,7 +39,7 @@ ACE_At_Thread_Exit::is_owner (bool owner) } ACE_INLINE void -ACE_At_Thread_Exit::do_apply (void) +ACE_At_Thread_Exit::do_apply () { if (!this->was_applied_ && this->is_owner_) td_->at_pop(); @@ -56,7 +56,7 @@ ACE_At_Thread_Exit_Func::ACE_At_Thread_Exit_Func (void *object, } ACE_INLINE -ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void) +ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base () : ACE_OS_Thread_Descriptor (), thr_id_ (ACE_OS::NULL_thread), thr_handle_ (ACE_OS::NULL_hthread), @@ -69,7 +69,7 @@ ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void) } ACE_INLINE -ACE_Thread_Descriptor_Base::~ACE_Thread_Descriptor_Base (void) +ACE_Thread_Descriptor_Base::~ACE_Thread_Descriptor_Base () { } @@ -89,7 +89,7 @@ ACE_Thread_Descriptor_Base::operator!=(const ACE_Thread_Descriptor_Base &rhs) co } ACE_INLINE ACE_Task_Base * -ACE_Thread_Descriptor_Base::task (void) const +ACE_Thread_Descriptor_Base::task () const { ACE_TRACE ("ACE_Thread_Descriptor_Base::task"); return this->task_; @@ -98,7 +98,7 @@ ACE_Thread_Descriptor_Base::task (void) const // Group ID. ACE_INLINE int -ACE_Thread_Descriptor_Base::grp_id (void) const +ACE_Thread_Descriptor_Base::grp_id () const { ACE_TRACE ("ACE_Thread_Descriptor_Base::grp_id"); return grp_id_; @@ -106,7 +106,7 @@ ACE_Thread_Descriptor_Base::grp_id (void) const // Current state of the thread. ACE_INLINE ACE_UINT32 -ACE_Thread_Descriptor_Base::state (void) const +ACE_Thread_Descriptor_Base::state () const { ACE_TRACE ("ACE_Thread_Descriptor_Base::state"); return thr_state_; @@ -114,7 +114,7 @@ ACE_Thread_Descriptor_Base::state (void) const // Reset this base descriptor. ACE_INLINE void -ACE_Thread_Descriptor_Base::reset (void) +ACE_Thread_Descriptor_Base::reset () { ACE_TRACE ("ACE_Thread_Descriptor_Base::reset"); this->thr_id_ = ACE_OS::NULL_thread; @@ -127,7 +127,7 @@ ACE_Thread_Descriptor_Base::reset (void) // Unique thread id. ACE_INLINE ACE_thread_t -ACE_Thread_Descriptor::self (void) const +ACE_Thread_Descriptor::self () const { ACE_TRACE ("ACE_Thread_Descriptor::self"); return this->thr_id_; @@ -159,7 +159,7 @@ ACE_Thread_Descriptor::set_next (ACE_Thread_Descriptor *td) // Get the <next_> pointer ACE_INLINE ACE_Thread_Descriptor * -ACE_Thread_Descriptor::get_next (void) const +ACE_Thread_Descriptor::get_next () const { ACE_TRACE ("ACE_Thread_Descriptor::get_next"); return static_cast<ACE_Thread_Descriptor * ACE_CAST_CONST> (this->next_); @@ -180,7 +180,7 @@ ACE_Thread_Descriptor::reset (ACE_Thread_Manager *tm) } ACE_INLINE ACE_Thread_Descriptor * -ACE_Thread_Manager::thread_desc_self (void) +ACE_Thread_Manager::thread_desc_self () { // This method must be called with lock held. @@ -210,14 +210,14 @@ ACE_Thread_Manager::thread_desc_self (void) // Return the unique ID of the thread. ACE_INLINE ACE_thread_t -ACE_Thread_Manager::thr_self (void) +ACE_Thread_Manager::thr_self () { ACE_TRACE ("ACE_Thread_Manager::thr_self"); return ACE_Thread::self (); } ACE_INLINE ACE_Task_Base * -ACE_Thread_Manager::task (void) +ACE_Thread_Manager::task () { ACE_TRACE ("ACE_Thread_Manager::task"); @@ -275,7 +275,7 @@ ACE_Thread_Manager::wait_on_exit (int do_wait) } ACE_INLINE int -ACE_Thread_Manager::wait_on_exit (void) +ACE_Thread_Manager::wait_on_exit () { return this->automatic_wait_; } @@ -294,7 +294,7 @@ ACE_Thread_Manager::register_as_terminated (ACE_Thread_Descriptor *td) } ACE_INLINE size_t -ACE_Thread_Manager::count_threads (void) const +ACE_Thread_Manager::count_threads () const { return this->thr_list_.size (); } diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h index 9270aa68aeb..72e1e5e6e37 100644 --- a/ACE/ace/Thread_Mutex.h +++ b/ACE/ace/Thread_Mutex.h @@ -53,17 +53,17 @@ public: ACE_mutexattr_t *attributes = 0); /// Implicitly destroy the mutex. - ~ACE_Thread_Mutex (void); + ~ACE_Thread_Mutex (); /** * Explicitly destroy the mutex. Note that only one thread should * call this method since it doesn't protect against race * conditions. */ - int remove (void); + int remove (); /// Acquire lock ownership (wait on queue if necessary). - int acquire (void); + int acquire (); /** * Block the thread until we acquire the mutex or until @a tv times @@ -89,24 +89,24 @@ public: * -1 on failure. If we "failed" because someone else already had * the lock, @c errno is set to @c EBUSY. */ - int tryacquire (void); + int tryacquire (); /// Release lock and unblock a thread at head of queue. - int release (void); + int release (); /** * Acquire mutex ownership. This calls acquire() and is only here * to make the ACE_Thread_Mutex interface consistent with the * other synchronization APIs. */ - int acquire_read (void); + int acquire_read (); /** * Acquire mutex ownership. This calls acquire() and is only here * to make the ACE_Thread_Mutex interface consistent with the * other synchronization APIs. */ - int acquire_write (void); + int acquire_write (); /** * Conditionally acquire mutex (i.e., won't block). This calls @@ -115,7 +115,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_read (void); + int tryacquire_read (); /** * Conditionally acquire mutex (i.e., won't block). This calls @@ -124,7 +124,7 @@ public: * Returns -1 on failure. If we "failed" because someone else * already had the lock, @c errno is set to @c EBUSY. */ - int tryacquire_write (void); + int tryacquire_write (); /** * This is only here to make the ACE_Thread_Mutex interface @@ -132,14 +132,14 @@ public: * caller has already acquired the mutex using one of the above * calls, and returns 0 (success) always. */ - int tryacquire_write_upgrade (void); + int tryacquire_write_upgrade (); /// Return the underlying mutex. - const ACE_thread_mutex_t &lock (void) const; - ACE_thread_mutex_t &lock (void); + const ACE_thread_mutex_t &lock () const; + ACE_thread_mutex_t &lock (); /// 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/Thread_Mutex.inl b/ACE/ace/Thread_Mutex.inl index e3d2719327e..e12b6829f49 100644 --- a/ACE/ace/Thread_Mutex.inl +++ b/ACE/ace/Thread_Mutex.inl @@ -2,56 +2,56 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_thread_mutex_t & -ACE_Thread_Mutex::lock (void) const +ACE_Thread_Mutex::lock () const { // ACE_TRACE ("ACE_Thread_Mutex::lock"); return this->lock_; } ACE_INLINE ACE_thread_mutex_t & -ACE_Thread_Mutex::lock (void) +ACE_Thread_Mutex::lock () { // ACE_TRACE ("ACE_Thread_Mutex::lock"); return this->lock_; } ACE_INLINE int -ACE_Thread_Mutex::acquire_read (void) +ACE_Thread_Mutex::acquire_read () { // ACE_TRACE ("ACE_Thread_Mutex::acquire_read"); return ACE_OS::thread_mutex_lock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::acquire_write (void) +ACE_Thread_Mutex::acquire_write () { // ACE_TRACE ("ACE_Thread_Mutex::acquire_write"); return ACE_OS::thread_mutex_lock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::tryacquire_read (void) +ACE_Thread_Mutex::tryacquire_read () { // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_read"); return ACE_OS::thread_mutex_trylock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::tryacquire_write (void) +ACE_Thread_Mutex::tryacquire_write () { // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write"); return ACE_OS::thread_mutex_trylock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::tryacquire_write_upgrade (void) +ACE_Thread_Mutex::tryacquire_write_upgrade () { // ACE_TRACE ("ACE_Thread_Mutex::tryacquire_write_upgrade"); return 0; } ACE_INLINE int -ACE_Thread_Mutex::acquire (void) +ACE_Thread_Mutex::acquire () { // ACE_TRACE ("ACE_Thread_Mutex::acquire"); return ACE_OS::thread_mutex_lock (&this->lock_); @@ -72,21 +72,21 @@ ACE_Thread_Mutex::acquire (ACE_Time_Value *tv) } ACE_INLINE int -ACE_Thread_Mutex::tryacquire (void) +ACE_Thread_Mutex::tryacquire () { // ACE_TRACE ("ACE_Thread_Mutex::tryacquire"); return ACE_OS::thread_mutex_trylock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::release (void) +ACE_Thread_Mutex::release () { // ACE_TRACE ("ACE_Thread_Mutex::release"); return ACE_OS::thread_mutex_unlock (&this->lock_); } ACE_INLINE int -ACE_Thread_Mutex::remove (void) +ACE_Thread_Mutex::remove () { // ACE_TRACE ("ACE_Thread_Mutex::remove"); int result = 0; diff --git a/ACE/ace/Thread_Semaphore.h b/ACE/ace/Thread_Semaphore.h index c59e25ba97c..f1d80beb55c 100644 --- a/ACE/ace/Thread_Semaphore.h +++ b/ACE/ace/Thread_Semaphore.h @@ -46,10 +46,10 @@ public: int max = 0x7FFFFFFF); /// Default destructor. - ~ACE_Thread_Semaphore (void); + ~ACE_Thread_Semaphore (); /// 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/Thread_Semaphore.inl b/ACE/ace/Thread_Semaphore.inl index 9a2a0affed3..d81a013d68d 100644 --- a/ACE/ace/Thread_Semaphore.inl +++ b/ACE/ace/Thread_Semaphore.inl @@ -2,7 +2,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -ACE_Thread_Semaphore::~ACE_Thread_Semaphore (void) +ACE_Thread_Semaphore::~ACE_Thread_Semaphore () { } diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index 8302975be93..b50d0594a4d 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -35,7 +35,7 @@ public: ACE_Time_Value_T<ACE_System_Time_Policy> operator() () const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); }; /** @@ -50,7 +50,7 @@ public: ACE_Time_Value_T<ACE_HR_Time_Policy> operator() () const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); }; /** @@ -92,7 +92,7 @@ public: ACE_Time_Value_T<ACE_FPointer_Time_Policy> operator()() const; /// Satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); private: FPtr function_; }; @@ -122,7 +122,7 @@ public: ACE_Delegating_Time_Policy &operator = (ACE_Delegating_Time_Policy&&) = default; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); private: ACE_Dynamic_Time_Policy_Base const * delegate_; }; @@ -142,7 +142,7 @@ public: ACE_Time_Value_T<ACE_Delegating_Time_Policy> operator()() const; /// Noop. Just here to satisfy backwards compatibility demands. - void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); + void set_gettimeofday (ACE_Time_Value (*gettimeofday)()); protected: /// Return the current time according to policy implementation. virtual ACE_Time_Value_T<ACE_Delegating_Time_Policy> gettimeofday () const = 0; diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl index 8ecea822490..f057ed3a0f7 100644 --- a/ACE/ace/Time_Policy.inl +++ b/ACE/ace/Time_Policy.inl @@ -11,7 +11,7 @@ ACE_System_Time_Policy::operator()() const } ACE_INLINE void -ACE_System_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void)) +ACE_System_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) { } @@ -22,7 +22,7 @@ ACE_HR_Time_Policy::operator()() const } ACE_INLINE void -ACE_HR_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void)) +ACE_HR_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) { } @@ -46,7 +46,7 @@ ACE_FPointer_Time_Policy::operator()() const } ACE_INLINE void -ACE_FPointer_Time_Policy::set_gettimeofday (ACE_Time_Value (*f)(void)) +ACE_FPointer_Time_Policy::set_gettimeofday (ACE_Time_Value (*f)()) { this->function_ = f; } @@ -58,7 +58,7 @@ ACE_Dynamic_Time_Policy_Base::operator()() const } ACE_INLINE void -ACE_Dynamic_Time_Policy_Base::set_gettimeofday (ACE_Time_Value (*)(void)) +ACE_Dynamic_Time_Policy_Base::set_gettimeofday (ACE_Time_Value (*)()) { } @@ -69,7 +69,7 @@ ACE_Delegating_Time_Policy::operator()() const } ACE_INLINE void -ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)(void)) +ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)()) { } diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index af6a6225387..c543896ca90 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -64,7 +64,7 @@ public: static const ACE_Time_Value max_time; /// Default Constructor. - ACE_Time_Value (void); + ACE_Time_Value (); /// Constructor. explicit ACE_Time_Value (time_t sec, suseconds_t usec = 0); @@ -140,7 +140,7 @@ public: * usec() methods. There is no analogous "millisecond" * component in an ACE_Time_Value. */ - unsigned long msec (void) const; + unsigned long msec () const; /// Converts from ACE_Time_Value format into milliseconds format. /** @@ -226,7 +226,7 @@ public: * @note The semantics of this method differs from the msec() * method. */ - time_t sec (void) const; + time_t sec () const; /// Set seconds. void sec (time_t sec); @@ -238,7 +238,7 @@ public: * @note The semantics of this method differs from the msec() * method. */ - suseconds_t usec (void) const; + suseconds_t usec () const; /// Set microseconds. void usec (suseconds_t usec); @@ -320,7 +320,7 @@ public: * @note The only reason this is here is to allow the use of ACE_Atomic_Op * with ACE_Time_Value. */ - ACE_Time_Value &operator++ (void); + ACE_Time_Value &operator++ (); /// Decrement microseconds as postfix. /** @@ -334,7 +334,7 @@ public: * @note The only reason this is here is to allow the use of ACE_Atomic_Op * with ACE_Time_Value. */ - ACE_Time_Value &operator-- (void); + ACE_Time_Value &operator-- (); /// Adds two ACE_Time_Value objects together, returns the sum. friend ACE_Export ACE_Time_Value operator + (const ACE_Time_Value &tv1, @@ -429,7 +429,7 @@ public: * violates layering restrictions in ACE because this class is part * of the OS layer and @c ACE_Log_Msg is at a higher level. */ - void dump (void) const; + void dump () const; # if defined (ACE_WIN32) /// Const time difference between FILETIME and POSIX time. diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index a06bd1be18d..ad683ae365d 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -101,7 +101,7 @@ ACE_Time_Value::set (const timespec_t &tv) } ACE_INLINE -ACE_Time_Value::ACE_Time_Value (void) +ACE_Time_Value::ACE_Time_Value () // : tv_ () { // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); @@ -117,7 +117,7 @@ ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec) /// Returns number of seconds. ACE_INLINE time_t -ACE_Time_Value::sec (void) const +ACE_Time_Value::sec () const { // ACE_OS_TRACE ("ACE_Time_Value::sec"); return this->tv_.tv_sec; @@ -133,7 +133,7 @@ ACE_Time_Value::sec (time_t sec) /// Converts from Time_Value format into milli-seconds format. ACE_INLINE unsigned long -ACE_Time_Value::msec (void) const +ACE_Time_Value::msec () const { // ACE_OS_TRACE ("ACE_Time_Value::msec"); @@ -201,7 +201,7 @@ ACE_Time_Value::msec (int milliseconds) /// Returns number of micro-seconds. ACE_INLINE suseconds_t -ACE_Time_Value::usec (void) const +ACE_Time_Value::usec () const { // ACE_OS_TRACE ("ACE_Time_Value::usec"); return this->tv_.tv_usec; diff --git a/ACE/ace/Time_Value_T.h b/ACE/ace/Time_Value_T.h index 3cbdf84e480..c6f9a55b87a 100644 --- a/ACE/ace/Time_Value_T.h +++ b/ACE/ace/Time_Value_T.h @@ -38,7 +38,7 @@ public: typedef TIME_POLICY time_policy_t; /// Default Constructor. - ACE_Time_Value_T (void) {} + ACE_Time_Value_T () {} /// Constructor. explicit ACE_Time_Value_T (time_t sec, suseconds_t usec = 0) @@ -111,7 +111,7 @@ public: * @note The only reason this is here is to allow the use of ACE_Atomic_Op * with ACE_Time_Value. */ - ACE_Time_Value_T<TIME_POLICY> &operator++ (void); + ACE_Time_Value_T<TIME_POLICY> &operator++ (); /// Decrement microseconds as postfix. /** @@ -125,7 +125,7 @@ public: * @note The only reason this is here is to allow the use of ACE_Atomic_Op * with ACE_Time_Value. */ - ACE_Time_Value_T<TIME_POLICY> &operator-- (void); + ACE_Time_Value_T<TIME_POLICY> &operator-- (); /// Get current time of day according to time policy. /** diff --git a/ACE/ace/Time_Value_T.inl b/ACE/ace/Time_Value_T.inl index 934bebf228c..707ad994872 100644 --- a/ACE/ace/Time_Value_T.inl +++ b/ACE/ace/Time_Value_T.inl @@ -67,7 +67,7 @@ ACE_Time_Value_T<TIME_POLICY> ACE_Time_Value_T<TIME_POLICY>::operator++ (int) } template <class TIME_POLICY> -ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator++ (void) +ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator++ () { this->ACE_Time_Value::operator ++(); return *this; @@ -82,7 +82,7 @@ ACE_Time_Value_T<TIME_POLICY> ACE_Time_Value_T<TIME_POLICY>::operator-- (int) } template <class TIME_POLICY> -ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator-- (void) +ACE_Time_Value_T<TIME_POLICY> &ACE_Time_Value_T<TIME_POLICY>::operator-- () { this->ACE_Time_Value::operator --(); return *this; diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h index 5ed3877da89..3745fc25fdf 100644 --- a/ACE/ace/UUID.h +++ b/ACE/ace/UUID.h @@ -43,12 +43,12 @@ namespace ACE_Utils typedef u_char Node_ID[NODE_ID_SIZE]; /// Get the node id - Node_ID & node_ID (void); + Node_ID & node_ID (); /** * @overload */ - const Node_ID & node_ID (void) const; + const Node_ID & node_ID () const; /// Test for equality. bool operator == (const UUID_Node & right) const; @@ -86,7 +86,7 @@ namespace ACE_Utils enum { BINARY_SIZE = 16 }; /// Constructor - UUID (void); + UUID (); #ifndef ACE_LACKS_SSCANF /// Constructs a UUID from a string representation. @@ -96,36 +96,36 @@ namespace ACE_Utils UUID (const UUID &right); // Destructor - ~UUID (void); + ~UUID (); - ACE_UINT32 time_low (void) const; + ACE_UINT32 time_low () const; void time_low (ACE_UINT32); - ACE_UINT16 time_mid (void) const; + ACE_UINT16 time_mid () const; void time_mid (ACE_UINT16); - ACE_UINT16 time_hi_and_version (void) const; + ACE_UINT16 time_hi_and_version () const; void time_hi_and_version (ACE_UINT16); - u_char clock_seq_hi_and_reserved (void) const; + u_char clock_seq_hi_and_reserved () const; void clock_seq_hi_and_reserved (u_char); - u_char clock_seq_low (void) const; + u_char clock_seq_low () const; void clock_seq_low (u_char); - UUID_Node & node (void); - const UUID_Node & node (void) const; + UUID_Node & node (); + const UUID_Node & node () const; void node (const UUID_Node & node); - ACE_CString* thr_id (void); + ACE_CString* thr_id (); void thr_id (char*); - ACE_CString* pid (void); + ACE_CString* pid (); void pid (char*); /// Returns a string representation of the UUID - const ACE_CString* to_string (void) const; + const ACE_CString* to_string () const; #ifndef ACE_LACKS_SSCANF /// Set the value using a string @@ -140,7 +140,7 @@ namespace ACE_Utils bool operator != (const UUID &right) const; /// Compute a hash value for the UUID. - unsigned long hash (void) const; + unsigned long hash () const; /// Assign an existing UUID to this UUID. const UUID & operator = (const UUID & rhs); @@ -149,7 +149,7 @@ namespace ACE_Utils private: /// Initialize the UUID - void init (void); + void init (); /** * Helper method to convert from a string UUID. @@ -203,14 +203,14 @@ namespace ACE_Utils enum {ACE_UUID_CLOCK_SEQ_MASK = 0x3FFF}; /// Default constructor. - UUID_Generator(void); + UUID_Generator(); /// Destructor. ~UUID_Generator(); /// Initialize the UUID generator /// @deprecated This method may go away in some future release. - void init (void); + void init (); /// Format timestamp, clockseq, and nodeID into an UUID of the /// specified version and variant. For generating UUID's with @@ -227,7 +227,7 @@ namespace ACE_Utils /// The locking strategy prevents multiple generators from accessing /// the UUID_state at the same time. Get the locking strategy. - ACE_SYNCH_MUTEX* lock (void); + ACE_SYNCH_MUTEX* lock (); /// Set a new locking strategy and return the old one. void lock (ACE_SYNCH_MUTEX* lock, bool release_lock); diff --git a/ACE/ace/UUID.inl b/ACE/ace/UUID.inl index cf3a3c150e9..12541cb543a 100644 --- a/ACE/ace/UUID.inl +++ b/ACE/ace/UUID.inl @@ -5,19 +5,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_Utils { ACE_INLINE - const UUID_Node::Node_ID & UUID_Node::node_ID (void) const + const UUID_Node::Node_ID & UUID_Node::node_ID () const { return this->node_ID_; } ACE_INLINE - UUID_Node::Node_ID & UUID_Node::node_ID (void) + UUID_Node::Node_ID & UUID_Node::node_ID () { return this->node_ID_; } ACE_INLINE - UUID::UUID (void) + UUID::UUID () { this->init (); } @@ -31,26 +31,26 @@ namespace ACE_Utils } ACE_INLINE - UUID::~UUID (void) + UUID::~UUID () { } ACE_INLINE void - UUID::init (void) + UUID::init () { ACE_OS::memset (&this->uuid_, 0, BINARY_SIZE); } ACE_INLINE unsigned long - UUID::hash (void) const + UUID::hash () const { return ACE::hash_pjw (reinterpret_cast <const char *> (&this->uuid_), UUID::BINARY_SIZE); } ACE_INLINE ACE_UINT32 - UUID::time_low (void) const + UUID::time_low () const { return this->uuid_.time_low_; } @@ -62,7 +62,7 @@ namespace ACE_Utils } ACE_INLINE ACE_UINT16 - UUID::time_mid (void) const + UUID::time_mid () const { return this->uuid_.time_mid_; } @@ -74,7 +74,7 @@ namespace ACE_Utils } ACE_INLINE ACE_UINT16 - UUID::time_hi_and_version (void) const + UUID::time_hi_and_version () const { return this->uuid_.time_hi_and_version_; } @@ -86,7 +86,7 @@ namespace ACE_Utils } ACE_INLINE u_char - UUID::clock_seq_hi_and_reserved (void) const + UUID::clock_seq_hi_and_reserved () const { return this->uuid_.clock_seq_hi_and_reserved_; } @@ -98,7 +98,7 @@ namespace ACE_Utils } ACE_INLINE u_char - UUID::clock_seq_low (void) const + UUID::clock_seq_low () const { return this->uuid_.clock_seq_low_; } @@ -110,13 +110,13 @@ namespace ACE_Utils } ACE_INLINE const UUID_Node & - UUID::node (void) const + UUID::node () const { return this->uuid_.node_; } ACE_INLINE UUID_Node & - UUID::node (void) + UUID::node () { return this->uuid_.node_; } @@ -130,7 +130,7 @@ namespace ACE_Utils } ACE_INLINE ACE_CString* - UUID::thr_id (void) + UUID::thr_id () { return &this->thr_id_; } @@ -142,7 +142,7 @@ namespace ACE_Utils } ACE_INLINE ACE_CString* - UUID::pid (void) + UUID::pid () { return &this->pid_; } diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp index 02f96eeab5c..e12fd39327f 100644 --- a/ACE/ace/Unbounded_Queue.cpp +++ b/ACE/ace/Unbounded_Queue.cpp @@ -68,21 +68,21 @@ ACE_Unbounded_Queue<T>::operator= (const ACE_Unbounded_Queue<T> &us) } template <class T> ACE_Unbounded_Queue_Iterator<T> -ACE_Unbounded_Queue<T>::begin (void) +ACE_Unbounded_Queue<T>::begin () { // ACE_TRACE ("ACE_Unbounded_Queue<T>::begin"); return ACE_Unbounded_Queue_Iterator<T> (*this); } template <class T> ACE_Unbounded_Queue_Iterator<T> -ACE_Unbounded_Queue<T>::end (void) +ACE_Unbounded_Queue<T>::end () { // ACE_TRACE ("ACE_Unbounded_Queue<T>::end"); return ACE_Unbounded_Queue_Iterator<T> (*this, 1); } template <class T> void -ACE_Unbounded_Queue<T>::dump (void) const +ACE_Unbounded_Queue<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Queue<T>::dump"); @@ -118,7 +118,7 @@ ACE_Unbounded_Queue<T>::copy_nodes (const ACE_Unbounded_Queue<T> &us) } template <class T> void -ACE_Unbounded_Queue<T>::delete_nodes (void) +ACE_Unbounded_Queue<T>::delete_nodes () { for (ACE_Node<T> *curr = this->head_->next_; // Keep looking until we've hit the dummy node. @@ -143,7 +143,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void) } template <class T> -ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void) +ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue () { // ACE_TRACE ("ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)"); @@ -224,7 +224,7 @@ ACE_Unbounded_Queue<T>::dequeue_head (T &item) } template <class T> void -ACE_Unbounded_Queue<T>::reset (void) +ACE_Unbounded_Queue<T>::reset () { ACE_TRACE ("reset"); @@ -319,7 +319,7 @@ ACE_Unbounded_Queue<T>::set (const T &item, // **************************************************************** template <class T> void -ACE_Unbounded_Queue_Const_Iterator<T>::dump (void) const +ACE_Unbounded_Queue_Const_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::dump"); @@ -335,7 +335,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::ACE_Unbounded_Queue_Const_Iterator (const } template <class T> int -ACE_Unbounded_Queue_Const_Iterator<T>::advance (void) +ACE_Unbounded_Queue_Const_Iterator<T>::advance () { // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::advance"); this->current_ = this->current_->next_; @@ -343,7 +343,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::advance (void) } template <class T> int -ACE_Unbounded_Queue_Const_Iterator<T>::first (void) +ACE_Unbounded_Queue_Const_Iterator<T>::first () { // ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::first"); this->current_ = this->queue_.head_->next_; @@ -351,7 +351,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::first (void) } template <class T> int -ACE_Unbounded_Queue_Const_Iterator<T>::done (void) const +ACE_Unbounded_Queue_Const_Iterator<T>::done () const { ACE_TRACE ("ACE_Unbounded_Queue_Const_Iterator<T>::done"); @@ -374,7 +374,7 @@ ACE_Unbounded_Queue_Const_Iterator<T>::next (T *&item) // **************************************************************** template <class T> void -ACE_Unbounded_Queue_Iterator<T>::dump (void) const +ACE_Unbounded_Queue_Iterator<T>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::dump"); @@ -390,7 +390,7 @@ ACE_Unbounded_Queue_Iterator<T>::ACE_Unbounded_Queue_Iterator (ACE_Unbounded_Que } template <class T> int -ACE_Unbounded_Queue_Iterator<T>::advance (void) +ACE_Unbounded_Queue_Iterator<T>::advance () { // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::advance"); this->current_ = this->current_->next_; @@ -398,7 +398,7 @@ ACE_Unbounded_Queue_Iterator<T>::advance (void) } template <class T> int -ACE_Unbounded_Queue_Iterator<T>::first (void) +ACE_Unbounded_Queue_Iterator<T>::first () { // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::first"); this->current_ = this->queue_.head_->next_; @@ -406,7 +406,7 @@ ACE_Unbounded_Queue_Iterator<T>::first (void) } template <class T> int -ACE_Unbounded_Queue_Iterator<T>::done (void) const +ACE_Unbounded_Queue_Iterator<T>::done () const { ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::done"); diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h index cb0c748f9df..172f0b84319 100644 --- a/ACE/ace/Unbounded_Queue.h +++ b/ACE/ace/Unbounded_Queue.h @@ -46,17 +46,17 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the queue have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the queue. Returns 0 if the /// queue is empty, else 1. - int first (void); + int first (); /// 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; @@ -88,17 +88,17 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the queue have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the queue. Returns 0 if the /// queue is empty, else 1. - int first (void); + int first (); /// 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; @@ -175,7 +175,7 @@ public: /** * Clean up the memory for the queue. */ - ~ACE_Unbounded_Queue (void); + ~ACE_Unbounded_Queue (); // = Check boundary conditions. @@ -183,13 +183,13 @@ public: /** * Constant time check to see if the queue is empty. */ - bool is_empty (void) const; + bool is_empty () const; /// Returns 0. /** * The queue cannot be full, so it always returns 0. */ - bool is_full (void) const; + bool is_full () const; // = Classic queue operations. @@ -221,7 +221,7 @@ public: /** * Delete the queue nodes. */ - void reset (void); + void reset (); /// Get the @a slot th element in the set. Returns -1 if the element /// isn't in the range {0..#cur_size_ - 1}, else 0. @@ -244,21 +244,21 @@ public: /** * Return the size of the queue. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; // = STL-styled unidirectional iterator factory. - ACE_Unbounded_Queue_Iterator<T> begin (void); - ACE_Unbounded_Queue_Iterator<T> end (void); + ACE_Unbounded_Queue_Iterator<T> begin (); + ACE_Unbounded_Queue_Iterator<T> end (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; protected: /// Delete all the nodes in the queue. - void delete_nodes (void); + void delete_nodes (); /// Copy nodes into this queue. void copy_nodes (const ACE_Unbounded_Queue<T> &); diff --git a/ACE/ace/Unbounded_Queue.inl b/ACE/ace/Unbounded_Queue.inl index b3e76ad999d..0ff0cecc476 100644 --- a/ACE/ace/Unbounded_Queue.inl +++ b/ACE/ace/Unbounded_Queue.inl @@ -2,20 +2,20 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> ACE_INLINE size_t -ACE_Unbounded_Queue<T>::size (void) const +ACE_Unbounded_Queue<T>::size () const { return this->cur_size_; } template <class T> ACE_INLINE bool -ACE_Unbounded_Queue<T>::is_empty (void) const +ACE_Unbounded_Queue<T>::is_empty () const { // ACE_TRACE ("ACE_Unbounded_Queue<T>::is_empty"); return this->head_ == this->head_->next_; } template <class T> ACE_INLINE bool -ACE_Unbounded_Queue<T>::is_full (void) const +ACE_Unbounded_Queue<T>::is_full () const { // ACE_TRACE ("ACE_Unbounded_Queue<T>::is_full"); return false; // We should implement a "node of last resort for this..." diff --git a/ACE/ace/Unbounded_Set_Ex.cpp b/ACE/ace/Unbounded_Set_Ex.cpp index d6460cef1c5..7e6ddafdc4a 100644 --- a/ACE/ace/Unbounded_Set_Ex.cpp +++ b/ACE/ace/Unbounded_Set_Ex.cpp @@ -18,7 +18,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex) template <class T, class C> size_t -ACE_Unbounded_Set_Ex<T, C>::size (void) const +ACE_Unbounded_Set_Ex<T, C>::size () const { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::size"); return this->cur_size_; @@ -49,7 +49,7 @@ ACE_Unbounded_Set_Ex<T, C>::insert_tail (const T &item) } template <class T, class C> void -ACE_Unbounded_Set_Ex<T, C>::reset (void) +ACE_Unbounded_Set_Ex<T, C>::reset () { ACE_TRACE ("reset"); @@ -57,7 +57,7 @@ ACE_Unbounded_Set_Ex<T, C>::reset (void) } template <class T, class C> void -ACE_Unbounded_Set_Ex<T, C>::dump (void) const +ACE_Unbounded_Set_Ex<T, C>::dump () const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::dump"); @@ -92,7 +92,7 @@ ACE_Unbounded_Set_Ex<T, C>::copy_nodes (const ACE_Unbounded_Set_Ex<T, C> &us) } template <class T, class C> void -ACE_Unbounded_Set_Ex<T, C>::delete_nodes (void) +ACE_Unbounded_Set_Ex<T, C>::delete_nodes () { NODE *curr = this->head_->next_; @@ -114,7 +114,7 @@ ACE_Unbounded_Set_Ex<T, C>::delete_nodes (void) } template <class T, class C> -ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex (void) +ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex () { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::~ACE_Unbounded_Set_Ex"); @@ -256,28 +256,28 @@ ACE_Unbounded_Set_Ex<T, C>::remove (const T &item) } template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::iterator -ACE_Unbounded_Set_Ex<T, C>::begin (void) +ACE_Unbounded_Set_Ex<T, C>::begin () { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::begin"); return iterator (*this); } template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::iterator -ACE_Unbounded_Set_Ex<T, C>::end (void) +ACE_Unbounded_Set_Ex<T, C>::end () { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::end"); return iterator (*this, 1); } template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::const_iterator -ACE_Unbounded_Set_Ex<T, C>::begin (void) const +ACE_Unbounded_Set_Ex<T, C>::begin () const { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::begin"); return const_iterator (*this); } template <class T, class C> typename ACE_Unbounded_Set_Ex<T, C>::const_iterator -ACE_Unbounded_Set_Ex<T, C>::end (void) const +ACE_Unbounded_Set_Ex<T, C>::end () const { // ACE_TRACE ("ACE_Unbounded_Set_Ex<T, C>::end"); return const_iterator (*this, 1); @@ -286,7 +286,7 @@ ACE_Unbounded_Set_Ex<T, C>::end (void) const ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Iterator) template <class T, class C> void -ACE_Unbounded_Set_Ex_Iterator<T, C>::dump (void) const +ACE_Unbounded_Set_Ex_Iterator<T, C>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::dump"); @@ -304,7 +304,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::ACE_Unbounded_Set_Ex_Iterator ( } template <class T, class C> int -ACE_Unbounded_Set_Ex_Iterator<T, C>::advance (void) +ACE_Unbounded_Set_Ex_Iterator<T, C>::advance () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::advance"); this->current_ = this->current_->next_; @@ -312,7 +312,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::advance (void) } template <class T, class C> int -ACE_Unbounded_Set_Ex_Iterator<T, C>::first (void) +ACE_Unbounded_Set_Ex_Iterator<T, C>::first () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::first"); this->current_ = this->set_->head_->next_; @@ -320,7 +320,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::first (void) } template <class T, class C> int -ACE_Unbounded_Set_Ex_Iterator<T, C>::done (void) const +ACE_Unbounded_Set_Ex_Iterator<T, C>::done () const { ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::done"); @@ -353,7 +353,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (int) } template <class T, class C> ACE_Unbounded_Set_Ex_Iterator<T, C>& -ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void) +ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void)"); @@ -364,7 +364,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator++ (void) } template <class T, class C> T& -ACE_Unbounded_Set_Ex_Iterator<T, C>::operator* (void) +ACE_Unbounded_Set_Ex_Iterator<T, C>::operator* () { //ACE_TRACE ("ACE_Unbounded_Set_Ex_Iterator<T, C>::operator*"); T *retv = 0; @@ -393,7 +393,7 @@ ACE_Unbounded_Set_Ex_Iterator<T, C>::operator!= (const ACE_Unbounded_Set_Ex_Iter ACE_ALLOC_HOOK_DEFINE_Tcc(ACE_Unbounded_Set_Ex_Const_Iterator) template <class T, class C> void -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump (void) const +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump () const { #if defined (ACE_HAS_DUMP) // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::dump"); @@ -411,7 +411,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::ACE_Unbounded_Set_Ex_Const_Iterator ( } template <class T, class C> int -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance (void) +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance"); this->current_ = this->current_->next_; @@ -419,7 +419,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::advance (void) } template <class T, class C> int -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first (void) +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first"); this->current_ = this->set_->head_->next_; @@ -427,7 +427,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::first (void) } template <class T, class C> int -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done (void) const +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done () const { ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::done"); @@ -460,7 +460,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (int) } template <class T, class C> ACE_Unbounded_Set_Ex_Const_Iterator<T, C>& -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void) +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ () { // ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void)"); @@ -471,7 +471,7 @@ ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator++ (void) } template <class T, class C> T& -ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator* (void) +ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator* () { //ACE_TRACE ("ACE_Unbounded_Set_Ex_Const_Iterator<T, C>::operator*"); T *retv = 0; diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index 7d5a3a4b6e3..c59c1ec81ae 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -62,17 +62,17 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the set. Returns 0 if the /// set is empty, else 1. - int first (void); + int first (); /// 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; // = STL styled iteration, compare, and reference functions. @@ -80,10 +80,10 @@ public: ACE_Unbounded_Set_Ex_Iterator<T, C> operator++ (int); /// Prefix advance. - ACE_Unbounded_Set_Ex_Iterator<T, C>& operator++ (void); + ACE_Unbounded_Set_Ex_Iterator<T, C>& operator++ (); /// Returns a reference to the internal element @c this is pointing to. - T& operator* (void); + T& operator* (); /// Check if two iterators point to the same position bool operator== (const ACE_Unbounded_Set_Ex_Iterator<T, C> &) const; @@ -129,17 +129,17 @@ public: /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. - int advance (void); + int advance (); /// Move to the first element in the set. Returns 0 if the /// set is empty, else 1. - int first (void); + int first (); /// 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; // = STL styled iteration, compare, and reference functions. @@ -147,10 +147,10 @@ public: ACE_Unbounded_Set_Ex_Const_Iterator<T, C> operator++ (int); /// Prefix advance. - ACE_Unbounded_Set_Ex_Const_Iterator<T, C>& operator++ (void); + ACE_Unbounded_Set_Ex_Const_Iterator<T, C>& operator++ (); /// Returns a reference to the internal element @c this is pointing to. - T& operator* (void); + T& operator* (); /// Check if two iterators point to the same position bool operator== (const ACE_Unbounded_Set_Ex_Const_Iterator<T, C> &) const; @@ -258,7 +258,7 @@ public: /** * Destroy the nodes of the set. */ - ~ACE_Unbounded_Set_Ex (void); + ~ACE_Unbounded_Set_Ex (); // = Check boundary conditions. @@ -266,13 +266,13 @@ public: /** * Constant time is_empty check. */ - bool is_empty (void) const; + bool is_empty () const; /// Returns @c false. /** * Always returns @c false since the set can never fill up. */ - bool is_full (void) const; + bool is_full () const; // = Classic unordered set operations. @@ -310,29 +310,29 @@ public: /** * Access the size of the set. */ - size_t size (void) const; + size_t size () const; /// Dump the state of an object. - void dump (void) const; + void dump () const; /// Reset the ACE_Unbounded_Set_Ex to be empty. /** * Delete the nodes of the set. */ - void reset (void); + void reset (); // = STL-styled unidirectional iterator factory. - iterator begin (void); - iterator end (void); - const_iterator begin (void) const; - const_iterator end (void) const; + iterator begin (); + iterator end (); + const_iterator begin () const; + const_iterator end () const; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; private: /// Delete all the nodes in the Set. - void delete_nodes (void); + void delete_nodes (); /// Copy nodes into this set. void copy_nodes (const ACE_Unbounded_Set_Ex<T, C> &); diff --git a/ACE/ace/Unbounded_Set_Ex.inl b/ACE/ace/Unbounded_Set_Ex.inl index bbb8772d6fc..65e8b67913f 100644 --- a/ACE/ace/Unbounded_Set_Ex.inl +++ b/ACE/ace/Unbounded_Set_Ex.inl @@ -4,14 +4,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T, class C> ACE_INLINE bool -ACE_Unbounded_Set_Ex<T,C>::is_empty (void) const +ACE_Unbounded_Set_Ex<T,C>::is_empty () const { ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_empty"); return this->head_ == this->head_->next_; } template <class T, class C> ACE_INLINE bool -ACE_Unbounded_Set_Ex<T, C>::is_full (void) const +ACE_Unbounded_Set_Ex<T, C>::is_full () const { ACE_TRACE ("ACE_Unbounded_Set_Ex<T>::is_full"); return 0; // We should implement a "node of last resort for this..." diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h index 8d22e5e2bb1..f099bd6ebac 100644 --- a/ACE/ace/Value_Ptr.h +++ b/ACE/ace/Value_Ptr.h @@ -70,13 +70,13 @@ namespace ACE explicit Value_Ptr (T * p = 0) : p_ (p) { } /// Destructor. - ~Value_Ptr (void) { delete this->p_; } + ~Value_Ptr () { delete this->p_; } /// Deference operator. - T & operator* (void) const { return *this->p_; } + T & operator* () const { return *this->p_; } /// Pointer operator. - T * operator-> (void) const { return this->p_; } + T * operator-> () const { return this->p_; } /// Non-throwing swap operation used to make assignment strongly /// exception-safe. 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/ACE/ace/XML_Utils/XML_Error_Handler.h b/ACE/ace/XML_Utils/XML_Error_Handler.h index 6d1b1987742..57d0835f998 100644 --- a/ACE/ace/XML_Utils/XML_Error_Handler.h +++ b/ACE/ace/XML_Utils/XML_Error_Handler.h @@ -43,9 +43,10 @@ namespace XML void resetErrors(); bool getErrors (void) const; private : - // Disallow copying - XML_Error_Handler (const XML_Error_Handler&); - XML_Error_Handler& operator= (const XML_Error_Handler&); + XML_Error_Handler (const XML_Error_Handler&) = delete; + XML_Error_Handler& operator= (const XML_Error_Handler&) = delete; + XML_Error_Handler (XML_Error_Handler&&) = delete; + XML_Error_Handler& operator= (XML_Error_Handler&&) = delete; bool errors_; }; diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index 7afc673328b..f6a73d9704f 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -150,10 +150,10 @@ public: ACE_Wide_To_Ascii (const wchar_t *s); /// Destructor will free up the memory. - ~ACE_Wide_To_Ascii (void); + ~ACE_Wide_To_Ascii (); /// Return the internal char* representation. - char *char_rep (void); + char *char_rep (); /// Converts an wchar_t string to ascii and returns a new string. static char *convert (const wchar_t *wstr); @@ -167,7 +167,7 @@ private: #endif /* ACE_HAS_ICONV */ /// Disallow these operation. - ACE_Wide_To_Ascii (void); + ACE_Wide_To_Ascii (); ACE_Wide_To_Ascii (ACE_Wide_To_Ascii &); ACE_Wide_To_Ascii& operator= (ACE_Wide_To_Ascii &); }; @@ -188,10 +188,10 @@ public: ACE_Ascii_To_Wide (const char *s); /// Destructor will free up the memory. - ~ACE_Ascii_To_Wide (void); + ~ACE_Ascii_To_Wide (); /// Return the internal wchar* representation. - wchar_t *wchar_rep (void); + wchar_t *wchar_rep (); /// Converts an char string to unicode/wide and returns a new string. static wchar_t *convert (const char *str); @@ -205,7 +205,7 @@ private: #endif /* ACE_HAS_ICONV */ /// Disallow these operation. - ACE_Ascii_To_Wide (void); + ACE_Ascii_To_Wide (); ACE_Ascii_To_Wide (ACE_Ascii_To_Wide &); ACE_Ascii_To_Wide operator= (ACE_Ascii_To_Wide &); }; diff --git a/ACE/ace/ace_wchar.inl b/ACE/ace/ace_wchar.inl index 438d6672dc8..752c177f680 100644 --- a/ACE/ace/ace_wchar.inl +++ b/ACE/ace/ace_wchar.inl @@ -11,13 +11,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL inline -ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void) +ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii () { delete [] this->s_; } inline char * -ACE_Wide_To_Ascii::char_rep (void) +ACE_Wide_To_Ascii::char_rep () { return this->s_; } @@ -101,13 +101,13 @@ ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s) } inline -ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void) +ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide () { delete [] this->s_; } inline wchar_t * -ACE_Ascii_To_Wide::wchar_rep (void) +ACE_Ascii_To_Wide::wchar_rep () { return this->s_; } diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 2b57e4697f7..27a63cf6ca9 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -46,7 +46,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // For use by <ACE_OS::exit>. extern "C" { - typedef void (*ACE_EXIT_HOOK) (void); + typedef void (*ACE_EXIT_HOOK) (); } // Signature for registering a cleanup function that is used by the @@ -83,11 +83,11 @@ typedef void (*ACE_INIT_LOG_MSG_HOOK) (ACE_OS_Log_Msg_Attributes &attr typedef void (*ACE_INHERIT_LOG_MSG_HOOK) (ACE_OS_Thread_Descriptor*, ACE_OS_Log_Msg_Attributes &); -typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (void); +typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (); typedef void (*ACE_SYNC_LOG_MSG_HOOK) (const ACE_TCHAR *prog_name); -typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (void); +typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (); ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/tests/ACE_Test.cpp b/ACE/tests/ACE_Test.cpp index ade30523b91..95d55bdd56a 100644 --- a/ACE/tests/ACE_Test.cpp +++ b/ACE/tests/ACE_Test.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_stdlib.h" int -log2_test (void) +log2_test () { u_long values[] = {1, 2, 4, 8, 1048576}; u_long results[] = {0, 1, 2, 3, 20}; @@ -39,7 +39,7 @@ log2_test (void) } int -ace_debug_test (void) +ace_debug_test () { int test_status = 0; @@ -62,7 +62,7 @@ ace_debug_test (void) // Test ACE::execname to be sure it finds .exe without regard to case. int -execname_test (void) +execname_test () { int error_count = 0; diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 59d72dab714..4f6f90e25cf 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -64,7 +64,7 @@ test_simple_argv (ACE_TCHAR *argv[]) } static int -test_argv_type_converter (void) +test_argv_type_converter () { char *argv[20]; argv[0] = ACE_OS::strdup ("one"); @@ -108,7 +108,7 @@ test_argv_type_converter (void) } static int -test_argv_type_converter2 (void) +test_argv_type_converter2 () { ACE_TCHAR *argv[20]; argv[0] = ACE_OS::strdup (ACE_TEXT ("one")); @@ -145,7 +145,7 @@ test_argv_type_converter2 (void) } static int -test_argv_buf (void) +test_argv_buf () { pid_t parent_pid = ACE_OS::getpid (); @@ -178,7 +178,7 @@ test_argv_buf (void) } static int -test_argv_quotes (void) +test_argv_quotes () { const ACE_TCHAR *argv_const[] = { ACE_TEXT ("first without quotes"), ACE_TEXT ("'second in single quotes'"), diff --git a/ACE/tests/Aio_Platform_Test.cpp b/ACE/tests/Aio_Platform_Test.cpp index 077cc6f74fa..96f71dd66d2 100644 --- a/ACE/tests/Aio_Platform_Test.cpp +++ b/ACE/tests/Aio_Platform_Test.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_unistd.h" #if defined (_POSIX_ASYNCHRONOUS_IO) -static int do_sysconf (void) +static int do_sysconf () { ACE_DEBUG ((LM_DEBUG, "Doing <sysconf> calls to know the run-time values of POSIX feature limits\n")); @@ -101,7 +101,7 @@ static int do_sysconf (void) #endif /* _POSIX_ASYNCHRONOUS_IO */ static int -have_asynchio (void) +have_asynchio () { #if defined (_POSIX_ASYNCHRONOUS_IO) #if defined (_POSIX_ASYNC_IO) diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 3a37624ce85..2e48f16b4d4 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -40,10 +40,10 @@ static size_t const words_len = sizeof (words) / sizeof (words[0]); // -------------------------------------------------------------- bool -insertion_removal_test (void) +insertion_removal_test () { // Instantiate the map. - typedef ACE_Array_Map<char, ACE_TString> Map; + using Map = ACE_Array_Map<char, ACE_TString>; Map phonetic[2]; ACE_TEST_ASSERT (phonetic[0] == phonetic[1]); // Sanity check. @@ -220,10 +220,10 @@ insertion_removal_test (void) // -------------------------------------------------------------- bool -index_operator_test (void) +index_operator_test () { // Instantiate the map. - typedef ACE_Array_Map<char, ACE_TString> Map; + using Map = ACE_Array_Map<char, ACE_TString>; Map phonetic; ACE_TEST_ASSERT (phonetic.size () == 0 && phonetic.is_empty ()); @@ -250,7 +250,7 @@ index_operator_test (void) ACE_TEST_ASSERT (phonetic.size () == letters_len); - typedef Map::const_iterator const_iterator; + using const_iterator = Map::const_iterator; // Access the elements that were inserted into the map. char const * letter = letters; @@ -281,7 +281,7 @@ index_operator_test (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("... in reverse ...\n"))); - typedef Map::const_reverse_iterator const_reverse_iterator; + using const_reverse_iterator = Map::const_reverse_iterator; letter = letters + letters_len - 1; word = words + words_len - 1; @@ -337,7 +337,7 @@ class RefCounted { public: - RefCounted (void) + RefCounted () : refcount_ (0) { } @@ -347,7 +347,7 @@ public: { } - ~RefCounted (void) + ~RefCounted () { if (this->refcount_) --(*this->refcount_); @@ -370,13 +370,13 @@ public: } unsigned int * - refcount_ptr (void) const + refcount_ptr () const { return this->refcount_; } unsigned int - refcount (void) const + refcount () const { return *this->refcount_; } @@ -390,9 +390,9 @@ private: // -------- bool -reference_count_test (void) +reference_count_test () { - typedef ACE_Array_Map<ACE_TString, RefCounted> Map; + using Map = ACE_Array_Map<ACE_TString, RefCounted>; static Map::size_type const CAPACITY = 30; diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp index de6fbc3c938..d48ef7aa9ff 100644 --- a/ACE/tests/Atomic_Op_Test.cpp +++ b/ACE/tests/Atomic_Op_Test.cpp @@ -34,11 +34,11 @@ class Exchange_Tester : public ACE_Task<ACE_NULL_SYNCH> { public: Exchange_Tester (unsigned int thr_count); - int result (void) const; + int result () const; private: Exchange_Tester () {} - int svc (void); + int svc () override; ACE_Barrier barrier_; ACE_Atomic_Op<ACE_SYNCH_MUTEX, T> op_; @@ -55,14 +55,14 @@ Exchange_Tester<T>::Exchange_Tester (unsigned int thr_count) template <typename T> int -Exchange_Tester<T>::result (void) const +Exchange_Tester<T>::result () const { return this->claimed_ == 1 ? 0 : 1; } template <typename T> int -Exchange_Tester<T>::svc (void) +Exchange_Tester<T>::svc () { this->barrier_.wait (); // Want all threads to try to claim "at once" bool claimed = this->op_.exchange (1) == 0; diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index 5f3b47f4348..e7449c740c0 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -53,7 +53,7 @@ static size_t test_timeout_count = 3; // Tests the amount of time spent in a timed wait. static int -test_timeout (void) +test_timeout () { int status = 0; @@ -105,7 +105,7 @@ test_timeout (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Auto_IncDec_Test.cpp b/ACE/tests/Auto_IncDec_Test.cpp index db61c42a77c..e075af5f713 100644 --- a/ACE/tests/Auto_IncDec_Test.cpp +++ b/ACE/tests/Auto_IncDec_Test.cpp @@ -24,7 +24,7 @@ // Default number of threads. static size_t n_threads = 15; -typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> INTERLOCKED_INT; +using INTERLOCKED_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>; static INTERLOCKED_INT current_threads_in_first_section; static INTERLOCKED_INT current_threads_in_second_section; diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 7c8655ad8ba..93888ff3741 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -56,17 +56,16 @@ class Void_Pointer : public ACE_Based_Pointer<void> #endif /* ACE_WIN32 */ // Declare the type of the DLL symbol: -typedef void *(*Get_Bp_Repository_Inst)(void); +using Get_Bp_Repository_Inst = void *(*)(); // Declare an allocator based MMAP_Memory_Pool -typedef ACE_Malloc_T< ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block - > MMAP_Allocator; +using MMAP_Allocator = ACE_Malloc_T<ACE_MMAP_Memory_Pool, ACE_Null_Mutex, ACE_PI_Control_Block>; // Check that the ACE_Based_Pointer_Repository can be accessed // from a Windows DLL // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1991) -int singleton_test (void) +int singleton_test () { void* baddr1 = ACE_BASED_POINTER_REPOSITORY::instance(); void* baddr2 = ACE_BASED_POINTER_REPOSITORY::instance(); @@ -148,7 +147,7 @@ int singleton_test (void) // Check that MMAP memory blocks are correctly mapped // into the Based_Pointer_Repository int -mmap_map_test(void) +mmap_map_test() { MMAP_Allocator* alloc = 0; @@ -216,7 +215,7 @@ mmap_map_test(void) // present in the filesystem) // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2216) int -mmap_persistent_map_test(void) +mmap_persistent_map_test() { MMAP_Allocator* alloc = 0; @@ -283,7 +282,7 @@ mmap_persistent_map_test(void) // base address, in this case the Repository must be updated) // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2218) int -mmap_remap_test(void) +mmap_remap_test() { // Use a Position Independent memory segment // because this one is going to move diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp index 1f312944ea0..b02e691577f 100644 --- a/ACE/tests/Basic_Types_Test.cpp +++ b/ACE/tests/Basic_Types_Test.cpp @@ -31,7 +31,7 @@ #include "ace/Basic_Types.h" #include "ace/OS_NS_unistd.h" -typedef void* (*a_function_pointer) (void*); +using a_function_pointer = void *(*)(void *); static u_int diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index d8cc576ddfa..a3eb060ebe5 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -26,10 +26,10 @@ struct Child_Base { - virtual ~Child_Base (void); + virtual ~Child_Base (); // Perform some operation. - virtual void do_something (void) = 0; + virtual void do_something () = 0; }; @@ -37,8 +37,8 @@ struct Child_Base // abstract class, and the implementation would be elsewhere. struct Parent { - Parent (void); - ~Parent (void); + Parent (); + ~Parent (); // Weak pointer to this object used to hand out new references. Must be // weak since it can't own itself! @@ -49,7 +49,7 @@ struct Parent ACE_Strong_Bound_Ptr<Child_Base, ACE_Null_Mutex> child_; // Called by the child to perform some operation. - void do_something (void); + void do_something (); static size_t instance_count_; }; @@ -59,26 +59,26 @@ struct Parent struct Child : public Child_Base { Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent); - virtual ~Child (void); + ~Child () override; // Back pointer to the parent. The child does not own the parent so has no // effect on its lifetime. ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent_; // Perform some operation. Delegates the work to the parent. - virtual void do_something (void); + void do_something () override; static size_t instance_count_; }; -Child_Base::~Child_Base (void) +Child_Base::~Child_Base () { } size_t Parent::instance_count_ = 0; -Parent::Parent (void) +Parent::Parent () : weak_self_(this), child_(new Child(weak_self_)) { @@ -87,14 +87,14 @@ Parent::Parent (void) ++Parent::instance_count_; } -Parent::~Parent (void) +Parent::~Parent () { --Parent::instance_count_; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deleting Parent object\n"))); } -void Parent::do_something (void) +void Parent::do_something () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Parent doing something\n"))); @@ -110,14 +110,14 @@ Child::Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent) ++Child::instance_count_; } -Child::~Child (void) +Child::~Child () { --Child::instance_count_; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deleting Child object\n"))); } -void Child::do_something (void) +void Child::do_something () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Child doing something\n"))); @@ -152,7 +152,7 @@ Printer::Printer (const char *message) ++Printer::instance_count_; } -Printer::~Printer (void) +Printer::~Printer () { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, @@ -160,7 +160,7 @@ Printer::~Printer (void) } void -Printer::print (void) +Printer::print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %C\n"), @@ -178,10 +178,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (void); + ~Method_Request_print () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Printer_var printer_; @@ -194,14 +194,14 @@ Method_Request_print::Method_Request_print (Printer_var &printer) ACE_TEXT ("(%t) Method_Request_print created\n"))); } -Method_Request_print::~Method_Request_print (void) +Method_Request_print::~Method_Request_print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); } int -Method_Request_print::call (void) +Method_Request_print::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -221,8 +221,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + ~Method_Request_end () override; + int call () override; private: Scheduler *scheduler_; @@ -233,12 +233,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their @@ -251,7 +251,7 @@ Method_Request_end::call (void) // Associates the activation queue with this task's message queue, // allowing easy access to the message queue for shutting it down // when it's time to stop this object's service threads. -Scheduler::Scheduler (void) +Scheduler::Scheduler () : activation_queue_ (msg_queue ()) { ACE_DEBUG ((LM_DEBUG, @@ -260,7 +260,7 @@ Scheduler::Scheduler (void) // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); @@ -290,7 +290,7 @@ Scheduler::close (u_long) // Service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -317,7 +317,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp index 5f543167bd6..254a60aa11d 100644 --- a/ACE/tests/Buffer_Stream_Test.cpp +++ b/ACE/tests/Buffer_Stream_Test.cpp @@ -28,9 +28,9 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; -typedef ACE_Stream<ACE_MT_SYNCH> MT_Stream; -typedef ACE_Module<ACE_MT_SYNCH> MT_Module; -typedef ACE_Task<ACE_MT_SYNCH> MT_Task; +using MT_Stream = ACE_Stream<ACE_MT_SYNCH>; +using MT_Module = ACE_Module<ACE_MT_SYNCH>; +using MT_Task = ACE_Task<ACE_MT_SYNCH>; /** * @class Common_Task @@ -40,13 +40,13 @@ typedef ACE_Task<ACE_MT_SYNCH> MT_Task; class Common_Task : public MT_Task { public: - Common_Task (void) {} + Common_Task () {} //FUZZ: disable check_for_lack_ACE_OS // = ACE_Task hooks. ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (void * = 0); - virtual int close (u_long = 0); + int open (void * = 0) override; + int close (u_long = 0) override; }; /** @@ -57,10 +57,10 @@ public: class Supplier : public Common_Task { public: - Supplier (void) {} + Supplier () {} /// Read data from stdin and pass to consumer. - virtual int svc (void); + int svc () override; }; /** @@ -71,14 +71,14 @@ public: class Consumer : public Common_Task { public: - Consumer (void) {} + Consumer () {} /// Enqueue the message on the ACE_Message_Queue for subsequent /// handling in the svc() method. - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override; /// Receive message from Supplier and print to stdout. - virtual int svc (void); + int svc () override; private: /// Amount of time to wait for a timeout. @@ -116,7 +116,7 @@ Common_Task::close (u_long exit_status) // know when to exit. int -Supplier::svc (void) +Supplier::svc () { ACE_Message_Block *mb = 0; @@ -161,7 +161,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // reading and exit. int -Consumer::svc (void) +Consumer::svc () { ACE_Message_Block *mb = 0; int result; diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp index c49399f95d5..7445b5b819c 100644 --- a/ACE/tests/Bug_1890_Regression_Test.cpp +++ b/ACE/tests/Bug_1890_Regression_Test.cpp @@ -44,8 +44,8 @@ public: void send_dummy_data(); /// Reactor callback - virtual ACE_HANDLE get_handle() const; - virtual int handle_input(ACE_HANDLE); + ACE_HANDLE get_handle() const override; + int handle_input(ACE_HANDLE) override; private: size_t handle_input_count_; @@ -74,7 +74,7 @@ public: bool check_expected_results() const; - virtual int handle_timeout(ACE_Time_Value const &, void const*); + int handle_timeout(ACE_Time_Value const &, void const*) override; private: void send_data_through_handlers(); @@ -101,7 +101,7 @@ run_main (int, ACE_TCHAR *[]) // regardless of platform. ACE_Select_Reactor *impl_ptr = 0; ACE_NEW_RETURN (impl_ptr, ACE_Select_Reactor, -1); - auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); + std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); ACE_Reactor reactor (impl_ptr); diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp index 80479988006..0dbacfb4d07 100644 --- a/ACE/tests/Bug_2368_Regression_Test.cpp +++ b/ACE/tests/Bug_2368_Regression_Test.cpp @@ -19,8 +19,8 @@ static bool handleB_close_called = false; class My_HandlerA : public ACE_Event_Handler { public: - virtual int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, + ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -29,9 +29,9 @@ public: return 0; } - virtual int handle_signal (int, + int handle_signal (int, siginfo_t *, - ucontext_t *) + ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); @@ -43,8 +43,8 @@ public: class My_HandlerB : public ACE_Event_Handler { public: - virtual int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, + ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -53,9 +53,9 @@ public: return 0; } - virtual int handle_signal (int, + int handle_signal (int, siginfo_t *, - ucontext_t *) + ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); diff --git a/ACE/tests/Bug_2497_Regression_Test.cpp b/ACE/tests/Bug_2497_Regression_Test.cpp index ebbf70afc34..b4f0e7a024e 100644 --- a/ACE/tests/Bug_2497_Regression_Test.cpp +++ b/ACE/tests/Bug_2497_Regression_Test.cpp @@ -15,12 +15,12 @@ class Test_Task : public ACE_Task<ACE_SYNCH> { public: - Test_Task( void ) : + Test_Task( ) : _destructorCalled(0) { } - virtual ~Test_Task( void ) + ~Test_Task( ) override { ++_destructorCalled; if (_destructorCalled > 1) @@ -36,7 +36,7 @@ private: class Test_Module : public ACE_Module<ACE_SYNCH> { public: - Test_Module( void ) + Test_Module( ) { this->open( ACE_TEXT("Test module"), &_writerTask, diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp index fc944ec04da..6d624def926 100644 --- a/ACE/tests/Bug_2540_Regression_Test.cpp +++ b/ACE/tests/Bug_2540_Regression_Test.cpp @@ -47,8 +47,8 @@ public: void simulate_socket_closure(); /// Reactor callback - virtual ACE_HANDLE get_handle() const; - virtual int handle_input(ACE_HANDLE); + ACE_HANDLE get_handle() const override; + int handle_input(ACE_HANDLE) override; private: bool auto_remove_flag_; @@ -78,7 +78,7 @@ public: bool check_expected_results() const; - virtual int handle_timeout(ACE_Time_Value const &, void const*); + int handle_timeout(ACE_Time_Value const &, void const*) override; private: void send_data_through_handlers(); diff --git a/ACE/tests/Bug_2609_Regression_Test.cpp b/ACE/tests/Bug_2609_Regression_Test.cpp index a13de9874fb..dfdb8dc5884 100644 --- a/ACE/tests/Bug_2609_Regression_Test.cpp +++ b/ACE/tests/Bug_2609_Regression_Test.cpp @@ -29,7 +29,7 @@ ACE_Thread_Semaphore g_semaphore (0); class My_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> { public: - typedef ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> super; + using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; My_Svc_Handler() { TEST_TRACE ("My_Svc_Handler:My_Svc_Handler"); @@ -38,14 +38,14 @@ public: Reference_Counting_Policy::ENABLED); } - ~My_Svc_Handler() + ~My_Svc_Handler() override { TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler"); g_handler_deleted = true; } //FUZZ: disable check_for_lack_ACE_OS - int open (void* pv) + int open (void* pv) override { TEST_TRACE ("open"); g_semaphore.release (); // signal open completed @@ -56,7 +56,7 @@ public: } //FUZZ: enable check_for_lack_ACE_OS - int handle_close (ACE_HANDLE, ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { TEST_TRACE ("handle_close"); if (g_handler_deleted) @@ -72,7 +72,7 @@ public: struct My_Task : public ACE_Task_Base { - int svc() + int svc() override { TEST_TRACE ("My_Task::svc"); ACE_Reactor *r = ACE_Reactor::instance (); @@ -91,14 +91,14 @@ struct My_Task : public ACE_Task_Base // event handler used to signal when the reactor started struct Timer_Handler : public ACE_Event_Handler { - int handle_timeout (const ACE_Time_Value&, const void*) + int handle_timeout (const ACE_Time_Value&, const void*) override { g_semaphore.release (); // signal reactor started return 0; } }; -typedef ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR> My_Acceptor; +using My_Acceptor = ACE_Acceptor<My_Svc_Handler, ACE_SOCK_Acceptor>; #endif diff --git a/ACE/tests/Bug_2610_Regression_Test.cpp b/ACE/tests/Bug_2610_Regression_Test.cpp index a3ddee974a3..c0f46ddcfc4 100644 --- a/ACE/tests/Bug_2610_Regression_Test.cpp +++ b/ACE/tests/Bug_2610_Regression_Test.cpp @@ -30,7 +30,7 @@ ACE_Thread_Semaphore g_semaphore (0); class My_Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> { public: - typedef ACE_Svc_Handler<ACE_SOCK_STREAM,ACE_NULL_SYNCH> super; + using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; My_Svc_Handler() { TEST_TRACE ("My_Svc_Handler:My_Svc_Handler"); @@ -39,13 +39,13 @@ public: Reference_Counting_Policy::ENABLED); } - ~My_Svc_Handler() + ~My_Svc_Handler() override { TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler"); --g_svc_handlers_leaked; } - int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/) + int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/) override { TEST_TRACE ("handle_close"); g_semaphore.release(); @@ -58,11 +58,11 @@ bool g_acceptor_accept_fails; class My_Acceptor : public ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR> { public: - typedef ACE_Acceptor<My_Svc_Handler, ACE_SOCK_ACCEPTOR> super; + using super = ACE_Acceptor<My_Svc_Handler, ACE_SOCK_Acceptor>; My_Acceptor () : super (ACE_INET_Addr(9000)) {} protected: - int accept_svc_handler (My_Svc_Handler *svc_handler) + int accept_svc_handler (My_Svc_Handler *svc_handler) override { TEST_TRACE ("accept_svc_handler"); int rv = super::accept_svc_handler(svc_handler); @@ -73,7 +73,7 @@ protected: } return rv; } - int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) + int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override { TEST_TRACE ("My_Acceptor::activate_svc_handler"); g_semaphore.release(); @@ -84,9 +84,9 @@ protected: class My_Connector : public ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR> { public: - typedef ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR> super; + using super = ACE_Connector<My_Svc_Handler, ACE_SOCK_Connector>; protected: - int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) + int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override { TEST_TRACE ("My_Connector::activate_svc_handler"); g_semaphore.release(); @@ -96,7 +96,7 @@ protected: struct My_Task : public ACE_Task_Base { - int svc() + int svc() override { TEST_TRACE ("My_Task::svc"); ACE_Reactor::instance()->owner(ACE_OS::thr_self()); @@ -114,7 +114,7 @@ struct My_Task : public ACE_Task_Base // event handler used to signal when the reactor started struct Timer_Handler : public ACE_Event_Handler { - int handle_timeout (const ACE_Time_Value&, const void*) + int handle_timeout (const ACE_Time_Value&, const void*) override { g_semaphore.release(); // signal reactor started return 0; diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index 8f8fe46943c..bd33cc00d3e 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -31,12 +31,12 @@ static const char *message = class Watchdog : public ACE_Task_Base { public: - int svc (void); + int svc () override; int my_grp_; }; int -Watchdog::svc (void) +Watchdog::svc () { ACE_OS::sleep (5); // If we make it through the sleep and haven't been canceled, that @@ -52,11 +52,11 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor, bool close_other); - ~Handler(); + ~Handler() override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; ACE_Pipe pipe_; ACE_Pipe other_pipe_; @@ -95,7 +95,7 @@ Handler::Handler (ACE_Reactor &reactor, bool close_other) } } -Handler::~Handler (void) +Handler::~Handler () { this->other_pipe_.close(); this->pipe_.close (); diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp index ce6ac4f1301..f393e7626dd 100644 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ b/ACE/tests/Bug_2659_Regression_Test.cpp @@ -80,12 +80,12 @@ class ReactorTask : public ACE_Task_Base { public: - virtual ~ReactorTask () + ~ReactorTask () override { EE_DEBUG ("ReactorTask", "~ReactorTask", this); }; - virtual int svc (void ) + int svc ( ) override { EE_DEBUG ("ReactorTask", "svc", this); diff --git a/ACE/tests/Bug_2740_Regression_Test.cpp b/ACE/tests/Bug_2740_Regression_Test.cpp index fde25e15bf9..5c3f7fe54c0 100644 --- a/ACE/tests/Bug_2740_Regression_Test.cpp +++ b/ACE/tests/Bug_2740_Regression_Test.cpp @@ -41,13 +41,13 @@ public: // Each client will send/recv 'echo_cnt' times, close/reopen the socket, // then echo, etc. for ACE_MAX_ITERATIONS times. ClientSvcHandler (const ACE_INET_Addr &addr, int echo_cnt); - ~ClientSvcHandler (); + ~ClientSvcHandler () override; - int open (void* factory); - int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE); - int handle_timeout (const ACE_Time_Value &now, const void *act = 0); + int open (void* factory) override; + int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override; + int handle_timeout (const ACE_Time_Value &now, const void *act = 0) override; int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE, - ACE_Reactor_Mask mask = 0); + ACE_Reactor_Mask mask = 0) override; protected: static const char *send_str; @@ -68,10 +68,10 @@ const char *ClientSvcHandler::send_str = class ServerSvcHandler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - int open (void* factory); - int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE); + int open (void* factory) override; + int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override; int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE, - ACE_Reactor_Mask mask = 0); + ACE_Reactor_Mask mask = 0) override; }; diff --git a/ACE/tests/Bug_2815_Regression_Test.cpp b/ACE/tests/Bug_2815_Regression_Test.cpp index 04133884b86..23baade0054 100644 --- a/ACE/tests/Bug_2815_Regression_Test.cpp +++ b/ACE/tests/Bug_2815_Regression_Test.cpp @@ -43,7 +43,7 @@ public: char const *test_name); /// Run the test - void run (void); + void run (); /// One of the sub-handlers has received a notification void notification_received (); @@ -63,12 +63,12 @@ private: * Each iteration of the test consists of sending multiple * notifications simultaneously. */ - void send_notifications (void); + void send_notifications (); /** * @brief Return true if the test is finished. */ - bool done (void) const; + bool done () const; /** * @brief Return true if there are more iterations to run. @@ -84,7 +84,7 @@ private: * @brief Run one iteration of the test, each iteration doubles * the number of events. */ - int run_one_iteration (void); + int run_one_iteration (); /** * @brief Initialize a bunch of One_Shot_Handlers @@ -176,7 +176,7 @@ public: /// Receive the notifications, but remove itself from the reactor on /// on the first one. - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; private: /// The driver for this test, communicate results to it @@ -251,7 +251,7 @@ Driver::Driver ( } void -Driver::run (void) +Driver::run () { while(more_iterations()) { @@ -292,7 +292,7 @@ Driver::reactor() } void -Driver::send_notifications (void) +Driver::send_notifications () { int const nhandlers = 16; One_Shot_Handler * handlers[nhandlers]; @@ -305,7 +305,7 @@ Driver::send_notifications (void) } bool -Driver::done (void) const +Driver::done () const { return !more_iterations() && current_iteration_done(); } @@ -323,7 +323,7 @@ Driver::current_iteration_done() const } int -Driver::run_one_iteration (void) +Driver::run_one_iteration () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running iteration with %d events for %C test\n"), diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp index 945b0b2a25e..9e61081c0e3 100644 --- a/ACE/tests/Bug_2820_Regression_Test.cpp +++ b/ACE/tests/Bug_2820_Regression_Test.cpp @@ -30,10 +30,10 @@ public: Simple_Handler(ACE_Reactor * reactor); /// Destructor - ~Simple_Handler(); + ~Simple_Handler() override; /// Receive (and ignore) the notifications - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; }; int diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp index 29a6261884f..1b4383d61ce 100644 --- a/ACE/tests/Bug_2980_Regression_Test.cpp +++ b/ACE/tests/Bug_2980_Regression_Test.cpp @@ -50,7 +50,7 @@ namespace { #endif -typedef int (* voidfunction)(void); +using voidfunction = int (*)(); #if defined (CAN_RUN_TEST) diff --git a/ACE/tests/Bug_3102_Regression_Test.cpp b/ACE/tests/Bug_3102_Regression_Test.cpp index 755a69ffed4..724aa314af8 100644 --- a/ACE/tests/Bug_3102_Regression_Test.cpp +++ b/ACE/tests/Bug_3102_Regression_Test.cpp @@ -15,7 +15,7 @@ #if defined (ACE_HAS_THREADS) -void mutexTest(void) +void mutexTest() { ACE_MT(ACE_Thread_Mutex *lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object diff --git a/ACE/tests/Bug_3432_Regression_Test.cpp b/ACE/tests/Bug_3432_Regression_Test.cpp index 4da4eb21c1e..c56d92c5ae7 100644 --- a/ACE/tests/Bug_3432_Regression_Test.cpp +++ b/ACE/tests/Bug_3432_Regression_Test.cpp @@ -21,7 +21,7 @@ int -strptime_test (void) +strptime_test () { // convert UTC time string to UTC ACE_Time_Value int error_count = 0; diff --git a/ACE/tests/Bug_3744_Regression_Test.cpp b/ACE/tests/Bug_3744_Regression_Test.cpp index b557fdd9710..66fac13b54a 100644 --- a/ACE/tests/Bug_3744_Regression_Test.cpp +++ b/ACE/tests/Bug_3744_Regression_Test.cpp @@ -9,7 +9,7 @@ : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) int -getmacaddress_test (void) +getmacaddress_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getmacaddress\n"))); diff --git a/ACE/tests/Bug_3758_Regression_Test.cpp b/ACE/tests/Bug_3758_Regression_Test.cpp index af67c450089..0c4197cc8bc 100644 --- a/ACE/tests/Bug_3758_Regression_Test.cpp +++ b/ACE/tests/Bug_3758_Regression_Test.cpp @@ -23,7 +23,7 @@ // Test ACE_OS::fileno() int -fileno_test (void) +fileno_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing fileno method\n"))); diff --git a/ACE/tests/Bug_3878_Regression_Test.cpp b/ACE/tests/Bug_3878_Regression_Test.cpp index 685b8c450a2..4fe3c47e10c 100644 --- a/ACE/tests/Bug_3878_Regression_Test.cpp +++ b/ACE/tests/Bug_3878_Regression_Test.cpp @@ -19,7 +19,7 @@ class Worker; class IManager { public: - virtual ~IManager (void) { } + virtual ~IManager () { } virtual int return_to_work (Worker *worker) = 0; }; @@ -30,7 +30,7 @@ class Worker : public ACE_Task<ACE_MT_SYNCH> public: Worker (IManager *manager) : manager_(manager) { } - virtual int svc (void) + int svc () override { ACE_Thread_ID id; thread_id_ = id; @@ -56,7 +56,7 @@ public: return 0; } - const ACE_Thread_ID& thread_id (void) + const ACE_Thread_ID& thread_id () { return thread_id_; } @@ -94,7 +94,7 @@ public: ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () override { ACE_TRACE ("Manager::svc"); @@ -135,11 +135,11 @@ public: return 0; } - int shut_down (void); + int shut_down (); const ACE_Thread_ID& thread_id (Worker *worker); - virtual int return_to_work (Worker *worker) + int return_to_work (Worker *worker) override { ACE_GUARD_RETURN (ACE_Mutex, worker_mon, this->workers_lock_, -1); @@ -152,7 +152,7 @@ public: } private: - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Mutex, worker_mon, @@ -169,7 +169,7 @@ private: return 0; } - int done (void); + int done (); private: int shutdown_; @@ -179,13 +179,13 @@ private: }; // Listing 1 -int Manager::done (void) +int Manager::done () { return (shutdown_ == 1); } int -Manager::shut_down (void) +Manager::shut_down () { ACE_TRACE ("Manager::shut_down"); ACE_Unbounded_Queue<Worker* >::ITERATOR iter = diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp index 4624a585df1..c1c9fe0a321 100644 --- a/ACE/tests/Bug_3912_Regression_Test.cpp +++ b/ACE/tests/Bug_3912_Regression_Test.cpp @@ -22,8 +22,8 @@ #include "ace/Task.h" #include "ace/Module.h" -typedef ACE_Task<ACE_SYNCH> MT_Task; -typedef ACE_Module<ACE_SYNCH> MT_Module; +using MT_Task = ACE_Task<ACE_MT_SYNCH>; +using MT_Module = ACE_Module<ACE_MT_SYNCH>; /** * We use this Task to track if close was called. @@ -37,7 +37,7 @@ public: { } - virtual int close(u_long ); + int close(u_long ) override; private: bool* close_called_; diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index c0d1b0beaa7..8fdf4a0f98b 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -53,7 +53,7 @@ typedef ACE_Null_Mutex ACCEPTOR_LOCKING; # else # include "ace/Process_Mutex.h" - typedef ACE_Process_Mutex ACCEPTOR_LOCKING; + using ACCEPTOR_LOCKING = ACE_Process_Mutex; # define CLEANUP_PROCESS_MUTEX # endif /* ACE_HAS_THREAD_SAFE_ACCEPT */ #endif /* ACE_LACKS_FORK */ @@ -88,7 +88,7 @@ namespace { #if defined (ACE_LACKS_IOVEC) typedef u_long buffer_len; #else - typedef size_t buffer_len; + using buffer_len = size_t; #endif /* ACE_LACKS_IOVEC */ #if defined (ACE_WIN32) @@ -220,16 +220,16 @@ namespace { Svc_Handler (ACE_Thread_Manager * = 0); // Do-nothing constructor. - virtual int open (void *); + int open (void *) override; // Initialization hook. - void send_data (void); + void send_data (); // Send data to server. - void recv_data (void); + void recv_data (); // Recv data from client. - int close (u_long = 0); + int close (u_long = 0) override; // Shutdown the <Svc_Handler>. private: @@ -248,10 +248,8 @@ namespace { }; } // namespace "" -typedef ACE_Oneshot_Acceptor<Svc_Handler, - LOCK_SOCK_ACCEPTOR> ACCEPTOR; -typedef ACE_Connector<Svc_Handler, - ACE_SOCK_CONNECTOR> CONNECTOR; +using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>>; +using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>; IovecGuard::IovecGuard(const int count, const int slot, const buffer_len max) @@ -320,7 +318,7 @@ Svc_Handler::open (void *) } void -Svc_Handler::send_data (void) +Svc_Handler::send_data () { bool successful = true; bool win32_test = false; @@ -780,7 +778,7 @@ Svc_Handler::send (char send_char, const ACE_TCHAR * const send_desc) } void -Svc_Handler::recv_data (void) +Svc_Handler::recv_data () { ACE_SOCK_Stream &new_stream = this->peer (); diff --git a/ACE/tests/Bug_4055_Regression_Test.cpp b/ACE/tests/Bug_4055_Regression_Test.cpp index 4aa1d30a3c3..1e427befaee 100644 --- a/ACE/tests/Bug_4055_Regression_Test.cpp +++ b/ACE/tests/Bug_4055_Regression_Test.cpp @@ -32,14 +32,11 @@ // Create timer queue with hr support ACE_Timer_Queue * -create_timer_queue (void) +create_timer_queue () { ACE_Timer_Queue * tmq = 0; - typedef ACE_Timer_Heap_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_HR_Time_Policy> timer_queue_type; + using timer_queue_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>; ACE_NEW_RETURN (tmq, timer_queue_type (), 0); return tmq; @@ -50,17 +47,17 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH> public: MyTask () : my_reactor_ (0), my_tq_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (void); + int svc () override; int start (int num_threads); - int stop (void); + int stop (); ACE_Reactor* get_reactor (); - int create_reactor (void); + int create_reactor (); private: - int delete_reactor (void); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Reactor *my_reactor_; @@ -74,7 +71,7 @@ MyTask::get_reactor () } int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -101,7 +98,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -133,7 +130,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -157,7 +154,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n"))); @@ -177,8 +174,8 @@ public: timeout_triggered_ (false) {} - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; bool trigger_in(const ACE_Time_Value &delay); diff --git a/ACE/tests/Bug_4189_Regression_Test.cpp b/ACE/tests/Bug_4189_Regression_Test.cpp index bff5a9297e7..1ccd0e1a768 100644 --- a/ACE/tests/Bug_4189_Regression_Test.cpp +++ b/ACE/tests/Bug_4189_Regression_Test.cpp @@ -24,7 +24,7 @@ const int SEC_TO_KEEP_SOCKET_OPEN = 2; #if defined (ACE_HAS_THREADS) -int reuseAddr_test (void) +int reuseAddr_test () { # if defined ACE_WIN32 || !defined ACE_LACKS_IOCTL ACE_SOCK_Dgram_Bcast sock1; diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 6d44f5546a6..c10f0c2323a 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -48,7 +48,7 @@ class CDR_Test public: /// Default constructor. - CDR_Test (void); + CDR_Test (); /// Constructor. CDR_Test (ACE_CDR::Char o, @@ -121,7 +121,7 @@ operator << (ostream &os, return os; } -CDR_Test::CDR_Test (void) +CDR_Test::CDR_Test () : char_ (0), word2_ (0), word4_ (0), diff --git a/ACE/tests/CDR_Fixed_Test.cpp b/ACE/tests/CDR_Fixed_Test.cpp index f9611bbf529..96aa893e315 100644 --- a/ACE/tests/CDR_Fixed_Test.cpp +++ b/ACE/tests/CDR_Fixed_Test.cpp @@ -47,10 +47,10 @@ int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("CDR_Fixed_Test")); - typedef ACE_CDR::Fixed Fixed; - typedef ACE_CDR::LongLong LongLong; - typedef ACE_CDR::ULongLong ULongLong; - typedef ACE_CDR::LongDouble LongDouble; + using Fixed = ACE_CDR::Fixed; + using LongLong = ACE_CDR::LongLong; + using ULongLong = ACE_CDR::ULongLong; + using LongDouble = ACE_CDR::LongDouble; const Fixed f1 = Fixed::from_integer (LongLong (-1234567890l)), f2 = Fixed::from_integer (ULongLong (987654321ul)), diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index f07a7ea9928..283f5a9e1ae 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -28,7 +28,7 @@ static int nloops = 100; struct CDR_Test_Types { - CDR_Test_Types (void); + CDR_Test_Types (); ACE_CDR::Octet o; ACE_CDR::Short s; @@ -65,7 +65,7 @@ struct CDR_Test_Types ACE_CDR::Short a[ARRAY_SIZE]; }; -CDR_Test_Types::CDR_Test_Types (void) +CDR_Test_Types::CDR_Test_Types () : o (1), s (2), l (4), @@ -95,7 +95,7 @@ CDR_Test_Types::CDR_Test_Types (void) } static int -short_stream (void) +short_stream () { // counter u_int i; diff --git a/ACE/tests/Cache_Map_Manager_Test.cpp b/ACE/tests/Cache_Map_Manager_Test.cpp index b9028eab59d..51e9e765767 100644 --- a/ACE/tests/Cache_Map_Manager_Test.cpp +++ b/ACE/tests/Cache_Map_Manager_Test.cpp @@ -26,82 +26,52 @@ #include "ace/Get_Opt.h" #include "Cache_Map_Manager_Test.h" // Hash_Key class defined in here -typedef size_t KEY; -typedef size_t VALUE; -typedef int ATTR; -typedef std::pair<VALUE, ATTR> CACHE_VALUE; -typedef ACE_Equal_To<KEY> COMPARE_KEYS; - -typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex> - HASH_MAP_MANAGER; -typedef ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex> - HASH_MAP_ITERATOR; -typedef ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex> - HASH_MAP_REVERSE_ITERATOR; - -typedef ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_MANAGER; -typedef ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_ITERATOR; -typedef ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex> - MAP_REVERSE_ITERATOR; - -typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, HASH_MAP_MANAGER> - HASH_MAP_CLEANUP; - -typedef ACE_Cleanup_Strategy<KEY, CACHE_VALUE, MAP_MANAGER> - MAP_CLEANUP; - -typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR> - HASH_MAP_CACHING_UTILITY; - -typedef ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR> - MAP_CACHING_UTILITY; +using KEY = size_t; +using VALUE = size_t; +using ATTR = int; +using CACHE_VALUE = std::pair<VALUE, ATTR>; +using COMPARE_KEYS = ACE_Equal_To<KEY>; + +using HASH_MAP_MANAGER = ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>; +using HASH_MAP_ITERATOR = ACE_Hash_Map_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>; +using HASH_MAP_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<KEY, CACHE_VALUE, Hash_Key, ACE_Equal_To<KEY>, ACE_Null_Mutex>; + +using MAP_MANAGER = ACE_Map_Manager<KEY, CACHE_VALUE, ACE_Null_Mutex>; +using MAP_ITERATOR = ACE_Map_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>; +using MAP_REVERSE_ITERATOR = ACE_Map_Reverse_Iterator<KEY, CACHE_VALUE, ACE_Null_Mutex>; + +using HASH_MAP_CLEANUP = ACLE<KEY, CACHE_VALUE, HASH_MAP_MANAGER>; + +using MAP_CLEANUP = ACLE<KEY, CACHE_VALUE, MAP_MANAGER>; + +using HASH_MAP_CACHING_UTILITY = ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, HASH_MAP_MANAGER, HASH_MAP_ITERATOR, ATTR>; + +using MAP_CACHING_UTILITY = ACE_Pair_Caching_Utility<KEY, CACHE_VALUE, MAP_MANAGER, MAP_ITERATOR, ATTR>; // = Hash_Map_Manager related -typedef ACE_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_CACHING_STRATEGY; -typedef ACE_LRU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_LRU; -typedef ACE_LFU_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_LFU; -typedef ACE_FIFO_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_FIFO; -typedef ACE_Null_Caching_Strategy<ATTR, HASH_MAP_CACHING_UTILITY> - HASH_MAP_NULL; -typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU> - HASH_MAP_LRU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU> - HASH_MAP_LFU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO> - HASH_MAP_FIFO_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL> - HASH_MAP_NULL_ADAPTER; +using HASH_MAP_CACHING_STRATEGY = ACS<ATTR, HASH_MAP_CACHING_UTILITY>; +using HASH_MAP_LRU = ALRU<ATTR, HASH_MAP_CACHING_UTILITY>; +using HASH_MAP_LFU = ALFU<ATTR, HASH_MAP_CACHING_UTILITY>; +using HASH_MAP_FIFO = AFIFO<ATTR, HASH_MAP_CACHING_UTILITY>; +using HASH_MAP_NULL = ANULL<ATTR, HASH_MAP_CACHING_UTILITY>; +using HASH_MAP_LRU_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LRU>; +using HASH_MAP_LFU_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_LFU>; +using HASH_MAP_FIFO_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_FIFO>; +using HASH_MAP_NULL_ADAPTER = ACSA<ATTR, HASH_MAP_CACHING_UTILITY, HASH_MAP_NULL>; // = Map_Manager related -typedef ACE_Caching_Strategy<ATTR, MAP_CACHING_UTILITY> - MAP_CACHING_STRATEGY; -typedef ACE_LRU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY> - MAP_LRU; -typedef ACE_LFU_Caching_Strategy<ATTR, MAP_CACHING_UTILITY> - MAP_LFU; -typedef ACE_FIFO_Caching_Strategy<ATTR, MAP_CACHING_UTILITY> - MAP_FIFO; -typedef ACE_Null_Caching_Strategy<ATTR, MAP_CACHING_UTILITY> - MAP_NULL; -typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LRU> - MAP_LRU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_LFU> - MAP_LFU_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_FIFO> - MAP_FIFO_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTR, MAP_CACHING_UTILITY, MAP_NULL> - MAP_NULL_ADAPTER; - -typedef ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR> - HASH_MAP_CACHE; -typedef ACE_Cache_Map_Manager<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR> - MAP_CACHE; +using MAP_CACHING_STRATEGY = ACS<ATTR, MAP_CACHING_UTILITY>; +using MAP_LRU = ALRU<ATTR, MAP_CACHING_UTILITY>; +using MAP_LFU = ALFU<ATTR, MAP_CACHING_UTILITY>; +using MAP_FIFO = AFIFO<ATTR, MAP_CACHING_UTILITY>; +using MAP_NULL = ANULL<ATTR, MAP_CACHING_UTILITY>; +using MAP_LRU_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_LRU>; +using MAP_LFU_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_LFU>; +using MAP_FIFO_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_FIFO>; +using MAP_NULL_ADAPTER = ACSA<ATTR, MAP_CACHING_UTILITY, MAP_NULL>; + +using HASH_MAP_CACHE = ACE_Hash_Cache_Map_Manager<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, HASH_MAP_CACHING_STRATEGY, ATTR>; +using MAP_CACHE = ACMM<KEY, VALUE, MAP_MANAGER, MAP_ITERATOR, MAP_REVERSE_ITERATOR, MAP_CACHING_STRATEGY, ATTR>; enum Caching_Strategy_Type { @@ -416,7 +386,7 @@ functionality_test_hash_cache (HASH_MAP_CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { HASH_MAP_CACHING_STRATEGY *hash_map_caching_strategy = 0; MAP_CACHING_STRATEGY *map_caching_strategy = 0; diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 909e5cf31cb..960816e3402 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -112,7 +112,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDL } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void) +Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler () { if (ACE::out_of_handles (errno)) { @@ -127,8 +127,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void) return -1; } -typedef Accept_Strategy<Server_Svc_Handler, ACE_SOCK_ACCEPTOR> - ACCEPT_STRATEGY; +using ACCEPT_STRATEGY = Accept_Strategy<Server_Svc_Handler, ACE_SOCK_Acceptor>; Client_Svc_Handler::Client_Svc_Handler (ACE_Thread_Manager *t) : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t) @@ -230,7 +229,7 @@ cached_connect (STRATEGY_CONNECTOR &con, } static void -server (void) +server () { int result = 1; @@ -335,7 +334,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { CACHING_STRATEGY *caching_strategy = 0; diff --git a/ACE/tests/Cached_Allocator_Test.cpp b/ACE/tests/Cached_Allocator_Test.cpp index 4d4b7f8dbf1..d954c2980cd 100644 --- a/ACE/tests/Cached_Allocator_Test.cpp +++ b/ACE/tests/Cached_Allocator_Test.cpp @@ -20,7 +20,7 @@ #include "ace/Synch_Traits.h" #include "ace/Null_Mutex.h" -typedef ACE_Dynamic_Cached_Allocator<ACE_SYNCH_NULL_MUTEX> DYNAMIC_ALLOCATOR; +using DYNAMIC_ALLOCATOR = ACE_Dynamic_Cached_Allocator<ACE_MT_SYNCH::NULL_MUTEX>; static int speed_test (ACE_UINT32 loops) @@ -71,7 +71,7 @@ speed_test (ACE_UINT32 loops) } typedef char MEMBLOCK[8]; -typedef ACE_Cached_Allocator<MEMBLOCK, ACE_SYNCH_NULL_MUTEX> STATIC_ALLOCATOR; +using STATIC_ALLOCATOR = ACE_Cached_Allocator<MEMBLOCK, ACE_MT_SYNCH::NULL_MUTEX>; static int stdspeed_test (ACE_UINT32 loops) diff --git a/ACE/tests/Cached_Conn_Test.cpp b/ACE/tests/Cached_Conn_Test.cpp index f197be790af..9f6bb780237 100644 --- a/ACE/tests/Cached_Conn_Test.cpp +++ b/ACE/tests/Cached_Conn_Test.cpp @@ -40,60 +40,39 @@ -typedef size_t ATTRIBUTES; -typedef std::pair<Svc_Handler *, ATTRIBUTES> - CACHED_HANDLER; -typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> - ACE_ADDR; -typedef ACE_Hash<ACE_ADDR> H_KEY; -typedef ACE_Equal_To<ACE_ADDR> C_KEYS; - -typedef ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> - HASH_MAP; -typedef ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> - HASH_MAP_ITERATOR; -typedef ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex> - HASH_MAP_REVERSE_ITERATOR; - -typedef ACE_Recyclable_Handler_Cleanup_Strategy<ACE_ADDR, CACHED_HANDLER, HASH_MAP> - CLEANUP_STRATEGY; -typedef ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES> - CACHING_UTILITY; - -typedef ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY> - LRU_CACHING_STRATEGY; - -typedef ACE_LFU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY> - LFU_CACHING_STRATEGY; -typedef ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY> - FIFO_CACHING_STRATEGY; -typedef ACE_Null_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY> - NULL_CACHING_STRATEGY; -typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY> - LRU_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY> - LFU_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY> - FIFO_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy_Adapter<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY> - NULL_CACHING_STRATEGY_ADAPTER; -typedef ACE_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY> - CACHING_STRATEGY; - -typedef ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_ACCEPTOR> - ACCEPTOR; - -typedef ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> - STRATEGY_CONNECTOR; - -typedef ACE_NOOP_Creation_Strategy<Svc_Handler> - NULL_CREATION_STRATEGY; - -typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler> - NULL_ACTIVATION_STRATEGY; - -typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX> - CACHED_CONNECT_STRATEGY; +using ATTRIBUTES = size_t; +using CACHED_HANDLER = std::pair<Svc_Handler *, ATTRIBUTES>; +using ACE_ADDR = ARHR<ACE_INET_Addr>; +using H_KEY = ACE_Hash<ACE_ADDR>; +using C_KEYS = ACE_Equal_To<ACE_ADDR>; + +using HASH_MAP = ACE_Hash_Map_Manager_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; +using HASH_MAP_ITERATOR = ACE_Hash_Map_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; +using HASH_MAP_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<ACE_ADDR, CACHED_HANDLER, H_KEY, C_KEYS, ACE_Null_Mutex>; + +using CLEANUP_STRATEGY = ARHCLE<ACE_ADDR, CACHED_HANDLER, HASH_MAP>; +using CACHING_UTILITY = ACE_Recyclable_Handler_Caching_Utility<ACE_ADDR, CACHED_HANDLER, HASH_MAP, HASH_MAP_ITERATOR, ATTRIBUTES>; + +using LRU_CACHING_STRATEGY = ALRU<ATTRIBUTES, CACHING_UTILITY>; + +using LFU_CACHING_STRATEGY = ALFU<ATTRIBUTES, CACHING_UTILITY>; +using FIFO_CACHING_STRATEGY = AFIFO<ATTRIBUTES, CACHING_UTILITY>; +using NULL_CACHING_STRATEGY = ANULL<ATTRIBUTES, CACHING_UTILITY>; +using LRU_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, LRU_CACHING_STRATEGY>; +using LFU_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, LFU_CACHING_STRATEGY>; +using FIFO_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, FIFO_CACHING_STRATEGY>; +using NULL_CACHING_STRATEGY_ADAPTER = ACSA<ATTRIBUTES, CACHING_UTILITY, NULL_CACHING_STRATEGY>; +using CACHING_STRATEGY = ACS<ATTRIBUTES, CACHING_UTILITY>; + +using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_SOCK_Acceptor>; + +using STRATEGY_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>; + +using NULL_CREATION_STRATEGY = ACE_NOOP_Creation_Strategy<Svc_Handler>; + +using NULL_ACTIVATION_STRATEGY = ACE_NOOP_Concurrency_Strategy<Svc_Handler>; + +using CACHED_CONNECT_STRATEGY = ACCSE<Svc_Handler, ACE_SOCK_Connector, CACHING_STRATEGY, ATTRIBUTES, ACE_MT_SYNCH::NULL_MUTEX>; #endif /* CACHED_CONNECT_TEST */ @@ -154,7 +133,7 @@ static int iterations = 200; //==================================================================== static void -out_of_sockets_handler (void) +out_of_sockets_handler () { if (ACE::out_of_handles (errno)) { @@ -311,7 +290,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { CACHING_STRATEGY *caching_strategy = 0; diff --git a/ACE/tests/Capabilities_Test.cpp b/ACE/tests/Capabilities_Test.cpp index fa1ce4b99e5..75951f39bbd 100644 --- a/ACE/tests/Capabilities_Test.cpp +++ b/ACE/tests/Capabilities_Test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR config[] = ACE_TEXT ("Capabilities_Test.cfg"); static int -load_config (void) +load_config () { ACE_Capabilities caps; if (caps.getent (config, ACE_TEXT ("Config")) == -1) diff --git a/ACE/tests/Collection_Test.cpp b/ACE/tests/Collection_Test.cpp index 09412f94791..5b92fbc35b4 100644 --- a/ACE/tests/Collection_Test.cpp +++ b/ACE/tests/Collection_Test.cpp @@ -27,14 +27,14 @@ UglyThing::operator== (const UglyThing& r) const return this->alloc_ == r.alloc_; } -typedef UglyThing DATA; -typedef ACE_Unbounded_Set<DATA> UNBOUNDED_SET; -typedef ACE_Unbounded_Set_Iterator<DATA> UNBOUNDED_SET_ITERATOR; -typedef ACE_Unbounded_Set_Const_Iterator<DATA> UNBOUNDED_SET_CONST_ITERATOR; +using DATA = UglyThing; +using UNBOUNDED_SET = ACE_Unbounded_Set<DATA>; +using UNBOUNDED_SET_ITERATOR = ACE_Unbounded_Set_Iterator<DATA>; +using UNBOUNDED_SET_CONST_ITERATOR = ACE_Unbounded_Set_Const_Iterator<DATA>; -typedef int ARRAY_DATA; -typedef ACE_Array<ARRAY_DATA> ARRAY; -typedef ACE_Array_Iterator<ARRAY_DATA> ARRAY_ITERATOR; +using ARRAY_DATA = int; +using ARRAY = ACE_Array<ARRAY_DATA>; +using ARRAY_ITERATOR = ACE_Array_Iterator<ARRAY_DATA>; void iterate_const(const UNBOUNDED_SET& set) { @@ -59,7 +59,7 @@ void iterate_const(const UNBOUNDED_SET& set) struct DummyFunctor { - int operator() (void) { return 0; } + int operator() () { return 0; } }; int diff --git a/ACE/tests/Compiler_Features_01_Test.cpp b/ACE/tests/Compiler_Features_01_Test.cpp index 9f23b27fe5a..ecf26f1b251 100644 --- a/ACE/tests/Compiler_Features_01_Test.cpp +++ b/ACE/tests/Compiler_Features_01_Test.cpp @@ -27,7 +27,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::list<int> collection; + using collection = std::list<int>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_02_Test.cpp b/ACE/tests/Compiler_Features_02_Test.cpp index f1e31f20b0d..42632f09d23 100644 --- a/ACE/tests/Compiler_Features_02_Test.cpp +++ b/ACE/tests/Compiler_Features_02_Test.cpp @@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::map<int,int> collection; + using collection = std::map<int, int>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_03_Test.cpp b/ACE/tests/Compiler_Features_03_Test.cpp index b34088bdd18..9363c337593 100644 --- a/ACE/tests/Compiler_Features_03_Test.cpp +++ b/ACE/tests/Compiler_Features_03_Test.cpp @@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::vector<int> collection; + using collection = std::vector<int>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_04_Test.cpp b/ACE/tests/Compiler_Features_04_Test.cpp index a8e24b74ead..7f4cdb4c373 100644 --- a/ACE/tests/Compiler_Features_04_Test.cpp +++ b/ACE/tests/Compiler_Features_04_Test.cpp @@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::set<int> collection; + using collection = std::set<int>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_05_Test.cpp b/ACE/tests/Compiler_Features_05_Test.cpp index 3caa89031f2..c67992ba4a3 100644 --- a/ACE/tests/Compiler_Features_05_Test.cpp +++ b/ACE/tests/Compiler_Features_05_Test.cpp @@ -25,7 +25,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple queue ... - typedef std::queue<int> collection; + using collection = std::queue<int>; // ... if the previous line compiles, the default template // parameters work. The declaration of queue<> is something like: // template<typename T, typename Sequence = deque<T> > diff --git a/ACE/tests/Compiler_Features_06_Test.cpp b/ACE/tests/Compiler_Features_06_Test.cpp index 2e68a987b72..3fde520fb71 100644 --- a/ACE/tests/Compiler_Features_06_Test.cpp +++ b/ACE/tests/Compiler_Features_06_Test.cpp @@ -30,7 +30,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::set<int,std::greater<int> > collection; + using collection = std::set<int, std::greater<int>>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_07_Test.cpp b/ACE/tests/Compiler_Features_07_Test.cpp index 854efe3ff82..bf4933326c3 100644 --- a/ACE/tests/Compiler_Features_07_Test.cpp +++ b/ACE/tests/Compiler_Features_07_Test.cpp @@ -26,7 +26,7 @@ run_main (int, ACE_TCHAR *[]) int status = 0; // Create a simple list ... - typedef std::set<std::string> collection; + using collection = std::set<std::string>; collection c; // ... insert some elements ... diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index eb38413cd6e..c765724237a 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -14,6 +14,7 @@ // The first part of the test is to compile this line. If the program // does not compile the platform is just too broken. #include <memory> +#include <utility> // For extra challenge, we use the anonymous namespace namespace @@ -64,8 +65,8 @@ run_main (int, ACE_TCHAR *[]) // ... this works with the ACE version of auto_ptr (well, the // namespace is broken, but you get the idea) ... - std::auto_ptr<Base> x(new Base); - std::auto_ptr<Derived> y(new Derived); + std::unique_ptr<Base> x(new Base); + std::unique_ptr<Derived> y(new Derived); // ... with a compliant implementation of std::auto_ptr<> you should be // able to write: @@ -85,8 +86,8 @@ run_main (int, ACE_TCHAR *[]) Base::destructors)); } - std::auto_ptr<Base> z; - z = x; + std::unique_ptr<Base> z; + z = std::move(x); if (Base::destructors != 1) { status = 1; diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp index 6882b316315..5c5ed2a6b60 100644 --- a/ACE/tests/Compiler_Features_10_Test.cpp +++ b/ACE/tests/Compiler_Features_10_Test.cpp @@ -184,7 +184,7 @@ run_main (int, ACE_TCHAR *[]) { // ... start the test fresh ... reset_counts(); - std::auto_ptr<Aggregate> b(new Aggregate); + std::unique_ptr<Aggregate> b(new Aggregate); never_reached(__FILE__, __LINE__); } catch(...) diff --git a/ACE/tests/Compiler_Features_18_Test.cpp b/ACE/tests/Compiler_Features_18_Test.cpp index 2eecfeba50f..ee48b20b80e 100644 --- a/ACE/tests/Compiler_Features_18_Test.cpp +++ b/ACE/tests/Compiler_Features_18_Test.cpp @@ -8,8 +8,8 @@ #include <array> namespace Test { - typedef std::array< float, 5 > arrayType; - typedef std::array< arrayType, 5 > array_array; + using arrayType = std::array<float, 5>; + using array_array = std::array<arrayType, 5>; }; int diff --git a/ACE/tests/Compiler_Features_19_Test.cpp b/ACE/tests/Compiler_Features_19_Test.cpp index a3fcad2e364..19ba4cddd76 100644 --- a/ACE/tests/Compiler_Features_19_Test.cpp +++ b/ACE/tests/Compiler_Features_19_Test.cpp @@ -16,7 +16,7 @@ namespace IDL typename _Alloc = std::allocator<_CharT> > class bounded_basic_string : public std::basic_string<_CharT, _Traits, _Alloc> { - typedef std::basic_string<_CharT, _Traits, _Alloc> _String; + using _String = std::basic_string<_CharT, _Traits, _Alloc>; public: static const uint32_t bound_ = _Bound; @@ -46,7 +46,7 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT("Compiler_Features_19_Test")); - typedef IDL::bounded_string<100> string100; + using string100 = IDL::bounded_string<100>; string100 s100("world"); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp index c62aac7241d..895a28820ea 100644 --- a/ACE/tests/Compiler_Features_24_Test.cpp +++ b/ACE/tests/Compiler_Features_24_Test.cpp @@ -16,7 +16,7 @@ namespace FOO template <typename T> struct o_t { - typedef o_r<T> ref_type; + using ref_type = o_r<T>; }; class T_base {}; @@ -32,7 +32,7 @@ namespace FOO template <typename _Tp1, typename, typename ...Args> friend o_r<_Tp1> make_f(Args&& ...args); protected: - typedef std::shared_ptr<T> shared_ptr_type; + using shared_ptr_type = std::shared_ptr<T>; template<typename _Tp1, typename = typename std::enable_if<std::is_convertible<_Tp1*, T*>::value>::type> explicit o_r (_Tp1*) diff --git a/ACE/tests/Compiler_Features_25_Test.cpp b/ACE/tests/Compiler_Features_25_Test.cpp index 9a77979adff..e273b166224 100644 --- a/ACE/tests/Compiler_Features_25_Test.cpp +++ b/ACE/tests/Compiler_Features_25_Test.cpp @@ -9,8 +9,8 @@ struct Foo { - typedef std::true_type is_true; - typedef std::false_type is_false; + using is_true = std::true_type; + using is_false = std::false_type; }; int diff --git a/ACE/tests/Compiler_Features_31_Test.cpp b/ACE/tests/Compiler_Features_31_Test.cpp index 349ebca71d5..f0665819fad 100644 --- a/ACE/tests/Compiler_Features_31_Test.cpp +++ b/ACE/tests/Compiler_Features_31_Test.cpp @@ -15,7 +15,7 @@ namespace A template <typename T> struct abstractbase_traits { - typedef abstractbase_reference<T> ref_type; + using ref_type = abstractbase_reference<T>; static ref_type narrow(abstractbase_reference<C::AbstractBase>); static ref_type narrow2(abstractbase_reference<C::AbstractBase>); }; diff --git a/ACE/tests/Compiler_Features_36_Test.cpp b/ACE/tests/Compiler_Features_36_Test.cpp index 4e82062b646..9a4f81c3acc 100644 --- a/ACE/tests/Compiler_Features_36_Test.cpp +++ b/ACE/tests/Compiler_Features_36_Test.cpp @@ -10,7 +10,7 @@ template <typename T> struct non_instantiatable { - typedef typename T::THIS_TYPE_CANNOT_BE_INSTANTIATED type; + using type = typename T::THIS_TYPE_CANNOT_BE_INSTANTIATED; }; int diff --git a/ACE/tests/Compiler_Features_37_Test.cpp b/ACE/tests/Compiler_Features_37_Test.cpp index 5d88aee0033..8fe14fda578 100644 --- a/ACE/tests/Compiler_Features_37_Test.cpp +++ b/ACE/tests/Compiler_Features_37_Test.cpp @@ -12,9 +12,9 @@ class my_map public: my_map () : capacity_ (0), nodes_(0) {} ~my_map (); - typedef key key_type; - typedef value data_type; - typedef std::pair<key, value> value_type; + using key_type = key; + using data_type = value; + using value_type = std::pair<key, value>; size_t capacity_; value_type* nodes_; }; diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp index 1c2f901bb7d..402fdd4816e 100644 --- a/ACE/tests/Compiler_Features_38_Test.cpp +++ b/ACE/tests/Compiler_Features_38_Test.cpp @@ -11,7 +11,7 @@ class Foo_T { public: Foo_T () : member() {}; - typedef T& T_elem; + using T_elem = T &; T_elem operator[] (ACE_CDR::ULong) { return member; } private: T member; @@ -21,7 +21,7 @@ struct Foo2 { long i; }; -typedef Foo_T<Foo2> Foo2Seq; +using Foo2Seq = Foo_T<Foo2>; int run_main (int, ACE_TCHAR *[]) diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp index 56d8b26b64c..510ce0a0d35 100644 --- a/ACE/tests/Config_Test.cpp +++ b/ACE/tests/Config_Test.cpp @@ -334,7 +334,7 @@ test_subkey_path (ACE_Configuration* config) } static int -run_tests (void) +run_tests () { int status; diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index 6a9c5f7f912..4986926a2a0 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -66,28 +66,17 @@ static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; typedef ACE_Null_Mutex ACCEPTOR_LOCKING; # else # include "ace/Process_Mutex.h" - typedef ACE_Process_Mutex ACCEPTOR_LOCKING; + using ACCEPTOR_LOCKING = ACE_Process_Mutex; # define CLEANUP_PROCESS_MUTEX # endif /* ACE_HAS_THREAD_SAFE_ACCEPT */ #endif /* ACE_LACKS_FORK */ -typedef ACE_Oneshot_Acceptor<Svc_Handler, - ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING> > - ACCEPTOR; -typedef ACE_Connector<Svc_Handler, - ACE_SOCK_CONNECTOR> - CONNECTOR; -typedef ACE_Strategy_Connector<Svc_Handler, - ACE_SOCK_CONNECTOR> - STRAT_CONNECTOR; -typedef ACE_NOOP_Creation_Strategy<Svc_Handler> - NULL_CREATION_STRATEGY; -typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler> - NULL_ACTIVATION_STRATEGY; -typedef ACE_Cached_Connect_Strategy<Svc_Handler, - ACE_SOCK_CONNECTOR, - ACE_SYNCH_MUTEX> - CACHED_CONNECT_STRATEGY; +using ACCEPTOR = ACE_Oneshot_Acceptor<Svc_Handler, ACE_LOCK_SOCK_Acceptor<ACCEPTOR_LOCKING>>; +using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>; +using STRAT_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>; +using NULL_CREATION_STRATEGY = ACE_NOOP_Creation_Strategy<Svc_Handler>; +using NULL_ACTIVATION_STRATEGY = ACE_NOOP_Concurrency_Strategy<Svc_Handler>; +using CACHED_CONNECT_STRATEGY = ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_Connector, ACE_MT_SYNCH::MUTEX>; #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX> #define REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> @@ -136,7 +125,7 @@ Svc_Handler::recycle (void *) } void -Svc_Handler::send_data (void) +Svc_Handler::send_data () { // Send data to server. @@ -148,7 +137,7 @@ Svc_Handler::send_data (void) } void -Svc_Handler::recv_data (void) +Svc_Handler::recv_data () { ACE_SOCK_Stream &new_stream = this->peer (); diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index e3f02ed8429..25d4212468e 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -31,9 +31,8 @@ #endif /* ACE_WIN32 */ // Declare the type of the symbol: -typedef Hello *(*Hello_Factory)(void); - -typedef int ( *PFN )( Parent* ); +using Hello_Factory = Hello *(*)(); +using PFN = int (*)(Parent *); int handle_test (ACE_DLL &dll) { diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index 65319575d12..c99cb06fc8c 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -16,31 +16,31 @@ #include "ace/svc_export.h" #include "ace/OS_NS_string.h" -Hello_Impl::Hello_Impl (void) +Hello_Impl::Hello_Impl () { ACE_DEBUG ((LM_DEBUG, "Hello_Impl::Hello_Impl\n")); } -Hello_Impl::~Hello_Impl (void) +Hello_Impl::~Hello_Impl () { ACE_DEBUG ((LM_DEBUG, "Hello_Impl::~Hello_Impl\n")); } void -Hello_Impl::say_next (void) +Hello_Impl::say_next () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("How are you?\n"))); } ACE_TCHAR * -Hello_Impl::new_info (void) +Hello_Impl::new_info () { return ACE::strnew (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE::strnew()")); } ACE_TCHAR * -Hello_Impl::malloc_info (void) +Hello_Impl::malloc_info () { return ACE_OS::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS::malloc()")); } @@ -94,12 +94,12 @@ get_hello (void) class Static_Constructor_Test { public: - Static_Constructor_Test (void) + Static_Constructor_Test () { ACE_DEBUG ((LM_DEBUG, "Static_Constructor_Test::Static_Constructor_Test\n")); } - ~Static_Constructor_Test (void) + ~Static_Constructor_Test () { ACE_DEBUG ((LM_DEBUG, "Static_Constructor_Test::~Static_Constructor_Test\n")); @@ -110,16 +110,16 @@ static Static_Constructor_Test the_instance; // -------------------------------------------------------- -Child::Child (void) +Child::Child () { } -Child::~Child (void) +Child::~Child () { } void -Child::test (void) +Child::test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("child called\n"))); } diff --git a/ACE/tests/DLL_Test_Parent.cpp b/ACE/tests/DLL_Test_Parent.cpp index 26c533d5518..4788c88f868 100644 --- a/ACE/tests/DLL_Test_Parent.cpp +++ b/ACE/tests/DLL_Test_Parent.cpp @@ -1,12 +1,12 @@ #include "DLL_Test_Parent.h" #include "ace/Log_Msg.h" -Parent::~Parent (void) +Parent::~Parent () { } void -Parent::test (void) +Parent::test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("parent called\n"))); } diff --git a/ACE/tests/DLList_Test.cpp b/ACE/tests/DLList_Test.cpp index f55028d3dc1..182664be037 100644 --- a/ACE/tests/DLList_Test.cpp +++ b/ACE/tests/DLList_Test.cpp @@ -15,10 +15,10 @@ #include "ace/SString.h" #include "ace/Malloc_T.h" -typedef ACE_TCHAR *ACE_STRING; -typedef ACE_DLList<ACE_STRING> STRLIST; -typedef ACE_DLList_Iterator<ACE_STRING> STRLIST_ITERATOR; -typedef ACE_DLList_Reverse_Iterator<ACE_STRING> STRLIST_REVERSE_ITERATOR; +using ACE_STRING = ACE_TCHAR *; +using STRLIST = ACE_DLList<ACE_STRING>; +using STRLIST_ITERATOR = ACE_DLList_Iterator<ACE_STRING>; +using STRLIST_REVERSE_ITERATOR = ACE_DLList_Reverse_Iterator<ACE_STRING>; static ACE_STRING string_table[] = { @@ -67,7 +67,7 @@ run_reverse_iterate (STRLIST &list) } static int -run_test (void) +run_test () { STRLIST list; diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index e5d231dd903..f33a16646cd 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -30,7 +30,7 @@ #include <queue> -typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; +using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; // ---------------------------------------------------- @@ -38,21 +38,21 @@ class Client : public SVC_HANDLER { public: - Client (void); + Client (); //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; std::string sent; std::string received; @@ -66,14 +66,14 @@ class Server : public SVC_HANDLER { public: - Server (void); + Server (); - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: int send_i (const char* buffer, @@ -85,7 +85,7 @@ private: // ---------------------------------------------------- -Client::Client (void) +Client::Client () : call_count_ (0) { } @@ -233,7 +233,7 @@ Client::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -Server::Server (void) +Server::Server () : offset_ (0) { } @@ -361,8 +361,8 @@ Server::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -typedef ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR> ACCEPTOR; -typedef ACE_Connector<Client, ACE_SOCK_CONNECTOR> CONNECTOR; +using ACCEPTOR = ACE_Acceptor<Server, ACE_SOCK_Acceptor>; +using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>; // ---------------------------------------------------- @@ -370,7 +370,7 @@ class TestAcceptor : public ACCEPTOR { public: - virtual int accept_svc_handler (Server * handler) + int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -400,14 +400,14 @@ class TestConnector : public CONNECTOR { public: - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, ACE_Time_Value *timeout, const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) + int perms) override { const int result = this->CONNECTOR::connect_svc_handler (handler, remote_addr, @@ -438,7 +438,7 @@ public: return result; } - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, CONNECTOR::handler_type *& sh_copy, const CONNECTOR::addr_type &remote_addr, @@ -446,7 +446,7 @@ public: const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) { + int perms) override { sh_copy = handler; return this->connect_svc_handler (handler, remote_addr, timeout, local_addr, reuse_addr, flags, diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index 3d023059334..14cfa9e27e8 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -36,7 +36,7 @@ #include "ace/OS_NS_netdb.h" -typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; +using SVC_HANDLER = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; // ---------------------------------------------------- @@ -44,19 +44,19 @@ class Client : public SVC_HANDLER { public: - Client (void); + Client (); //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: @@ -69,15 +69,15 @@ class Server : public SVC_HANDLER { public: - Server (void); + Server (); - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: @@ -87,7 +87,7 @@ private: // ---------------------------------------------------- -Client::Client (void) +Client::Client () : call_count_ (0) { } @@ -198,7 +198,7 @@ Client::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -Server::Server (void) +Server::Server () : call_count_ (0) { } @@ -310,8 +310,8 @@ Server::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -typedef ACE_Acceptor<Server, ACE_SOCK_ACCEPTOR> ACCEPTOR; -typedef ACE_Connector<Client, ACE_SOCK_CONNECTOR> CONNECTOR; +using ACCEPTOR = ACE_Acceptor<Server, ACE_SOCK_Acceptor>; +using CONNECTOR = ACE_Connector<Client, ACE_SOCK_Connector>; // ---------------------------------------------------- @@ -319,7 +319,7 @@ class TestAcceptor : public ACCEPTOR { public: - virtual int accept_svc_handler (Server * handler) + int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -369,14 +369,14 @@ class TestConnector : public CONNECTOR { public: - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, ACE_Time_Value *timeout, const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) + int perms) override { const int result = this->CONNECTOR::connect_svc_handler (handler, remote_addr, @@ -423,7 +423,7 @@ public: return result; } - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, CONNECTOR::handler_type *& sh_copy, const CONNECTOR::addr_type &remote_addr, @@ -431,7 +431,7 @@ public: const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) { + int perms) override { sh_copy = handler; return this->connect_svc_handler (handler, remote_addr, timeout, local_addr, reuse_addr, flags, diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp index 550ede491a0..118675e3730 100644 --- a/ACE/tests/Dirent_Test.cpp +++ b/ACE/tests/Dirent_Test.cpp @@ -55,7 +55,7 @@ comparator (const ACE_DIRENT **d1, const ACE_DIRENT **d2) } /* extern "C" */ static int -dirent_selector_test (void) +dirent_selector_test () { int n; int error = 0; @@ -156,7 +156,7 @@ dirent_selector_test (void) } static int -dirent_test (void) +dirent_test () { ACE_Dirent dir; @@ -315,7 +315,7 @@ dirent_count (const ACE_TCHAR *dir_path, } static int -dirent_recurse_test (void) +dirent_recurse_test () { int total_dirs = 0; int total_files = 0; diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index fa0cd5e7dba..ec9853d34ef 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -182,7 +182,7 @@ server (void *arg) } static int -test_fifo_msg (void) +test_fifo_msg () { // Reader side opens first - it may fail if fifo not supported on this // platform. diff --git a/ACE/tests/Framework_Component_DLL.cpp b/ACE/tests/Framework_Component_DLL.cpp index 2d3f50c687b..b3ef6c457a6 100644 --- a/ACE/tests/Framework_Component_DLL.cpp +++ b/ACE/tests/Framework_Component_DLL.cpp @@ -19,18 +19,18 @@ ACE_DLL_UNLOAD_POLICY (Framework_Component_DLL, ACE_DLL_UNLOAD_POLICY_LAZY) -Simple_Service::Simple_Service (void) +Simple_Service::Simple_Service () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::Simple_Service"); } -Simple_Service::~Simple_Service (void) +Simple_Service::~Simple_Service () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::~Simple_Service"); } const ACE_TCHAR * -Simple_Service::name (void) +Simple_Service::name () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::dll_name"); return ACE_TEXT ("Simple_Service"); @@ -42,7 +42,7 @@ template <int which> class Server_T : public ACE_Service_Object { public: - int init (int, ACE_TCHAR *[]) + int init (int, ACE_TCHAR *[]) override { FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::init"); @@ -55,18 +55,18 @@ public: return 0; } - int fini (void) + int fini () override { FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::fini"); return 0; } }; -typedef Server_T <1> Server_1; +using Server_1 = Server_T<1>; FRAMEWORK_COMPONENT_DLL_SINGLETON_DECLARATION(Server_T<1>;) ACE_FACTORY_DEFINE (Framework_Component_DLL, Server_1) -typedef Server_T <2> Server_2; +using Server_2 = Server_T<2>; FRAMEWORK_COMPONENT_DLL_SINGLETON_DECLARATION(Server_T<2>;) ACE_FACTORY_DEFINE (Framework_Component_DLL, Server_2) diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp index f2040536dfd..3648646a703 100644 --- a/ACE/tests/Future_Set_Test.cpp +++ b/ACE/tests/Future_Set_Test.cpp @@ -33,7 +33,7 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; +using ATOMIC_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>; // A counter for the tasks.. static ATOMIC_INT task_count (0); @@ -59,28 +59,28 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; /// Terminator. //FUZZ: enable check_for_lack_ACE_OS - virtual int shutdown (void); + virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (void); + ~Prime_Scheduler () override; // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const ACE_TCHAR*> name (void); - void end (void); + ACE_Future<const ACE_TCHAR*> name (); + void end (); protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (void); + int svc () override; // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); - const ACE_TCHAR *name_i (void); + const ACE_TCHAR *name_i (); private: // = These are the <Prime_Scheduler> implementation details. @@ -101,10 +101,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); + ~Method_Request_work () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Prime_Scheduler *scheduler_; @@ -133,14 +133,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler, ACE_TEXT ("(%t) Method_Request_work created\n"))); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_work will be deleted.\n"))); } int -Method_Request_work::call (void) +Method_Request_work::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -159,10 +159,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (void); + ~Method_Request_name () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Prime_Scheduler *scheduler_; @@ -178,14 +178,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler, ACE_TEXT ("(%t) Method_Request_name created\n"))); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_name will be deleted.\n"))); } int -Method_Request_name::call (void) +Method_Request_name::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -201,8 +201,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + ~Method_Request_end () override; + int call () override; private: Prime_Scheduler *scheduler_; @@ -213,12 +213,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler. this->scheduler_->shutdown (); @@ -241,7 +241,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname, // Destructor -Prime_Scheduler::~Prime_Scheduler (void) +Prime_Scheduler::~Prime_Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"), @@ -265,7 +265,7 @@ Prime_Scheduler::open (void *) // close int -Prime_Scheduler::shutdown (void) +Prime_Scheduler::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"), @@ -277,13 +277,13 @@ Prime_Scheduler::shutdown (void) // Service.. int -Prime_Scheduler::svc (void) +Prime_Scheduler::svc () { for (;;) { // Dequeue the next method request (we use an auto pointer in // case an exception is thrown in the <call>). - auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); + std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) calling method request\n"))); @@ -298,7 +298,7 @@ Prime_Scheduler::svc (void) } void -Prime_Scheduler::end (void) +Prime_Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -316,13 +316,13 @@ Prime_Scheduler::work_i (u_long param, } const ACE_TCHAR * -Prime_Scheduler::name_i (void) +Prime_Scheduler::name_i () { return this->name_; } ACE_Future<const ACE_TCHAR *> -Prime_Scheduler::name (void) +Prime_Scheduler::name () { if (this->scheduler_) // Delegate to the Prime_Scheduler. @@ -363,11 +363,11 @@ Prime_Scheduler::work (u_long newparam, // Total number of loops. static int n_loops = 100; -typedef ACE_Future_Rep<u_long> *u_long_key; -typedef ACE_Future_Holder<u_long> *u_long_value; +using u_long_key = ACE_Future_Rep<u_long> *; +using u_long_value = ACE_Future_Holder<u_long> *; -typedef ACE_Future_Rep<const ACE_TCHAR *> *char_star_key; -typedef ACE_Future_Holder<const ACE_TCHAR *> *char_star_value; +using char_star_key = ACE_Future_Rep<const ACE_TCHAR *> *; +using char_star_value = ACE_Future_Holder<const ACE_TCHAR *> *; #endif /* ACE_HAS_THREADS */ diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp index dc2b9e014f2..2340b684fe4 100644 --- a/ACE/tests/Future_Test.cpp +++ b/ACE/tests/Future_Test.cpp @@ -30,7 +30,7 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Atomic_Op<ACE_Thread_Mutex, int> ATOMIC_INT; +using ATOMIC_INT = ACE_Atomic_Op<ACE_Thread_Mutex, int>; // A counter for the tasks.. static ATOMIC_INT task_count (0); @@ -65,28 +65,28 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Terminator. - virtual int shutdown (void); + virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (void); + ~Prime_Scheduler () override; // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const ACE_TCHAR*> name (void); - void end (void); + ACE_Future<const ACE_TCHAR*> name (); + void end (); protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (void); + int svc () override; // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); - const ACE_TCHAR *name_i (void); + const ACE_TCHAR *name_i (); private: // = These are the <Prime_Scheduler> implementation details. @@ -107,10 +107,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); + ~Method_Request_work () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Prime_Scheduler *scheduler_; @@ -139,14 +139,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler, ACE_TEXT ("(%t) Method_Request_work created\n"))); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_work will be deleted.\n"))); } int -Method_Request_work::call (void) +Method_Request_work::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -165,10 +165,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (void); + ~Method_Request_name () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Prime_Scheduler *scheduler_; @@ -184,14 +184,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler, ACE_TEXT ("(%t) Method_Request_name created\n"))); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_name will be deleted.\n"))); } int -Method_Request_name::call (void) +Method_Request_name::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -207,8 +207,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + ~Method_Request_end () override; + int call () override; private: Prime_Scheduler *scheduler_; @@ -219,12 +219,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler. this->scheduler_->shutdown (); @@ -247,7 +247,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname, // Destructor -Prime_Scheduler::~Prime_Scheduler (void) +Prime_Scheduler::~Prime_Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"), @@ -271,7 +271,7 @@ Prime_Scheduler::open (void *) // close int -Prime_Scheduler::shutdown (void) +Prime_Scheduler::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"), @@ -283,13 +283,13 @@ Prime_Scheduler::shutdown (void) // Service.. int -Prime_Scheduler::svc (void) +Prime_Scheduler::svc () { for (;;) { // Dequeue the next method request (we use an auto pointer in // case an exception is thrown in the <call>). - auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); + std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) calling method request\n"))); @@ -304,7 +304,7 @@ Prime_Scheduler::svc (void) } void -Prime_Scheduler::end (void) +Prime_Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -322,13 +322,13 @@ Prime_Scheduler::work_i (u_long param, } const ACE_TCHAR * -Prime_Scheduler::name_i (void) +Prime_Scheduler::name_i () { return this->name_; } ACE_Future<const ACE_TCHAR *> -Prime_Scheduler::name (void) +Prime_Scheduler::name () { if (this->scheduler_) // Delegate to the Prime_Scheduler. diff --git a/ACE/tests/Handle_Set_Test.cpp b/ACE/tests/Handle_Set_Test.cpp index 27ecc58ee65..8444d495d6a 100644 --- a/ACE/tests/Handle_Set_Test.cpp +++ b/ACE/tests/Handle_Set_Test.cpp @@ -91,7 +91,7 @@ static ACE_HANDLE handle_vector[] = #endif /* ACE_WIN64 */ static void -test_boundaries (void) +test_boundaries () { ACE_Handle_Set handle_set; ACE_Unbounded_Set<ACE_HANDLE> set; diff --git a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp index c1b0a5233e6..2f2f8ac5422 100644 --- a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -51,17 +51,9 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } -typedef ACE_Hash_Map_Manager_Ex<ACE_UINT32, - ACE_UINT32, - ACE_Hash<ACE_UINT32>, - ACE_Equal_To<ACE_UINT32>, - ACE_SYNCH_NULL_MUTEX> HASH_MAP; - -typedef ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, - ACE_UINT32, - ACE_Hash<ACE_UINT32>, - ACE_Equal_To<ACE_UINT32>, - ACE_SYNCH_NULL_MUTEX> HASH_MAP_BUCKET_ITERATOR; +using HASH_MAP = ACE_Hash_Map_Manager_Ex<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_MT_SYNCH::NULL_MUTEX>; + +using HASH_MAP_BUCKET_ITERATOR = ACE_Hash_Map_Bucket_Iterator<ACE_UINT32, ACE_UINT32, ACE_Hash<ACE_UINT32>, ACE_Equal_To<ACE_UINT32>, ACE_MT_SYNCH::NULL_MUTEX>; int run_main (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp index ef9ffe69760..034c73e80ba 100644 --- a/ACE/tests/Hash_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Map_Manager_Test.cpp @@ -24,8 +24,7 @@ static const size_t STRING_TABLE_ENTRIES = 3 * 2; static const size_t MAX_HASH = 6; -typedef ACE_Hash_Map_Entry<const ACE_TCHAR *, - const ACE_TCHAR *> HASH_STRING_ENTRY; +using HASH_STRING_ENTRY = ACE_Hash_Map_Entry<const ACE_TCHAR *, const ACE_TCHAR *>; // @@ The following requires too much internal implementation // information about the <ACE_Hash_Map_Manager>. We need to figure @@ -35,29 +34,13 @@ static const size_t STRING_TABLE_SIZE = static ACE_Static_Allocator<STRING_TABLE_SIZE> ace_test_allocator; -typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, - const ACE_TCHAR *, - ACE_Hash<const ACE_TCHAR *>, - ACE_Equal_To<const ACE_TCHAR *>, - ACE_Null_Mutex> HASH_STRING_MAP; - -typedef ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, - const ACE_TCHAR *, - ACE_Hash<const ACE_TCHAR *>, - ACE_Equal_To<const ACE_TCHAR *>, - ACE_Null_Mutex> HASH_STRING_ITER; - -typedef ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *, - const ACE_TCHAR *, - ACE_Hash<const ACE_TCHAR *>, - ACE_Equal_To<const ACE_TCHAR *>, - ACE_Null_Mutex> HASH_STRING_CONST_ITER; - -typedef ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, - const ACE_TCHAR *, - ACE_Hash<const ACE_TCHAR *>, - ACE_Equal_To<const ACE_TCHAR *>, - ACE_Null_Mutex> HASH_STRING_REVERSE_ITER; +using HASH_STRING_MAP = ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; + +using HASH_STRING_ITER = ACE_Hash_Map_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; + +using HASH_STRING_CONST_ITER = ACE_Hash_Map_Const_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; + +using HASH_STRING_REVERSE_ITER = ACE_Hash_Map_Reverse_Iterator_Ex<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; struct String_Table { @@ -178,7 +161,7 @@ int test_two_allocators () } static int -run_test (void) +run_test () { ace_test_allocator.dump (); diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp index 8117f5763b7..144befd426b 100644 --- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp @@ -17,18 +17,14 @@ -typedef ACE_Hash_Multi_Map_Manager<const ACE_TCHAR *, - const ACE_TCHAR *, - ACE_Hash<const ACE_TCHAR *>, - ACE_Equal_To<const ACE_TCHAR *>, - ACE_Null_Mutex> HASH_STRING_MAP; - -typedef HASH_STRING_MAP::ENTRY HASH_STRING_ENTRY; -typedef HASH_STRING_ENTRY::VALUE_SET HASH_STRING_VALUE_SET; -typedef HASH_STRING_ENTRY::VALUE_SET_ITERATOR HASH_STRING_VALUE_SET_ITERATOR; -typedef HASH_STRING_MAP::ITERATOR HASH_STRING_ITERATOR; -typedef HASH_STRING_MAP::CONST_ITERATOR HASH_STRING_CONST_ITERATOR; -typedef HASH_STRING_MAP::REVERSE_ITERATOR HASH_STRING_REVERSE_ITERATOR; +using HASH_STRING_MAP = ACE_Hash_Multi_Map_Manager<const ACE_TCHAR *, const ACE_TCHAR *, ACE_Hash<const ACE_TCHAR *>, ACE_Equal_To<const ACE_TCHAR *>, ACE_Null_Mutex>; + +using HASH_STRING_ENTRY = HASH_STRING_MAP::ENTRY; +using HASH_STRING_VALUE_SET = HASH_STRING_ENTRY::VALUE_SET; +using HASH_STRING_VALUE_SET_ITERATOR = HASH_STRING_ENTRY::VALUE_SET_ITERATOR; +using HASH_STRING_ITERATOR = HASH_STRING_MAP::ITERATOR; +using HASH_STRING_CONST_ITERATOR = HASH_STRING_MAP::CONST_ITERATOR; +using HASH_STRING_REVERSE_ITERATOR = HASH_STRING_MAP::REVERSE_ITERATOR; static const ACE_TCHAR *color_sorts[] = {ACE_TEXT ("warm"), ACE_TEXT ("cold"), ACE_TEXT ("neutral"), 0}; static const ACE_TCHAR *warm_colors[] = {ACE_TEXT ("red"), ACE_TEXT ("yellow"), ACE_TEXT ("orange"), 0}; @@ -36,7 +32,7 @@ static const ACE_TCHAR *cold_colors[] = {ACE_TEXT ("blue"), ACE_TEXT ("cyan"), 0 static const ACE_TCHAR *neutral_colors[] = {ACE_TEXT ("green"), ACE_TEXT ("purple"), 0}; static int -run_test (void) +run_test () { HASH_STRING_MAP colors; diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index cfcc9dce132..ff1b5f8fe6e 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -51,7 +51,7 @@ static int check_type_consistency (const ACE_INET_Addr &addr) return 0; } -static bool test_tao_use (void) +static bool test_tao_use () { char host[256]; if (::gethostname (host, 255) != 0) @@ -85,7 +85,7 @@ static bool test_tao_use (void) return true; } -static bool test_port_assignment (void) +static bool test_port_assignment () { #if defined (ACE_HAS_IPV6) ACE_INET_Addr addr1 (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6); @@ -110,7 +110,7 @@ static bool test_port_assignment (void) return true; } -static bool test_multiple (void) +static bool test_multiple () { bool success = true; diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index 61e5dc9d32e..0ba6b9fad83 100644 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp @@ -21,7 +21,7 @@ using namespace ACE_Utils; // ---------------------------------------------------- bool -sizeof_from_lt_sizeof_to (void) +sizeof_from_lt_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) < sizeof(TO) test\n"))); @@ -30,8 +30,8 @@ sizeof_from_lt_sizeof_to (void) // signed from_type, unsigned to_type { - typedef signed char from_type; - typedef unsigned int to_type; + using from_type = signed char; + using to_type = unsigned int; ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type)); @@ -50,8 +50,8 @@ sizeof_from_lt_sizeof_to (void) // unsigned from_type, signed to_type { - typedef unsigned char from_type; - typedef signed int to_type; + using from_type = unsigned char; + using to_type = int; ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type)); @@ -70,8 +70,8 @@ sizeof_from_lt_sizeof_to (void) // signed from_type, signed to_type { - typedef signed char from_type; - typedef signed int to_type; + using from_type = signed char; + using to_type = int; ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type)); @@ -92,8 +92,8 @@ sizeof_from_lt_sizeof_to (void) // unsigned from_type, unsigned to_type { - typedef unsigned char from_type; - typedef unsigned int to_type; + using from_type = unsigned char; + using to_type = unsigned int; ACE_TEST_ASSERT (sizeof (from_type) < sizeof (to_type)); @@ -120,7 +120,7 @@ sizeof_from_lt_sizeof_to (void) } bool -sizeof_from_eq_sizeof_to (void) +sizeof_from_eq_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) == sizeof(TO) test\n"))); @@ -129,8 +129,8 @@ sizeof_from_eq_sizeof_to (void) // signed from_type, unsigned to_type { - typedef signed int from_type; - typedef unsigned int to_type; + using from_type = int; + using to_type = unsigned int; ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type)); @@ -151,8 +151,8 @@ sizeof_from_eq_sizeof_to (void) // unsigned from_type, signed to_type { - typedef unsigned int from_type; - typedef signed int to_type; + using from_type = unsigned int; + using to_type = int; ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type)); @@ -171,8 +171,8 @@ sizeof_from_eq_sizeof_to (void) // signed from_type, signed to_type { - typedef signed int from_type; - typedef signed int to_type; + using from_type = int; + using to_type = int; ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type)); @@ -193,8 +193,8 @@ sizeof_from_eq_sizeof_to (void) // unsigned from_type, unsigned to_type { - typedef unsigned int from_type; - typedef unsigned int to_type; + using from_type = unsigned int; + using to_type = unsigned int; ACE_TEST_ASSERT (sizeof (from_type) == sizeof (to_type)); @@ -221,7 +221,7 @@ sizeof_from_eq_sizeof_to (void) } bool -sizeof_from_gt_sizeof_to (void) +sizeof_from_gt_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) > sizeof(TO) test\n"))); @@ -230,8 +230,8 @@ sizeof_from_gt_sizeof_to (void) // signed from_type, unsigned to_type { - typedef signed int from_type; - typedef unsigned char to_type; + using from_type = int; + using to_type = unsigned char; ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type)); @@ -250,8 +250,8 @@ sizeof_from_gt_sizeof_to (void) // unsigned from_type, signed to_type { - typedef unsigned int from_type; - typedef signed char to_type; + using from_type = unsigned int; + using to_type = signed char; ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type)); @@ -270,8 +270,8 @@ sizeof_from_gt_sizeof_to (void) // signed from_type, signed to_type { - typedef signed int from_type; - typedef signed char to_type; + using from_type = int; + using to_type = signed char; ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type)); @@ -292,8 +292,8 @@ sizeof_from_gt_sizeof_to (void) // unsigned from_type, unsigned to_type { - typedef unsigned int from_type; - typedef unsigned char to_type; + using from_type = unsigned int; + using to_type = unsigned char; ACE_TEST_ASSERT (sizeof (from_type) > sizeof (to_type)); @@ -332,7 +332,7 @@ template <typename T> struct Caller : public std::unary_function<T, void> { /// Constructor - Caller (void) : success (true) {} + Caller () : success (true) {} /// Function call operator overload. void operator() (T f) @@ -352,7 +352,7 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Integer_Truncate_Test")); - typedef bool (*test_func) (); + using test_func = bool (*)(); static test_func const tests[] = { diff --git a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp index fd6e5bc72a3..68e665d0e13 100644 --- a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp +++ b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp @@ -36,7 +36,7 @@ public: return this->ref == howmany; } - static bool was_released (void) + static bool was_released () { return released; } diff --git a/ACE/tests/Lazy_Map_Manager_Test.cpp b/ACE/tests/Lazy_Map_Manager_Test.cpp index 7af3f0b0675..22bae652ccc 100644 --- a/ACE/tests/Lazy_Map_Manager_Test.cpp +++ b/ACE/tests/Lazy_Map_Manager_Test.cpp @@ -19,7 +19,7 @@ // Simple map manager. -typedef ACE_Map_Manager<int, int, ACE_Null_Mutex> LAZY_MAP; +using LAZY_MAP = ACE_Map_Manager<int, int, ACE_Null_Mutex>; // Displaying the contents of a map manager. @@ -64,7 +64,7 @@ display_map (LAZY_MAP &map) // Test for map manager. void -map_test (void) +map_test () { // Map of size 3. LAZY_MAP map (3); @@ -163,7 +163,7 @@ map_test (void) } // Simple active map manager. -typedef ACE_Active_Map_Manager<int> ACTIVE_MAP; +using ACTIVE_MAP = ACE_Active_Map_Manager<int>; // Displaying the contents of an active map manager. @@ -209,7 +209,7 @@ display_map (ACTIVE_MAP &map) // Test for active map manager. void -active_map_test (void) +active_map_test () { // Map of size 3. ACTIVE_MAP map (3); diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp index d4579da6044..8a37c7a118a 100644 --- a/ACE/tests/Log_Msg_Backend_Test.cpp +++ b/ACE/tests/Log_Msg_Backend_Test.cpp @@ -25,19 +25,19 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (const ACE_TCHAR *logger_key); + int open (const ACE_TCHAR *logger_key) override; - virtual int reset (void); + int reset () override; //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (void); + int close () override; - virtual ssize_t log (ACE_Log_Record &log_record); + ssize_t log (ACE_Log_Record &log_record) override; // Test probes to see if things worked as specified. - bool hooks_ok (void) const; - unsigned int log_count (void) const { return this->log_count_; } + bool hooks_ok () const; + unsigned int log_count () const { return this->log_count_; } private: bool reset_; @@ -54,14 +54,14 @@ Backend::open (const ACE_TCHAR *) } int -Backend::reset (void) +Backend::reset () { this->reset_ = true; return 0; } int -Backend::close (void) +Backend::close () { return 0; } @@ -75,7 +75,7 @@ Backend::log (ACE_Log_Record &) // Test probes to see if things worked as specified. bool -Backend::hooks_ok (void) const +Backend::hooks_ok () const { // Close should not have been called yet. const ACE_TCHAR *yes = ACE_TEXT ("yes"); diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 3bc006c0113..66f725a61b6 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -32,14 +32,14 @@ #include "ace/Thread.h" static void -cleanup (void) +cleanup () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("cleanup hook (%P)!\n"))); } static void -cause_error (void) +cause_error () { errno = EWOULDBLOCK; ACE_ERROR ((LM_DEBUG, @@ -54,7 +54,7 @@ public: Logger (bool be_recursive = true); /// Logging callback - void log (ACE_Log_Record &log_record); + void log (ACE_Log_Record &log_record) override; void verbose (bool be_verbose); @@ -138,7 +138,7 @@ Logger::log (ACE_Log_Record &log_record) } static void -test_callbacks (void) +test_callbacks () { // This message should show up in stderr. ACE_DEBUG ((LM_DEBUG, @@ -367,7 +367,7 @@ public: } /// Logging callback - void log (ACE_Log_Record &) + void log (ACE_Log_Record &) override { ++count_; } @@ -459,7 +459,7 @@ test_acelib_category() } static int -test_ostream (void) +test_ostream () { // This message should show up in the log file. ACE_DEBUG ((LM_DEBUG, @@ -586,7 +586,7 @@ public: Log_Spec_Verify (bool be_recursive = true) : fail_ (0), tests_ (0), recursive_ (be_recursive) {}; /// Logging callback - void log (ACE_Log_Record &log_record); + void log (ACE_Log_Record &log_record) override; int result (); @@ -704,7 +704,7 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record) } int -Log_Spec_Verify::result (void) +Log_Spec_Verify::result () { if (this->fail_ == 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All logging specifier tests passed.\n"))); @@ -722,7 +722,7 @@ Log_Spec_Verify::result (void) } static int -test_format_specs (void) +test_format_specs () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l1:%l\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l2:%5l\n"))); diff --git a/ACE/tests/Log_Thread_Inheritance_Test.cpp b/ACE/tests/Log_Thread_Inheritance_Test.cpp index 78c4f687fba..7f35886b04c 100644 --- a/ACE/tests/Log_Thread_Inheritance_Test.cpp +++ b/ACE/tests/Log_Thread_Inheritance_Test.cpp @@ -19,7 +19,7 @@ int run_main (int, ACE_TCHAR *[]) #ifdef ACE_HAS_PTHREADS struct Inheritor : ACE_Task_Base { - int svc () + int svc () override { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - this test might crash ACE if it does not " "have the fix for the second bug in #3480.\n")); @@ -69,7 +69,7 @@ struct MyThread : ACE_Task_Base bool openfile_; static MyThread childthread_; - int svc () + int svc () override { if (openfile_) { diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 700d697dbf2..7cf9d41bc17 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -95,7 +95,7 @@ run_reactor (void *) // Initiate the cycle of messages. static -void print_till_death (void) +void print_till_death () { ACE_DEBUG ((LM_DEBUG, "\n-> start generating messages...\n")); @@ -125,7 +125,7 @@ void print_till_death (void) // Count the generated files. static void -count_files (void) +count_files () { int i = 0; int error = 0; @@ -217,7 +217,7 @@ get_statistics (ACE_TCHAR *f_name) // analyse the file order static void -order (void) +order () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n-> start testing order...\n"))); @@ -283,7 +283,7 @@ order (void) // remove log_files static void -remove_files (void) +remove_files () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-> removing existent files...\n"))); diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp index 0819d766df4..8cc11482e4a 100644 --- a/ACE/tests/MEM_Stream_Test.cpp +++ b/ACE/tests/MEM_Stream_Test.cpp @@ -63,14 +63,14 @@ static const int opt_wfmo_reactor = 1; static int opt_select_reactor = 1; static ACE_MEM_IO::Signal_Strategy client_strategy = ACE_MEM_IO::Reactive; -typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, u_short> WaitingCounter; -typedef ACE_Singleton <WaitingCounter, ACE_SYNCH_RECURSIVE_MUTEX> Waiting; +using WaitingCounter = ACE_Atomic_Op<ACE_MT_SYNCH::MUTEX, u_short>; +using Waiting = ACE_Singleton<WaitingCounter, ACE_MT_SYNCH::RECURSIVE_MUTEX>; // Number of connections that are currently open static u_short connection_count = 0; -typedef ACE_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> ACCEPTOR; -typedef ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_ACCEPTOR> S_ACCEPTOR; +using ACCEPTOR = ACE_Acceptor<Echo_Handler, ACE_MEM_Acceptor>; +using S_ACCEPTOR = ACE_Strategy_Acceptor<Echo_Handler, ACE_MEM_Acceptor>; void reset_handler (int conn) { @@ -151,7 +151,7 @@ Echo_Handler::handle_close (ACE_HANDLE, } int -Echo_Handler::svc (void) +Echo_Handler::svc () { while (this->handle_input (this->get_handle ()) >= 0) continue; @@ -223,7 +223,7 @@ connect_client (void *arg) #endif void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; diff --git a/ACE/tests/MM_Shared_Memory_Test.cpp b/ACE/tests/MM_Shared_Memory_Test.cpp index 74b4f1ec4f5..a291d1fa321 100644 --- a/ACE/tests/MM_Shared_Memory_Test.cpp +++ b/ACE/tests/MM_Shared_Memory_Test.cpp @@ -136,7 +136,7 @@ parent (void * = 0) } static int -spawn (void) +spawn () { // Create the synchronizer before spawning the child process/thread, // to avoid race condition between the creation in the parent and diff --git a/ACE/tests/MT_NonBlocking_Connect_Test.cpp b/ACE/tests/MT_NonBlocking_Connect_Test.cpp index ef8a018dd66..93a0a8706c5 100644 --- a/ACE/tests/MT_NonBlocking_Connect_Test.cpp +++ b/ACE/tests/MT_NonBlocking_Connect_Test.cpp @@ -56,16 +56,16 @@ static const ACE_TCHAR* hosts[] = { class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - Svc_Handler (void) + Svc_Handler () { ACE_TEST_ASSERT (0); } Svc_Handler (ACE_Thread_Manager *); - int open (void *); + int open (void *) override; - int close (u_long flags); + int close (u_long flags) override; bool connected_; }; @@ -98,7 +98,7 @@ class Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg); + int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg) override; }; template<class SVC_HANDLER> int @@ -121,12 +121,10 @@ Concurrency_Strategy<SVC_HANDLER>:: } } -typedef ACE_Creation_Strategy<Svc_Handler> CREATION_STRATEGY; -typedef ACE_Connect_Strategy<Svc_Handler, - ACE_SOCK_CONNECTOR> CONNECT_STRATEGY; -typedef Concurrency_Strategy<Svc_Handler> CONCURRENCY_STRATEGY; -typedef ACE_Strategy_Connector<Svc_Handler, - ACE_SOCK_CONNECTOR> BASE_CONNECTOR; +using CREATION_STRATEGY = ACE_Creation_Strategy<Svc_Handler>; +using CONNECT_STRATEGY = ACE_Connect_Strategy<Svc_Handler, ACE_SOCK_Connector>; +using CONCURRENCY_STRATEGY = Concurrency_Strategy<Svc_Handler>; +using BASE_CONNECTOR = ACE_Strategy_Connector<Svc_Handler, ACE_SOCK_Connector>; class Connect_Thread : public ACE_Task_Base { @@ -144,7 +142,7 @@ public: &this->cns_, &this->cts_, &this->cys_); } - int svc (void); + int svc () override; private: ACE_Reactor &reactor_; @@ -159,7 +157,7 @@ private: }; int -Connect_Thread::svc (void) +Connect_Thread::svc () { size_t const nr_names = sizeof hosts / sizeof (char *); ACE_INET_Addr *addresses = new ACE_INET_Addr[nr_names]; diff --git a/ACE/tests/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp index d37f4a01e92..85cedf6f5c4 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.cpp +++ b/ACE/tests/MT_Reactor_Timer_Test.cpp @@ -34,7 +34,7 @@ // destructor for Time_Handler insures that everything happened // correctly. -Time_Handler::Time_Handler (void) +Time_Handler::Time_Handler () { for (int i = 0; i < Time_Handler::TIMER_SLOTS; @@ -49,7 +49,7 @@ Time_Handler::Time_Handler (void) // starts. void -Time_Handler::setup (void) +Time_Handler::setup () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -66,7 +66,7 @@ Time_Handler::setup (void) } int -Time_Handler::verify_results (void) +Time_Handler::verify_results () { ACE_TEST_ASSERT (this->timer_id_[0] == Time_Handler::TIMER_FIRED); ACE_TEST_ASSERT (this->timer_id_[1] == Time_Handler::TIMER_FIRED); @@ -83,7 +83,7 @@ Time_Handler::verify_results (void) } int -Time_Handler::svc (void) +Time_Handler::svc () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -145,7 +145,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, #endif /* ACE_HAS_THREADS */ -Dispatch_Count_Handler::Dispatch_Count_Handler (void) +Dispatch_Count_Handler::Dispatch_Count_Handler () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -245,7 +245,7 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv, } int -Dispatch_Count_Handler::verify_results (void) +Dispatch_Count_Handler::verify_results () { int result = 0; diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp index 65aaa050b78..207233b05aa 100644 --- a/ACE/tests/MT_Reactor_Upcall_Test.cpp +++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp @@ -42,7 +42,7 @@ public: lock.acquire (); } - ~Guard (void) + ~Guard () { if (lock_upcall) this->lock_.release (); @@ -68,7 +68,7 @@ class Handler : public ACE_Event_Handler { public: Handler (ACE_Reactor &reactor); - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; ACE_Pipe pipe_; int number_of_messages_read_; @@ -178,7 +178,7 @@ class Event_Loop_Task : public ACE_Task_Base { public: Event_Loop_Task (ACE_Reactor &reactor); - int svc (void); + int svc () override; private: ACE_Reactor &reactor_; @@ -190,7 +190,7 @@ Event_Loop_Task::Event_Loop_Task (ACE_Reactor &reactor) } int -Event_Loop_Task::svc (void) +Event_Loop_Task::svc () { return this->reactor_.run_reactor_event_loop (); } diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index 8a25fcf5b10..f9d2d2156c6 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -139,22 +139,22 @@ class Pipe { public: - Pipe (void); + Pipe (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - int open (void); + int open (); - ACE_HANDLE read_handle (void) const; + ACE_HANDLE read_handle () const; - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; private: ACE_HANDLE handles_[2]; }; int -Pipe::open (void) +Pipe::open () { ACE_INET_Addr my_addr; ACE_SOCK_Acceptor acceptor; @@ -200,20 +200,20 @@ Pipe::open (void) return 0; } -Pipe::Pipe (void) +Pipe::Pipe () { this->handles_[0] = ACE_INVALID_HANDLE; this->handles_[1] = ACE_INVALID_HANDLE; } ACE_HANDLE -Pipe::read_handle (void) const +Pipe::read_handle () const { return this->handles_[0]; } ACE_HANDLE -Pipe::write_handle (void) const +Pipe::write_handle () const { return this->handles_[1]; } @@ -230,15 +230,15 @@ public: Sender (ACE_HANDLE handle, Connection_Cache &connection_cache); - ~Sender (void); + ~Sender () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - ssize_t send_message (void); + ssize_t send_message (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void close (void); + void close (); ACE_HANDLE handle_; @@ -250,21 +250,21 @@ class Connection_Cache { public: - Connection_Cache (void); + Connection_Cache (); - ~Connection_Cache (void); + ~Connection_Cache (); void add_connection (Sender *sender); void remove_connection (Sender *sender); - Sender *acquire_connection (void); + Sender *acquire_connection (); void release_connection (Sender *sender); int find (Sender *sender); - ACE_SYNCH_MUTEX &lock (void); + ACE_SYNCH_MUTEX &lock (); enum State { @@ -299,7 +299,7 @@ Sender::Sender (ACE_HANDLE handle, this->reference_count_.load ())); } -Sender::~Sender (void) +Sender::~Sender () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -334,7 +334,7 @@ Sender::handle_input (ACE_HANDLE) } void -Sender::close (void) +Sender::close () { // Remove socket from Reactor (may fail if another thread has already // removed the handle from the Reactor). @@ -348,7 +348,7 @@ Sender::close (void) } ssize_t -Sender::send_message (void) +Sender::send_message () { ACE_Time_Value timeout (0, close_timeout * 1000); @@ -365,7 +365,7 @@ public: Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor); - int svc (void); + int svc () override; ACE_Reactor &reactor_; @@ -379,17 +379,17 @@ public: ACE_HANDLE handle, int nested_upcalls); - ~Receiver (void); + ~Receiver () override; - int svc (void); + int svc () override; //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - int close (u_long flags); + int close (u_long flags) override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int resume_handler (void); + int resume_handler () override; ACE_HANDLE handle_; @@ -420,7 +420,7 @@ Receiver::Receiver (ACE_Thread_Manager &thread_manager, this->reference_count_.load ())); } -Receiver::~Receiver (void) +Receiver::~Receiver () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -432,7 +432,7 @@ Receiver::~Receiver (void) } int -Receiver::svc (void) +Receiver::svc () { // // Continuously receive messages from the Sender. On error, exit @@ -522,7 +522,7 @@ Receiver::handle_input (ACE_HANDLE handle) } int -Receiver::resume_handler (void) +Receiver::resume_handler () { /// The application takes responsibility of resuming the handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -636,7 +636,7 @@ Connector::connect (ACE_HANDLE &client_handle, return 0; } -Connection_Cache::Connection_Cache (void) +Connection_Cache::Connection_Cache () { // Initialize the connection cache. this->entries_ = @@ -698,7 +698,7 @@ Connection_Cache::remove_connection (Sender *sender) } Sender * -Connection_Cache::acquire_connection (void) +Connection_Cache::acquire_connection () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -741,12 +741,12 @@ Connection_Cache::release_connection (Sender *sender) } ACE_SYNCH_MUTEX & -Connection_Cache::lock (void) +Connection_Cache::lock () { return this->lock_; } -Connection_Cache::~Connection_Cache (void) +Connection_Cache::~Connection_Cache () { for (int i = 0; i < number_of_connections; ++i) { @@ -769,9 +769,9 @@ public: int run_receiver_thread, int nested_upcalls); - int svc (void); + int svc () override; - Sender *create_connection (void); + Sender *create_connection (); Connection_Cache &connection_cache_; @@ -808,7 +808,7 @@ Invocation_Thread::Invocation_Thread (ACE_Thread_Manager &thread_manager, } Sender * -Invocation_Thread::create_connection (void) +Invocation_Thread::create_connection () { int result = 0; @@ -867,7 +867,7 @@ Invocation_Thread::create_connection (void) } int -Invocation_Thread::svc (void) +Invocation_Thread::svc () { int connection_counter = 0; ACE_DEBUG ((LM_DEBUG, @@ -977,7 +977,7 @@ public: int make_invocations, int run_receiver_thread); - int svc (void); + int svc () override; ACE_Auto_Event &new_connection_event_; @@ -1003,7 +1003,7 @@ Close_Socket_Thread::Close_Socket_Thread (ACE_Thread_Manager &thread_manager, } int -Close_Socket_Thread::svc (void) +Close_Socket_Thread::svc () { unsigned int seed = (unsigned int) ACE_OS::time (); ACE_Time_Value timeout (0, close_timeout * 1000); @@ -1083,7 +1083,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager, } int -Event_Loop_Thread::svc (void) +Event_Loop_Thread::svc () { // Simply run the event loop. this->reactor_.owner (ACE_Thread::self ()); @@ -1110,7 +1110,7 @@ public: ACE_Reactor &reactor, Connection_Cache &connection_cache); - int svc (void); + int svc () override; ACE_Reactor &reactor_; @@ -1128,7 +1128,7 @@ Purger_Thread::Purger_Thread (ACE_Thread_Manager &thread_manager, } int -Purger_Thread::svc (void) +Purger_Thread::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) Purger_Thread::svc commencing\n"))); diff --git a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp index 609e78681ae..a1ba7346316 100644 --- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp @@ -38,19 +38,19 @@ class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (void); + Reference_Counted_Event_Handler (); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference () override; }; -Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::Reference_Counted_Event_Handler () { this->reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); @@ -63,7 +63,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void) this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { if (debug) ACE_DEBUG @@ -101,7 +101,7 @@ Reference_Counted_Event_Handler::handle_input (ACE_HANDLE) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::add_reference (void) +Reference_Counted_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -115,7 +115,7 @@ Reference_Counted_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::remove_reference (void) +Reference_Counted_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -134,9 +134,9 @@ public: Simple_Event_Handler (int notifies); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; int notifies_; }; @@ -148,7 +148,7 @@ Simple_Event_Handler::Simple_Event_Handler (int notifies) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n"))); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n"))); @@ -177,7 +177,7 @@ public: ACE_Reactor &reactor, int extra_iterations_needed); - int svc (void); + int svc () override; ACE_Reactor &reactor_; @@ -194,7 +194,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager, } int -Event_Loop_Thread::svc (void) +Event_Loop_Thread::svc () { int counter = 0; diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 02b6854d416..430e23c74f7 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -28,7 +28,7 @@ #if defined (ACE_HAS_PROCESS_SPAWN) #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) -typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC; +using MALLOC = ACE_Malloc_T<ACE_MMAP_Memory_Pool, ACE_Process_Mutex, ACE_PI_Control_Block>; #else typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> MALLOC; #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ @@ -87,7 +87,7 @@ static const void *CHILD_BASE_ADDR = static MALLOC * myallocator (const void *base_addr = 0) { - static auto_ptr<MALLOC> static_allocator; + static std::unique_ptr<MALLOC> static_allocator; if (static_allocator.get () == 0) { @@ -279,7 +279,7 @@ parent (Test_Data *data) } static int -child (void) +child () { void *bar = 0; // Perform "busy waiting" here until the parent stores data under a diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp index 0653aa3db17..d8469469dfc 100644 --- a/ACE/tests/Manual_Event_Test.cpp +++ b/ACE/tests/Manual_Event_Test.cpp @@ -39,7 +39,7 @@ static ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> n_awoken2; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Map_Manager_Test.cpp b/ACE/tests/Map_Manager_Test.cpp index 2a52e40804b..d55135235f7 100644 --- a/ACE/tests/Map_Manager_Test.cpp +++ b/ACE/tests/Map_Manager_Test.cpp @@ -22,51 +22,31 @@ #include "ace/Hash_Cache_Map_Manager_T.h" #include "ace/Caching_Strategies_T.h" -typedef ACE_Null_Mutex MUTEX; -typedef ACE_UINT32 TYPE; -typedef ACE_Active_Map_Manager_Key - ACTIVE_KEY; -typedef ACE_Hash<TYPE> - HASH_KEY; -typedef ACE_Equal_To<TYPE> - COMPARE_KEYS; - -typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> - MAP_MANAGER; -typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> - ITERATOR; -typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> - REVERSE_ITERATOR; -typedef ACE_Map_Entry <TYPE, TYPE> - MAP_ENTRY; -typedef ACE_Hash_Map_Manager_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> - HASH_MAP_MANAGER; -typedef ACE_Hash_Map_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> - HASH_ITERATOR; -typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> - HASH_REVERSE_ITERATOR; -typedef ACE_Hash_Map_Entry <TYPE, TYPE> - HASH_ENTRY; -typedef ACE_Active_Map_Manager <TYPE> - ACTIVE_MAP_MANAGER; - -typedef ACE_Hash_Map_Manager_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX> - CACHE_MAP_IMPL; -typedef ACE_Hash_Map_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX> - CACHE_ITER_IMPL; -typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX> - CACHE_REV_ITER_IMPL; -typedef int ATTR; -typedef ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL> - NULL_CLEANUP; -typedef ACE_Null_Caching_Utility <TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR> - NULL_UTILITY; -typedef ACE_Null_Caching_Strategy<ATTR, NULL_UTILITY> - NULL_CACHING_STRATEGY; -typedef ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR> - CACHE_MAP_MANAGER; -typedef ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR> - HASH_CACHE_MAP_MANAGER; +using MUTEX = ACE_Null_Mutex; +using TYPE = ACE_UINT32; +using ACTIVE_KEY = ACE_Active_Map_Manager_Key; +using HASH_KEY = ACE_Hash<TYPE>; +using COMPARE_KEYS = ACE_Equal_To<TYPE>; + +using MAP_MANAGER = ACE_Map_Manager<TYPE, TYPE, MUTEX>; +using ITERATOR = ACE_Map_Iterator<TYPE, TYPE, MUTEX>; +using REVERSE_ITERATOR = ACE_Map_Reverse_Iterator<TYPE, TYPE, MUTEX>; +using MAP_ENTRY = ACE_Map_Entry<TYPE, TYPE>; +using HASH_MAP_MANAGER = ACE_Hash_Map_Manager_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; +using HASH_ITERATOR = ACE_Hash_Map_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; +using HASH_REVERSE_ITERATOR = ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX>; +using HASH_ENTRY = ACE_Hash_Map_Entry<TYPE, TYPE>; +using ACTIVE_MAP_MANAGER = ACE_Active_Map_Manager<TYPE>; + +using CACHE_MAP_IMPL = ACE_Hash_Map_Manager_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>; +using CACHE_ITER_IMPL = ACE_Hash_Map_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>; +using CACHE_REV_ITER_IMPL = ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>; +using ATTR = int; +using NULL_CLEANUP = ANCLE<TYPE, TYPE, CACHE_MAP_IMPL>; +using NULL_UTILITY = ACE_Null_Caching_Utility<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, ATTR>; +using NULL_CACHING_STRATEGY = ANULL<ATTR, NULL_UTILITY>; +using CACHE_MAP_MANAGER = ACMM<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>; +using HASH_CACHE_MAP_MANAGER = ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>; static int test_cache_map_manager (size_t table_size, diff --git a/ACE/tests/Map_Test.cpp b/ACE/tests/Map_Test.cpp index 6de7224501e..91c55896b43 100644 --- a/ACE/tests/Map_Test.cpp +++ b/ACE/tests/Map_Test.cpp @@ -25,19 +25,19 @@ : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) // Value type. -typedef size_t VALUE; +using VALUE = size_t; // Generic map type. -typedef ACE_Map<KEY, VALUE> TEST_MAP; +using TEST_MAP = ACE_Map<KEY, VALUE>; // Manager Manager adapter. -typedef ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator> MAP_MANAGER_ADAPTER; +using MAP_MANAGER_ADAPTER = ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>; // Hash Manager Manager adapter. -typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, Key_Generator> HASH_MAP_MANAGER_ADAPTER; +using HASH_MAP_MANAGER_ADAPTER = ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, Key_Generator>; // Active Manager Manager adapter. -typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER; +using ACTIVE_MAP_MANAGER_ADAPTER = ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>; static void functionality_test (TEST_MAP &map, diff --git a/ACE/tests/Message_Block_Test.cpp b/ACE/tests/Message_Block_Test.cpp index 02e9d506805..2dd86736e0e 100644 --- a/ACE/tests/Message_Block_Test.cpp +++ b/ACE/tests/Message_Block_Test.cpp @@ -35,7 +35,7 @@ class User_Data : public ACE_Data_Block public: User_Data() {} - ~User_Data() + ~User_Data() override { ACE_DEBUG((LM_DEBUG, ACE_TEXT ("User_Data dtor\n"))); user_data_dtor_called = true; @@ -58,20 +58,20 @@ class Worker_Task : public ACE_Task<ACE_MT_SYNCH> { public: /// Activate the task. - Worker_Task (void); + Worker_Task (); /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + int svc () override; /// Allows the producer to pass messages to the <Message_Block>. - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override; private: //FUZZ: disable check_for_lack_ACE_OS /// Close hook. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; }; int @@ -93,7 +93,7 @@ Worker_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // other threads to complete this iteration. int -Worker_Task::svc (void) +Worker_Task::svc () { // The <ACE_Task::svc_run()> method automatically adds us to the // process-wide <ACE_Thread_Manager> when the thread begins. @@ -238,7 +238,7 @@ Worker_Task::svc (void) return 0; } -Worker_Task::Worker_Task (void) +Worker_Task::Worker_Task () { // Make us an Active Object. if (this->activate (THR_NEW_LWP) == -1) diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 2040c18c301..91cb7138a5d 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -62,13 +62,13 @@ public: Message_Handler (ACE_Reactor &reactor); // = Demuxing hooks. - virtual int handle_input (ACE_HANDLE); - virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE); - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_input (ACE_HANDLE) override; + int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; + int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; private: - int process_message (void); - void make_message (void); + int process_message (); + void make_message (); ACE_Reactor_Notification_Strategy notification_strategy_; }; @@ -82,15 +82,15 @@ private: class Watermark_Test : public ACE_Task<ACE_SYNCH> { public: - Watermark_Test (void); + Watermark_Test (); - virtual int svc (void); + int svc () override; - int consumer (void); - int producer (void); + int consumer (); + int producer (); int put_message (ACE_Time_Value* timeout = 0); - int get_message (void); - void print_producer_debug_message (void); + int get_message (); + void print_producer_debug_message (); private: const size_t len_; @@ -152,7 +152,7 @@ Message_Handler::handle_exception (ACE_HANDLE fd) } int -Message_Handler::process_message (void) +Message_Handler::process_message () { ACE_Message_Block *mb = 0; @@ -175,7 +175,7 @@ Message_Handler::process_message (void) } void -Message_Handler::make_message (void) +Message_Handler::make_message () { if (--iterations > 0) { @@ -189,7 +189,7 @@ Message_Handler::make_message (void) } } -Watermark_Test::Watermark_Test (void) +Watermark_Test::Watermark_Test () : len_ (ACE_OS::strlen (default_message) + 1), hwm_ (this->len_ * default_high_water_mark), lwm_ (this->len_ * default_low_water_mark), @@ -206,7 +206,7 @@ Watermark_Test::Watermark_Test (void) } int -Watermark_Test::producer (void) +Watermark_Test::producer () { int i = watermark_iterations; @@ -244,7 +244,7 @@ Watermark_Test::producer (void) } int -Watermark_Test::consumer (void) +Watermark_Test::consumer () { ACE_MT (this->mq_full_.wait ()); @@ -262,7 +262,7 @@ Watermark_Test::consumer (void) } int -Watermark_Test::get_message (void) +Watermark_Test::get_message () { ACE_Message_Block *mb = 0; @@ -298,7 +298,7 @@ Watermark_Test::put_message (ACE_Time_Value *timeout) } void -Watermark_Test::print_producer_debug_message (void) +Watermark_Test::print_producer_debug_message () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Producer: message size = %3d, ") @@ -308,7 +308,7 @@ Watermark_Test::print_producer_debug_message (void) } int -Watermark_Test::svc (void) +Watermark_Test::svc () { // this->role_ is an Atomic_Op object. int role = this->role_++; diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 391d73f284a..0e3768ab837 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -41,9 +41,9 @@ const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test <number of messages>\n"); -typedef ACE_Message_Queue<ACE_NULL_SYNCH> QUEUE; -typedef ACE_Message_Queue_Iterator<ACE_NULL_SYNCH> ITERATOR; -typedef ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH> REVERSE_ITERATOR; +using QUEUE = ACE_Message_Queue<ACE_NULL_SYNCH>; +using ITERATOR = ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>; +using REVERSE_ITERATOR = ACE_Message_Queue_Reverse_Iterator<ACE_NULL_SYNCH>; #if defined (ACE_HAS_WINCE) static const int MESSAGE_FACTOR = 10000; @@ -60,7 +60,7 @@ static int max_messages = MAX_MESSAGES; static ACE_High_Res_Timer *timer = 0; #if defined (ACE_HAS_THREADS) -typedef ACE_Message_Queue<ACE_MT_SYNCH> SYNCH_QUEUE; +using SYNCH_QUEUE = ACE_Message_Queue<ACE_MT_SYNCH>; struct Queue_Wrapper { @@ -77,7 +77,7 @@ struct Queue_Wrapper ACE_Message_Block **send_block_; // Pointer to messages blocks for sender to send to reciever. - Queue_Wrapper (void) + Queue_Wrapper () : q_ (0), send_block_ (0) { } @@ -91,7 +91,7 @@ class Counting_Test_Producer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Producer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), sequence_ (0), produced_ (0) {} - virtual int svc (void); + int svc () override; ACE_Atomic_Op<ACE_Thread_Mutex, long> sequence_; ACE_Atomic_Op<ACE_Thread_Mutex, long> produced_; @@ -102,13 +102,13 @@ class Counting_Test_Consumer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Consumer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), consumed_ (0) {} - virtual int svc (void); + int svc () override; ACE_Atomic_Op<ACE_Thread_Mutex, long> consumed_; }; int -Counting_Test_Producer::svc (void) +Counting_Test_Producer::svc () { // Going to produce a lot of blocks. Since we don't necessarily want them // all consumed, there's no arrangement with the consumer to be sure that @@ -200,7 +200,7 @@ Counting_Test_Producer::svc (void) } int -Counting_Test_Consumer::svc (void) +Counting_Test_Consumer::svc () { // Consume lots of blocks and release them. To mimic a thread with work // to do, put a small random delay between dequeuing the blocks. Consume @@ -252,7 +252,7 @@ Counting_Test_Consumer::svc (void) } static int -counting_test (void) +counting_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting counting test\n"))); @@ -314,7 +314,7 @@ counting_test (void) #endif /* ACE_HAS_THREADS */ static int -iterator_test (void) +iterator_test () { const int ITERATIONS = 5; ACE_TCHAR buffer[ITERATIONS][BUFSIZ]; @@ -407,7 +407,7 @@ iterator_test (void) #if defined (ACE_HAS_THREADS) static int -chained_block_test (void) +chained_block_test () { QUEUE q; @@ -768,7 +768,7 @@ performance_test (int queue_type = 0) // Ensure that the timedout dequeue_head() sets errno code properly. static int -timeout_test (void) +timeout_test () { SYNCH_QUEUE mq; int status = 0; @@ -814,7 +814,7 @@ timeout_test (void) // thorough check... static int -prio_test (void) +prio_test () { const char S1[] = "first"; const char S2[] = "second"; @@ -848,7 +848,7 @@ prio_test (void) } static int -close_test (void) +close_test () { int status = 0; diff --git a/ACE/tests/Message_Queue_Test_Ex.cpp b/ACE/tests/Message_Queue_Test_Ex.cpp index ace1a10d227..3182d2c6d0b 100644 --- a/ACE/tests/Message_Queue_Test_Ex.cpp +++ b/ACE/tests/Message_Queue_Test_Ex.cpp @@ -34,7 +34,7 @@ const ACE_TCHAR usage[] = ACE_TEXT ("usage: Message_Queue_Test_Ex <number of messages>\n"); -typedef ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH> QUEUE; +using QUEUE = ACE_Message_Queue_Ex<User_Class, ACE_NULL_SYNCH>; static const int MAX_MESSAGES = 10000; static const char test_message[] = "ACE_Message_Queue_Ex Test Message"; @@ -61,7 +61,7 @@ print_message (const ACE_TCHAR *message) } #if defined (ACE_HAS_THREADS) -typedef ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH> SYNCH_QUEUE; +using SYNCH_QUEUE = ACE_Message_Queue_Ex<User_Class, ACE_MT_SYNCH>; /** * Container for data passed to sender and receiver in @@ -78,7 +78,7 @@ struct Queue_Wrapper User_Class **send_block_; /// Default constructor. - Queue_Wrapper (void) + Queue_Wrapper () : q_ (0), send_block_ (0) { } @@ -169,7 +169,7 @@ struct Receive_Messages { } - int create (void) + int create () { ACE_NEW_RETURN (this->receive_block_, User_Class *[this->number_of_messages_], @@ -187,7 +187,7 @@ struct Receive_Messages }; static int -single_thread_performance_test (void) +single_thread_performance_test () { const char test_message[] = "ACE_Message_Queue_Ex Test Message"; @@ -253,7 +253,7 @@ single_thread_performance_test (void) } int -MQ_Ex_N_Tester::single_thread_performance_test (void) +MQ_Ex_N_Tester::single_thread_performance_test () { // Create the messages. Allocate off the heap in case messages is // large relative to the amount of stack space available. @@ -268,7 +268,7 @@ MQ_Ex_N_Tester::single_thread_performance_test (void) } int -MQ_Ex_N_Tester::test_enqueue_tail (void) +MQ_Ex_N_Tester::test_enqueue_tail () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_tail"); @@ -320,7 +320,7 @@ MQ_Ex_N_Tester::test_enqueue_tail (void) } int -MQ_Ex_N_Tester::test_enqueue_head (void) +MQ_Ex_N_Tester::test_enqueue_head () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_head"); @@ -422,7 +422,7 @@ sender (void *arg) } static int -performance_test (void) +performance_test () { Queue_Wrapper queue_wrapper; const ACE_TCHAR *message = @@ -480,7 +480,7 @@ performance_test (void) } int -MQ_Ex_N_Tester::performance_test (void) +MQ_Ex_N_Tester::performance_test () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_SYNCH>"); diff --git a/ACE/tests/Monotonic_Manual_Event_Test.cpp b/ACE/tests/Monotonic_Manual_Event_Test.cpp index f38def4bafb..c0c71a048ea 100644 --- a/ACE/tests/Monotonic_Manual_Event_Test.cpp +++ b/ACE/tests/Monotonic_Manual_Event_Test.cpp @@ -57,7 +57,7 @@ static long n_awoken2; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-s]\n"))); diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp index bbe1f5f594f..846761d312e 100644 --- a/ACE/tests/Monotonic_Message_Queue_Test.cpp +++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp @@ -39,18 +39,15 @@ # endif # if defined (ACE_HAS_THREADS) -typedef ACE_Message_Queue<ACE_MT_SYNCH, ACE_Monotonic_Time_Policy> SYNCH_QUEUE; +using SYNCH_QUEUE = ACE_Message_Queue<ACE_MT_SYNCH, ACE_Monotonic_Time_Policy>; // Create timer queue with hr support ACE_Timer_Queue * -create_timer_queue (void) +create_timer_queue () { ACE_Timer_Queue * tmq = 0; - typedef ACE_Timer_Heap_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_HR_Time_Policy> timer_queue_type; + using timer_queue_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>; ACE_NEW_RETURN (tmq, timer_queue_type (), 0); return tmq; @@ -61,17 +58,17 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH> public: MyTask () : my_reactor_ (0), my_tq_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (void); + int svc () override; int start (int num_threads); - int stop (void); + int stop (); ACE_Reactor* get_reactor (); - int create_reactor (void); + int create_reactor (); private: - int delete_reactor (void); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Reactor *my_reactor_; @@ -85,7 +82,7 @@ MyTask::get_reactor () } int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -113,7 +110,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -145,7 +142,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -169,7 +166,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n"))); @@ -189,8 +186,8 @@ public: mq_ (mq) {} - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; bool trigger_in(const ACE_Time_Value &delay); @@ -246,7 +243,7 @@ void set_system_time(const ACE_Time_Value& tv) // Ensure that the timedout dequeue_head() keeps working in case of timeshift when using monotonic timer. static bool -timeout_test (void) +timeout_test () { bool status = true; SYNCH_QUEUE mq; diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp index 755207ab16a..4e86cc27175 100644 --- a/ACE/tests/Monotonic_Task_Test.cpp +++ b/ACE/tests/Monotonic_Task_Test.cpp @@ -80,9 +80,9 @@ public: this->thr_mgr (&this->tm_); } - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (void); + int svc () override; int start (); @@ -179,7 +179,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask::svc started\n"))); diff --git a/ACE/tests/Multicast_Interfaces_Test.cpp b/ACE/tests/Multicast_Interfaces_Test.cpp index d3b75586661..5455277bc86 100644 --- a/ACE/tests/Multicast_Interfaces_Test.cpp +++ b/ACE/tests/Multicast_Interfaces_Test.cpp @@ -28,7 +28,7 @@ #include <set> -typedef std::set<ACE_TString> nameset; +using nameset = std::set<ACE_TString>; #if defined (ACE_WIN32) void diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index 12cbabc8cf5..f07d65e65c8 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -88,7 +88,7 @@ public: BOTH = PRODUCER | CONSUMER }; - MCT_Config (void) + MCT_Config () : group_start_ (MCT_START_PORT, MCT_START_GROUP), groups_ (0), debug_ (0), @@ -103,26 +103,26 @@ public: else this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS); } - ~MCT_Config (void) + ~MCT_Config () {} //FUZZ: disable check_for_lack_ACE_OS int open (int argc, ACE_TCHAR *argv[]); //FUZZ: enable check_for_lack_ACE_OS - int debug (void) const { return this->debug_;} - void dump (void) const; - int groups (void) const { return this->groups_;} - const ACE_INET_Addr group_start (void) const { return this->group_start_;} - u_long role (void) const { return this->role_;} - int iterations (void) const { return this->iterations_;} - int ttl (void) const { return this->ttl_;} + int debug () const { return this->debug_;} + void dump () const; + int groups () const { return this->groups_;} + const ACE_INET_Addr group_start () const { return this->group_start_;} + u_long role () const { return this->role_;} + int iterations () const { return this->iterations_;} + int ttl () const { return this->ttl_;} //FUZZ: disable check_for_lack_ACE_OS - int wait (void) const { return this->wait_;} + int wait () const { return this->wait_;} //FUZZ: enable check_for_lack_ACE_OS - ACE_SOCK_Dgram_Mcast::options options (void) const + ACE_SOCK_Dgram_Mcast::options options () const { return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_); } @@ -395,7 +395,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) } void -MCT_Config::dump (void) const +MCT_Config::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n"))); @@ -442,7 +442,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (void); + ~MCT_Event_Handler () override; int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -451,16 +451,16 @@ public: const ACE_TCHAR *net_if = 0); // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override; - virtual ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; // Turn loopback on/off. Must be called after at least 1 join() is performed. int loopback (bool on_off); protected: - ACE_SOCK_Dgram_Mcast *mcast (void); + ACE_SOCK_Dgram_Mcast *mcast (); int find (const char *buf); private: @@ -484,7 +484,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options) ++MCT_Event_Handler::active_handlers_; } -MCT_Event_Handler::~MCT_Event_Handler (void) +MCT_Event_Handler::~MCT_Event_Handler () { size_t size = this->address_vec_.size (); for (size_t i = 0; i < size; ++i) @@ -497,7 +497,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void) ACE_SOCK_Dgram_Mcast * -MCT_Event_Handler::mcast (void) +MCT_Event_Handler::mcast () { return &this->mcast_; } @@ -627,7 +627,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/, } ACE_HANDLE -MCT_Event_Handler::get_handle (void) const +MCT_Event_Handler::get_handle () const { return this->mcast_.get_handle (); } @@ -652,14 +652,14 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (void); + ~MCT_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. - virtual int open (void *args = 0); + int open (void *args = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int svc (void); + int svc () override; private: const MCT_Config &config_; @@ -672,7 +672,7 @@ MCT_Task::MCT_Task (const MCT_Config &config, this->reactor (reactor); } -MCT_Task::~MCT_Task (void) +MCT_Task::~MCT_Task () {} int @@ -742,7 +742,7 @@ MCT_Task::open (void *) } int -MCT_Task::svc (void) +MCT_Task::svc () { // make sure this thread owns the reactor or handle_events () won't do // anything. diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index e217fa7c497..0eda873a68c 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -94,7 +94,7 @@ public: BOTH = PRODUCER | CONSUMER }; - MCT_Config (void) + MCT_Config () : group_start_ (MCT_START_PORT, MCT_START_GROUP), groups_ (0), debug_ (0), @@ -110,26 +110,26 @@ public: this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS); } - ~MCT_Config (void) + ~MCT_Config () {} //FUZZ: disable check_for_lack_ACE_OS int open (int argc, ACE_TCHAR *argv[]); //FUZZ: enable check_for_lack_ACE_OS - int debug (void) const { return this->debug_;} - void dump (void) const; - int groups (void) const { return this->groups_;} - const ACE_INET_Addr group_start (void) const { return this->group_start_;} - u_long role (void) const { return this->role_;} - int iterations (void) const { return this->iterations_;} - int ttl (void) const { return this->ttl_;} + int debug () const { return this->debug_;} + void dump () const; + int groups () const { return this->groups_;} + const ACE_INET_Addr group_start () const { return this->group_start_;} + u_long role () const { return this->role_;} + int iterations () const { return this->iterations_;} + int ttl () const { return this->ttl_;} //FUZZ: disable check_for_lack_ACE_OS - int wait (void) const { return this->wait_;} + int wait () const { return this->wait_;} //FUZZ: enable check_for_lack_ACE_OS - ACE_SOCK_Dgram_Mcast::options options (void) const + ACE_SOCK_Dgram_Mcast::options options () const { return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_); } @@ -405,7 +405,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) } void -MCT_Config::dump (void) const +MCT_Config::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n"))); @@ -458,7 +458,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (void); + ~MCT_Event_Handler () override; int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -467,13 +467,13 @@ public: const ACE_TCHAR *net_if = 0); // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override; - virtual ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; protected: - ACE_SOCK_Dgram_Mcast *mcast (void); + ACE_SOCK_Dgram_Mcast *mcast (); int find (const char *buf); private: @@ -497,7 +497,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options) ++MCT_Event_Handler::active_handlers_; } -MCT_Event_Handler::~MCT_Event_Handler (void) +MCT_Event_Handler::~MCT_Event_Handler () { size_t size = this->address_vec_.size (); for (size_t i = 0; i < size; ++i) @@ -509,7 +509,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void) ACE_SOCK_Dgram_Mcast * -MCT_Event_Handler::mcast (void) +MCT_Event_Handler::mcast () { return &this->mcast_; } @@ -639,7 +639,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/, } ACE_HANDLE -MCT_Event_Handler::get_handle (void) const +MCT_Event_Handler::get_handle () const { return this->mcast_.get_handle (); } @@ -656,12 +656,12 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (void); + ~MCT_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. - virtual int open (void *args = 0); - virtual int svc (void); + int open (void *args = 0) override; + int svc () override; //FUZZ: enable check_for_lack_ACE_OS private: @@ -675,7 +675,7 @@ MCT_Task::MCT_Task (const MCT_Config &config, this->reactor (reactor); } -MCT_Task::~MCT_Task (void) +MCT_Task::~MCT_Task () {} int @@ -738,7 +738,7 @@ MCT_Task::open (void *) } int -MCT_Task::svc (void) +MCT_Task::svc () { // make sure this thread owns the reactor or handle_events () won't do // anything. diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 395b49cf117..fd9c253479d 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -86,7 +86,7 @@ * as not a ICMP_ECHOREPLY message and further ICMP_ECHOREPLY * received. Don't worry, be happy - it's ok. */ -Echo_Handler::Echo_Handler (void) +Echo_Handler::Echo_Handler () : ping_socket_ (), reply_wait_ (), remote_addrs_ (0), @@ -99,7 +99,7 @@ Echo_Handler::Echo_Handler (void) { } -Echo_Handler::~Echo_Handler (void) +Echo_Handler::~Echo_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Echo_Handler::~Echo_Handler - entered.\n"))); @@ -306,7 +306,7 @@ Echo_Handler::open (ACE_Reactor * const reactor, } ACE_Ping_Socket & -Echo_Handler::ping_socket (void) +Echo_Handler::ping_socket () { return this->ping_socket_; } @@ -378,7 +378,7 @@ Echo_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) } ACE_HANDLE -Echo_Handler::get_handle (void) const +Echo_Handler::get_handle () const { return ((ACE_ICMP_Socket &) this->ping_socket_).get_handle (); } @@ -522,7 +522,7 @@ Echo_Handler::handle_timeout (ACE_Time_Value const &, } int -Echo_Handler::does_echo_test_successful (void) +Echo_Handler::does_echo_test_successful () { for (size_t i = 0; i < this->number_remotes_; ++i) { @@ -544,13 +544,13 @@ Stop_Handler::Stop_Handler (ACE_Reactor * const reactor) sizeof this->handlers_to_stop_); } -Stop_Handler::~Stop_Handler (void) +Stop_Handler::~Stop_Handler () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Stop_Handler::~Stop_Handler.\n"))); } int -Stop_Handler::open (void) +Stop_Handler::open () { // Register the signal handler object to catch the signals. #if (SIGINT != 0) @@ -747,14 +747,14 @@ Stop_Handler::unregister_handler (ACE_Event_Handler *handler) } -Repeats_Handler::Repeats_Handler (void) +Repeats_Handler::Repeats_Handler () : check_handler_ (0), seconds_timer_ (60), counter_ (0) { } -Repeats_Handler::~Repeats_Handler (void) +Repeats_Handler::~Repeats_Handler () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Repeats_Handler::~Repeats_Handler.\n"))); @@ -1046,7 +1046,7 @@ run_main (int argc, ACE_TCHAR *argv[]) // to do it right in at least one test. Notice the lack of // ACE_NEW_RETURN, that monstrosity has no business in proper C++ // code ... - auto_ptr<ACE_Timer_Heap_Variable_Time_Source> tq( + std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq( new ACE_Timer_Heap_Variable_Time_Source); // ... notice how the policy is in the derived timer queue type. // The abstract timer queue does not have a time policy ... diff --git a/ACE/tests/New_Fail_Test.cpp b/ACE/tests/New_Fail_Test.cpp index 11d6bc12316..f542fed9f31 100644 --- a/ACE/tests/New_Fail_Test.cpp +++ b/ACE/tests/New_Fail_Test.cpp @@ -53,7 +53,7 @@ try_ace_new (char **p) } static char * -try_ace_new_return (void) +try_ace_new_return () { char *p = 0; ACE_NEW_RETURN (p, char[BIG_BLOCK], 0); @@ -61,7 +61,7 @@ try_ace_new_return (void) } static char * -try_ace_new_noreturn (void) +try_ace_new_noreturn () { char *p = 0; ACE_NEW_NORETURN (p, char[BIG_BLOCK]); diff --git a/ACE/tests/NonBlocking_Conn_Test.cpp b/ACE/tests/NonBlocking_Conn_Test.cpp index 811ba8656be..8c1019093b7 100644 --- a/ACE/tests/NonBlocking_Conn_Test.cpp +++ b/ACE/tests/NonBlocking_Conn_Test.cpp @@ -78,7 +78,7 @@ Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask) // handle_close() as it does plain 'delete this'. if (!this->is_ref_counted_) { - typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> super; + using super = ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>; return super::handle_close (handle, mask); } @@ -86,7 +86,7 @@ Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask) return 0; } -typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> CONNECTOR; +using CONNECTOR = ACE_Connector<Svc_Handler, ACE_SOCK_Connector>; static const char* hosts[] = { "www.russiantvguide.com:80", diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp index 032fd219027..84f61e6ff43 100644 --- a/ACE/tests/Notify_Performance_Test.cpp +++ b/ACE/tests/Notify_Performance_Test.cpp @@ -13,6 +13,8 @@ //============================================================================= +#include <utility> + #include "test_config.h" #include "ace/Profile_Timer.h" #include "ace/Get_Opt.h" @@ -51,7 +53,7 @@ class Handler : public ACE_Event_Handler { public: /// The Handler callbacks. - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; }; int @@ -90,7 +92,7 @@ client (void *arg) // Sets up the correct reactor (based on platform and options) static void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; @@ -191,15 +193,15 @@ run_main (int argc, ACE_TCHAR *argv[]) create_reactor (); // Manage memory automagically. - auto_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ()); - auto_ptr<ACE_Reactor_Impl> impl; + std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ()); + std::unique_ptr<ACE_Reactor_Impl> impl; // If we are using other that the default implementation, we must // clean up. if (opt_select_reactor || opt_wfmo_reactor || opt_dev_poll_reactor) { - auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ()); - impl = auto_impl; + std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ()); + impl = std::move(auto_impl); } // Callback object diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 65115e9b27b..abe20bdc17a 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -41,7 +41,7 @@ // Test ACE_OS::access() to be sure a file's existence is correctly noted. int -access_test (void) +access_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing access method\n"))); @@ -67,7 +67,7 @@ access_test (void) // Test ACE_OS::rename to be sure the files come and go as expected. int -rename_test (void) +rename_test () { #if defined (ACE_LACKS_RENAME) || defined (ACE_VXWORKS) // On VxWorks only some filesystem drivers support rename @@ -181,7 +181,7 @@ rename_test (void) // int -string_emulation_test (void) +string_emulation_test () { { // ======================================================================== @@ -578,7 +578,7 @@ string_emulation_test (void) } // Test ACE_OS::snprintf -typedef int (*SNPrintF_t) (char *buf, size_t maxlen, const char *format, ...); +using SNPrintF_t = int (*)(char *, size_t, const char *, ...); int snprintf_test (SNPrintF_t fn) @@ -653,7 +653,7 @@ snprintf_test (SNPrintF_t fn) } static int -getpwnam_r_test (void) +getpwnam_r_test () { int result = 0; @@ -688,7 +688,7 @@ getpwnam_r_test (void) } static int -compiler_test (void) +compiler_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing compiler methods\n"))); @@ -702,7 +702,7 @@ compiler_test (void) } static int -version_test (void) +version_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing version macros\n"))); @@ -727,7 +727,7 @@ version_test (void) } static int -ctime_r_test (void) +ctime_r_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ctime_r\n"))); @@ -793,7 +793,7 @@ ctime_r_test (void) int -string_strsncpy_test (void) +string_strsncpy_test () { { //FUZZ: disable check_for_lack_ACE_OS @@ -941,7 +941,7 @@ string_strsncpy_test (void) // Test conversion between narrow and wide chars. int -string_convert_test (void) +string_convert_test () { #if defined (ACE_HAS_WCHAR) ACE_DEBUG ((LM_DEBUG, @@ -990,7 +990,7 @@ string_convert_test (void) // Test ACE_OS::strsignal() int -strsignal_test (void) +strsignal_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strsignal method\n"))); @@ -1018,7 +1018,7 @@ strsignal_test (void) // Test the methods for getting cpu info int -cpu_info_test (void) +cpu_info_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing cpu info methods\n"))); @@ -1064,7 +1064,7 @@ cpu_info_test (void) } int -last_error_test (void) +last_error_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing last_error method\n"))); @@ -1085,7 +1085,7 @@ last_error_test (void) } int -pagesize_test (void) +pagesize_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getpagesize method\n"))); @@ -1107,7 +1107,7 @@ pagesize_test (void) } int -ace_ctype_test (void) +ace_ctype_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ace ctype methods\n"))); @@ -1216,7 +1216,7 @@ ace_ctype_test (void) } int -ceilf_test (void) +ceilf_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceilf method\n"))); @@ -1244,7 +1244,7 @@ ceilf_test (void) } int -floorf_test (void) +floorf_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floorf method\n"))); @@ -1270,7 +1270,7 @@ floorf_test (void) } int -ceil_test (void) +ceil_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceil method\n"))); @@ -1298,7 +1298,7 @@ ceil_test (void) } int -floor_test (void) +floor_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floor method\n"))); @@ -1326,7 +1326,7 @@ floor_test (void) } int -ceill_test (void) +ceill_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceill method\n"))); @@ -1354,7 +1354,7 @@ ceill_test (void) } int -floorl_test (void) +floorl_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floorl method\n"))); @@ -1380,7 +1380,7 @@ floorl_test (void) } int -log2_test (void) +log2_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing log2 method\n"))); @@ -1588,7 +1588,7 @@ int snprintf_emulation_test () #endif // ACE_HAS_VSNPRINTF_EMULATION int -swab_test (void) +swab_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing swab method\n"))); @@ -1611,7 +1611,7 @@ swab_test (void) } int -gai_strerror_test (void) +gai_strerror_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing gai_strerror method\n"))); diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp index b98d33d37e3..9b1a1120d4a 100644 --- a/ACE/tests/Pipe_Test.cpp +++ b/ACE/tests/Pipe_Test.cpp @@ -30,7 +30,7 @@ static int iterations = ACE_MAX_ITERATIONS; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-d (don't close pipes)] ") diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp index 37fd07c07da..0716cd080f4 100644 --- a/ACE/tests/Priority_Reactor_Test.cpp +++ b/ACE/tests/Priority_Reactor_Test.cpp @@ -28,8 +28,10 @@ #include "ace/Auto_Ptr.h" #include "ace/Priority_Reactor.h" #include "Priority_Reactor_Test.h" + #include "ace/OS_NS_sys_wait.h" #include "ace/OS_NS_unistd.h" +#include <utility> @@ -54,10 +56,8 @@ static int opt_max_duration = 60; // -m option. static int max_retries = 5; -typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR> - CONNECTOR; -typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> - ACCEPTOR; +using CONNECTOR = ACE_Connector<Write_Handler, ACE_SOCK_Connector>; +using ACCEPTOR = ACE_Acceptor<Read_Handler, ACE_SOCK_Acceptor>; int Read_Handler::waiting_ = 0; int Read_Handler::started_ = 0; @@ -69,7 +69,7 @@ Read_Handler::set_countdown (int nchildren) } int -Read_Handler::get_countdown (void) +Read_Handler::get_countdown () { return Read_Handler::waiting_; } @@ -150,7 +150,7 @@ Write_Handler::open (void *) } int -Write_Handler::svc (void) +Write_Handler::svc () { // Send several short messages, doing pauses between each message. // The number of messages can be controlled from the command line. @@ -271,19 +271,19 @@ run_main (int argc, ACE_TCHAR *argv[]) // Note: If opt_priority_reactor is false, the default ACE_Reactor is used // and we don't need to set one up. ACE_Reactor *orig_reactor = 0; - auto_ptr<ACE_Reactor> reactor; + std::unique_ptr<ACE_Reactor> reactor; if (opt_priority_reactor) { ACE_Select_Reactor *impl_ptr; ACE_NEW_RETURN (impl_ptr, ACE_Priority_Reactor, -1); - auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); + std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); ACE_Reactor *reactor_ptr; ACE_NEW_RETURN (reactor_ptr, ACE_Reactor (impl_ptr, 1), -1); auto_impl.release (); // ACE_Reactor dtor will take it from here - auto_ptr<ACE_Reactor> auto_reactor (reactor_ptr); - reactor = auto_reactor; + std::unique_ptr<ACE_Reactor> auto_reactor (reactor_ptr); + reactor = std::move(auto_reactor); orig_reactor = ACE_Reactor::instance (reactor_ptr); } diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 056dc2adae6..91a16596730 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -35,7 +35,7 @@ class Priority_Task : public ACE_Task<ACE_MT_SYNCH> { public: /// The constructor - Priority_Task (void); + Priority_Task (); //FUZZ: disable check_for_lack_ACE_OS /** @@ -43,20 +43,20 @@ public: * priority. *FUZZ: enable check_for_lack_ACE_OS */ - int open (void *); + int open (void *) override; /// Runs on a separate thread an checks the priority. - int svc (void); + int svc () override; /// Returns 1 if priority was set properly, 0 otherwise. - int succeeded (void) { return error_ == 0; } + int succeeded () { return error_ == 0; } private: int priority_; u_int error_; }; -Priority_Task::Priority_Task (void) +Priority_Task::Priority_Task () : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()), priority_ (0), error_ (0) @@ -125,7 +125,7 @@ Priority_Task::open (void *arg) } int -Priority_Task::svc (void) +Priority_Task::svc () { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); diff --git a/ACE/tests/Proactor_File_Test.cpp b/ACE/tests/Proactor_File_Test.cpp index 0181d114995..39614badfa5 100644 --- a/ACE/tests/Proactor_File_Test.cpp +++ b/ACE/tests/Proactor_File_Test.cpp @@ -46,24 +46,24 @@ class FileIOHandler : public ACE_Handler { public: FileIOHandler (); - virtual ~FileIOHandler (); + ~FileIOHandler () override; int Connect(); // This method will be called when an asynchronous read // completes on a file. - virtual void - handle_read_file(const ACE_Asynch_Read_File::Result &result); + void + handle_read_file(const ACE_Asynch_Read_File::Result &result) override; // This method will be called when an asynchronous write // completes on a file. - virtual void - handle_write_file(const ACE_Asynch_Write_File::Result &result); + void + handle_write_file(const ACE_Asynch_Write_File::Result &result) override; // Callback hook invoked by the Proactor's Timer_Queue. - virtual void - handle_time_out(const ACE_Time_Value &tv, const void *arg); + void + handle_time_out(const ACE_Time_Value &tv, const void *arg) override; // Our I/O objects; they're public so others can access them ACE_Asynch_Read_File reader_; diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 6424635ae52..04bea2e7779 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -58,7 +58,7 @@ // Proactor Type (UNIX only, Win32 ignored) -typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -164,28 +164,28 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (void); + int svc () override; int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -279,7 +279,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -341,7 +341,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -364,13 +364,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -403,7 +403,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -417,7 +417,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -439,7 +439,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -531,7 +531,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -568,7 +568,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -621,10 +621,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (void); + ~Acceptor () override; // Virtual from ACE_Asynch_Acceptor - Server *make_handler (void); + Server *make_handler () override; private: TestData *tester_; @@ -636,13 +636,13 @@ Acceptor::Acceptor (TestData *tester) { } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->cancel (); } Server * -Acceptor::make_handler (void) +Acceptor::make_handler () { return this->tester_->server_up (); } @@ -666,7 +666,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ") @@ -776,7 +776,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Server::initiate_read_stream (void) +Server::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; @@ -1055,12 +1055,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (void); + ~Connector () override; int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (void); + Client *make_handler () override; private: TestData *tester_; @@ -1073,13 +1073,13 @@ Connector::Connector (TestData *tester) { } -Connector::~Connector (void) +Connector::~Connector () { this->cancel (); } Client * -Connector::make_handler (void) +Connector::make_handler () { return this->tester_->client_up (); } @@ -1141,7 +1141,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ") @@ -1271,7 +1271,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Client::initiate_write_stream (void) +Client::initiate_write_stream () { if (this->flg_cancel_ != 0 || this->stop_writing_ || @@ -1353,7 +1353,7 @@ Client::initiate_write_stream (void) } int -Client::initiate_read_stream (void) +Client::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 341c604c30d..c76eb0b62c9 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -59,7 +59,7 @@ // Proactor Type (UNIX only, Win32 ignored) -typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -165,28 +165,28 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (void); + int svc () override; int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -280,7 +280,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -342,7 +342,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -365,13 +365,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -404,7 +404,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -418,7 +418,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -440,7 +440,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -532,7 +532,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -569,7 +569,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -622,10 +622,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (void); + ~Acceptor () override; // Virtual from ACE_Asynch_Acceptor - Server *make_handler (void); + Server *make_handler () override; private: TestData *tester_; @@ -637,13 +637,13 @@ Acceptor::Acceptor (TestData *tester) { } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->cancel (); } Server * -Acceptor::make_handler (void) +Acceptor::make_handler () { return this->tester_->server_up (); } @@ -667,7 +667,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%d bytes); ") @@ -777,7 +777,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Server::initiate_read_stream (void) +Server::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; @@ -1056,12 +1056,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (void); + ~Connector () override; int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (void); + Client *make_handler () override; private: TestData *tester_; @@ -1074,13 +1074,13 @@ Connector::Connector (TestData *tester) { } -Connector::~Connector (void) +Connector::~Connector () { this->cancel (); } Client * -Connector::make_handler (void) +Connector::make_handler () { return this->tester_->client_up (); } @@ -1143,7 +1143,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%d bytes); ") @@ -1312,7 +1312,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Client::initiate_write_stream (void) +Client::initiate_write_stream () { if (this->flg_cancel_ != 0 || this->stop_writing_ || @@ -1394,7 +1394,7 @@ Client::initiate_write_stream (void) } int -Client::initiate_read_stream (void) +Client::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp index e13b01b9ff4..8fdc0af8a89 100644 --- a/ACE/tests/Proactor_Timer_Test.cpp +++ b/ACE/tests/Proactor_Timer_Test.cpp @@ -39,10 +39,10 @@ public: Time_Handler (); /// Handle the timeout. - virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg); + void handle_time_out (const ACE_Time_Value &tv, const void *arg) override; /// Return our timer id. - long timer_id (void) const; + long timer_id () const; /// Set our timer id; void timer_id (long); @@ -71,10 +71,10 @@ public: Repeat_Timer_Handler (const int repeat_time = REPEAT_INTERVAL) : repeat_secs_ (repeat_time), expirations_ (0) {}; - ~Repeat_Timer_Handler (); + ~Repeat_Timer_Handler () override; // Handle the timeout. - virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg); + void handle_time_out (const ACE_Time_Value &tv, const void *arg) override; private: int repeat_secs_; @@ -82,7 +82,7 @@ private: }; -Time_Handler::Time_Handler (void) +Time_Handler::Time_Handler () : timer_id_ (-1) { // Nothing @@ -118,7 +118,7 @@ Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg) } long -Time_Handler::timer_id (void) const +Time_Handler::timer_id () const { return this->timer_id_; } @@ -168,7 +168,7 @@ Repeat_Timer_Handler::handle_time_out (const ACE_Time_Value &, const void *) } static void -test_registering_all_handlers (void) +test_registering_all_handlers () { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, @@ -194,7 +194,7 @@ test_registering_all_handlers (void) } static void -test_registering_one_handler (void) +test_registering_one_handler () { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, @@ -222,7 +222,7 @@ test_registering_one_handler (void) } static void -test_canceling_odd_timers (void) +test_canceling_odd_timers () { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, @@ -259,7 +259,7 @@ test_canceling_odd_timers (void) } static void -test_cancel_repeat_timer (void) +test_cancel_repeat_timer () { Repeat_Timer_Handler *handler = new Repeat_Timer_Handler; ACE_Time_Value timeout (Repeat_Timer_Handler::REPEAT_INTERVAL); @@ -308,9 +308,9 @@ run_main (int argc, ACE_TCHAR *[]) // to do it right in at least one test. Notice the lack of // ACE_NEW_RETURN, that monstrosity has no business in proper C++ // code ... - typedef ACE_Timer_Heap_T<ACE_Handler*,ACE_Proactor_Handle_Timeout_Upcall,ACE_SYNCH_RECURSIVE_MUTEX,ACE_FPointer_Time_Policy> Timer_Queue; + using Timer_Queue = ACE_Timer_Heap_T<ACE_Handler *, ACE_Proactor_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_FPointer_Time_Policy>; - auto_ptr<Timer_Queue> tq(new Timer_Queue); + std::unique_ptr<Timer_Queue> tq(new Timer_Queue); // ... notice how the policy is in the derived timer queue type. // The abstract timer queue does not have a time policy ... tq->set_time_policy(&ACE_High_Res_Timer::gettimeofday_hr); diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index bb0ea4863cb..9f4cbd438fb 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -52,7 +52,7 @@ #endif /* ACE_WIN32 */ // Proactor Type (UNIX only, Win32 ignored) -typedef enum { DEFAULT = 0, AIOCB, SIG, SUN, CB } ProactorType; +using ProactorType = enum { DEFAULT = 0, AIOCB, SIG, SUN, CB }; static ProactorType proactor_type = DEFAULT; // POSIX : > 0 max number aio operations proactor, @@ -158,28 +158,28 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (void); + int svc () override; int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -273,7 +273,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -335,7 +335,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -377,13 +377,13 @@ class Server : public ACE_Handler public: Server (); Server (TestData *tester, int id); - ~Server (void); + ~Server () override; - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } /// This is called after the new session has been established. void go (ACE_HANDLE handle, const ACE_INET_Addr &client); @@ -398,14 +398,14 @@ protected: */ /// This is called when asynchronous <read> operation from the /// socket completes. - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; /// This is called when an asynchronous <write> to the socket /// completes. - virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); + void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override; private: - int initiate_read (void); + int initiate_read (); int initiate_write (ACE_Message_Block *mb, size_t nbytes); TestData *tester_; @@ -434,28 +434,28 @@ class Client : public ACE_Handler public: Client (); Client (TestData *tester, int id); - ~Client (void); + ~Client () override; void go (ACE_HANDLE h, const ACE_INET_Addr &server); - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - int get_total_w (void) { return this->total_w_; } - int get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + int get_total_w () { return this->total_w_; } + int get_total_r () { return this->total_r_; } // This is called when asynchronous reads from the socket complete - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; // This is called when asynchronous writes from the socket complete - virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); + void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override; - void cancel (void); + void cancel (); private: - int initiate_read (void); - int initiate_write (void); + int initiate_read (); + int initiate_write (); // FUZZ: disable check_for_lack_ACE_OS - void close (void); + void close (); // FUZZ: enable check_for_lack_ACE_OS TestData *tester_; @@ -482,13 +482,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -521,7 +521,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -535,7 +535,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -557,7 +557,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -649,7 +649,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -686,7 +686,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -758,13 +758,13 @@ class Master : public ACE_Handler { public: Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected); - ~Master (void); + ~Master () override; // Called when dgram receive operation completes. - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; private: - void start_recv (void); + void start_recv (); TestData *tester_; ACE_INET_Addr recv_addr_; @@ -796,7 +796,7 @@ Master::Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected) } } -Master::~Master (void) +Master::~Master () { if (this->recv_in_progress_) this->rd_.cancel (); @@ -915,7 +915,7 @@ Master::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) } void -Master::start_recv (void) +Master::start_recv () { if (this->mb_ == 0) return; @@ -947,7 +947,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ") @@ -1035,7 +1035,7 @@ Server::go (ACE_HANDLE handle, const ACE_INET_Addr &client) } int -Server::initiate_read (void) +Server::initiate_read () { if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE) return -1; @@ -1406,7 +1406,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ") @@ -1508,7 +1508,7 @@ Client::go (ACE_HANDLE handle, const ACE_INET_Addr &server) } int -Client::initiate_write (void) +Client::initiate_write () { if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE) return -1; @@ -1616,7 +1616,7 @@ Client::initiate_write (void) } int -Client::initiate_read (void) +Client::initiate_read () { if (this->flg_cancel_ || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index 8334dbd15a3..ca8acbf66ce 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -14,8 +14,7 @@ #include "ace/Process.h" #include "ace/SString.h" -typedef void (*setenvfn_t) (const ACE_TCHAR *name, const ACE_TCHAR *value, - void *ctx); +using setenvfn_t = void (*)(const ACE_TCHAR *, const ACE_TCHAR *, void *); #if defined (ACE_WIN32) && !defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE) diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 109019e9b12..02d89c320c4 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -39,15 +39,15 @@ class Exit_Handler : public ACE_Event_Handler public: Exit_Handler (const char *msg): msg_ (msg) { } - virtual ~Exit_Handler (void) { } + ~Exit_Handler () override { } - virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { delete this; return 0; } - virtual int handle_exit (ACE_Process *proc) + int handle_exit (ACE_Process *proc) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P) Exit_Handler(%C) got %d: %d\n"), @@ -176,7 +176,7 @@ public: // FUZZ: disable check_for_lack_ACE_OS /// FUZZ: enable check_for_lack_ACE_OS - int open (void*) + int open (void*) override { char tmp[10]; order += ACE_OS::itoa (sleep_time_, tmp, 10); @@ -185,7 +185,7 @@ public: return 0; } - int svc (void) + int svc () override { int result = 0; ACE_exitcode exitcode; @@ -217,7 +217,7 @@ public: // FUZZ: disable check_for_lack_ACE_OS /// FUZZ: enable check_for_lack_ACE_OS - int close (u_long) + int close (u_long) override { --running_tasks; return 0; @@ -231,7 +231,7 @@ private: #ifdef ACE_HAS_PROCESS_SPAWN static int -command_line_test (void) +command_line_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing for last character of command line\n"))); diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp index 7d1e55d0e01..10c2d9187a6 100644 --- a/ACE/tests/Process_Manual_Event_Test.cpp +++ b/ACE/tests/Process_Manual_Event_Test.cpp @@ -35,7 +35,7 @@ static const ACE_TCHAR *event_pong_name = ACE_TEXT ("ACE_Pong_Event"); // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n"))); @@ -66,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { ACE_Manual_Event event_ping (0, USYNC_PROCESS, event_ping_name); ACE_Manual_Event event_pong (0, USYNC_PROCESS, event_pong_name); diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp index 74d9aa65663..5d35c51bb7a 100644 --- a/ACE/tests/Process_Mutex_Test.cpp +++ b/ACE/tests/Process_Mutex_Test.cpp @@ -30,7 +30,7 @@ static const u_int n_processes = ACE_MAX_PROCESSES; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-d (don't release mutex)] ") @@ -65,7 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { ACE_Process_Mutex mutex (mutex_name); diff --git a/ACE/tests/Process_Semaphore_Test.cpp b/ACE/tests/Process_Semaphore_Test.cpp index 80b7e1aa40b..af182297bcb 100644 --- a/ACE/tests/Process_Semaphore_Test.cpp +++ b/ACE/tests/Process_Semaphore_Test.cpp @@ -37,7 +37,7 @@ static const char *sema_pong_name = "ACE_Pong_Semaphore"; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n"))); @@ -68,7 +68,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { #if defined (ACE_WIN32) || \ defined (ACE_USES_FIFO_SEM) || \ diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index aa0797fe6b7..8b29d634394 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -58,17 +58,17 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, Options, ACE_Null_Mutex); // Define a <Strategy_Acceptor> that's parameterized by the // <Counting_Service>. -typedef ACE_Strategy_Acceptor <Counting_Service, ACE_SOCK_ACCEPTOR> ACCEPTOR; +using ACCEPTOR = ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_Acceptor>; // Create an Options Singleton. -typedef ACE_Singleton<Options, ACE_Null_Mutex> OPTIONS; +using OPTIONS = ACE_Singleton<Options, ACE_Null_Mutex>; // counter for connections static size_t connections = 0; // Use this to show down the process gracefully. void -connection_completed (void) +connection_completed () { // Increment connection counter. ++connections; @@ -93,7 +93,7 @@ Process_Strategy::Process_Strategy (size_t n_processes, // Destructor. g++ 2.7.2.3 gets very confused ("Internal compiler // error") without it. -Process_Strategy::~Process_Strategy (void) +Process_Strategy::~Process_Strategy () { } @@ -115,24 +115,24 @@ Process_Strategy::activate_svc_handler (Counting_Service *svc_handler, } ACE_File_Lock & -Options::file_lock (void) +Options::file_lock () { return this->file_lock_; } ACE_Concurrency_Strategy <Counting_Service> * -Options::concurrency_strategy (void) +Options::concurrency_strategy () { return this->concurrency_strategy_; } const ACE_TCHAR * -Options::filename (void) +Options::filename () { return this->filename_; } -Options::Options (void) +Options::Options () : // Choose to use processes by default. #if !defined (ACE_LACKS_FORK) @@ -145,7 +145,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { delete this->concurrency_strategy_; } @@ -261,7 +261,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } Options::Concurrency_Type -Options::concurrency_type (void) +Options::concurrency_type () { return this->concurrency_type_; } @@ -282,7 +282,7 @@ Counting_Service::Counting_Service (ACE_Thread_Manager *) // client. int -Counting_Service::read (void) +Counting_Service::read () { ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); @@ -317,7 +317,7 @@ Counting_Service::read (void) // Increment the current value in the shared file by 1. int -Counting_Service::inc (void) +Counting_Service::inc () { ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); @@ -409,7 +409,7 @@ Counting_Service::handle_input (ACE_HANDLE) } int -Counting_Service::svc (void) +Counting_Service::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) handling thread\n"))); @@ -605,7 +605,7 @@ client (void *arg) // Have all connections been serviced? int -done (void) +done () { return connections == ACE_MAX_ITERATIONS + 1; } diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp index 328702994b5..d18a5265af8 100644 --- a/ACE/tests/Process_Test.cpp +++ b/ACE/tests/Process_Test.cpp @@ -25,7 +25,7 @@ static const char *proc_self_fd = "/proc/self/fd/"; int -test_setenv (void) +test_setenv () { int status = 0; ACE_Process_Options opts; diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp index 481afb8cc21..f2568ce66bc 100644 --- a/ACE/tests/RB_Tree_Test.cpp +++ b/ACE/tests/RB_Tree_Test.cpp @@ -28,10 +28,10 @@ // Type definitions for the four distinct parameterizations of the // test. -typedef ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> INT_INT_RB_TREE_TEST; -typedef ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex> INT_STR_RB_TREE_TEST; -typedef ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_INT_RB_TREE_TEST; -typedef ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_STR_RB_TREE_TEST; +using INT_INT_RB_TREE_TEST = ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>; +using INT_STR_RB_TREE_TEST = ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>; +using STR_INT_RB_TREE_TEST = ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>; +using STR_STR_RB_TREE_TEST = ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>; // Number of entries placed in each tree. static int RB_TREE_TEST_ENTRIES = 8; @@ -523,14 +523,14 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Test // Destructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test () { } // Run the interface and iteration tests. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test () { // Run the individual portions of the test, in order. @@ -545,7 +545,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void) // Tests stable and deprecated insertion interfaces. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion () { // Fill in each tree with the key and item from the appropriate // arrays, using the shuffle index to create the appropriate @@ -588,7 +588,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v // Tests forward and reverse iteration after insertion in both trees. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration () { // Reset iterators. @@ -662,7 +662,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it } template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration(void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration() { ACE_RB_Tree_Node<EXT_ID, INT_ID> *tree_node = 0; @@ -699,7 +699,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration // Tests stable and deprecated deletion interfaces. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion () { // Remove the even numbered entries from each of the trees. @@ -725,7 +725,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo // Tests forward and reverse iteration after deletions in both trees. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration () { // Reset iterators diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp index 7c84597df70..36ba22dd187 100644 --- a/ACE/tests/RW_Process_Mutex_Test.cpp +++ b/ACE/tests/RW_Process_Mutex_Test.cpp @@ -126,7 +126,7 @@ Child::any_overlaps (const Child &other) const // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-c n (child number) -p n (port number)] [-n mutex name]\n"))); @@ -310,7 +310,7 @@ reader (int num) } static void -writer (void) +writer () { ACE_RW_Process_Mutex mutex (mutex_name.c_str ()); diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp index b0032d4d36a..3046ae2294a 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp @@ -26,16 +26,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -76,14 +76,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp index 849f544966f..0141e2394ba 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp @@ -28,16 +28,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -78,14 +78,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index fe06d7813a9..99d19eef281 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -20,7 +20,7 @@ class Except {}; static void -throw_exception (void) +throw_exception () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) throw exception\n"))); @@ -32,8 +32,8 @@ class My_Handler : public ACE_Event_Handler, public ACE_SOCK_Dgram public: My_Handler (const ACE_INET_Addr &local_addr); - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; }; My_Handler::My_Handler (const ACE_INET_Addr &local_addr) @@ -42,7 +42,7 @@ My_Handler::My_Handler (const ACE_INET_Addr &local_addr) } ACE_HANDLE -My_Handler::get_handle (void) const +My_Handler::get_handle () const { return ACE_SOCK_Dgram::get_handle (); } @@ -76,7 +76,7 @@ My_Handler::handle_input (ACE_HANDLE) class My_Reactor : public ACE_Select_Reactor { public: - virtual int handle_events (ACE_Time_Value *max_wait_time) + int handle_events (ACE_Time_Value *max_wait_time) override { int ret = 0; @@ -94,7 +94,7 @@ public: return ret; } - virtual int handle_events (ACE_Time_Value &max_wait_time) + int handle_events (ACE_Time_Value &max_wait_time) override { return this->handle_events (&max_wait_time); } @@ -102,7 +102,7 @@ public: #if defined (ACE_HAS_THREADS) static int -worker (void) +worker () { ACE_Reactor::instance ()->owner (ACE_OS::thr_self ()); diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp index 3e71285e641..426adc3e269 100644 --- a/ACE/tests/Reactor_Fairness_Test.cpp +++ b/ACE/tests/Reactor_Fairness_Test.cpp @@ -51,7 +51,7 @@ namespace { // Class to collect and report on data handling for each test pass. struct Result_Set { int nr_conns; - typedef ACE_Array_Map<ACE_HANDLE, unsigned int> report_map; + using report_map = ACE_Array_Map<ACE_HANDLE, unsigned int>; report_map reports; void reset (int n_connections) // Reset for next run @@ -67,7 +67,7 @@ namespace { } // Return 1 if this looks like a failure wrt fairness. - int analyze_reports (void) + int analyze_reports () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Results (%d entries):\n"), diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index dbe20b09708..47bdfe3c429 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -28,10 +28,10 @@ public: char const *test_name); /// Run the test - void run(void); + void run(); /// Receive the notifications. - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; private: /** @@ -40,12 +40,12 @@ private: * Each iteration of the test consists of sending multiple * notifications simultaneously. */ - void send_notifications (void); + void send_notifications (); /** * @brief Return true if the test is finished. */ - bool done (void) const; + bool done () const; private: /** @@ -142,7 +142,7 @@ Event_Handler::Event_Handler ( } void -Event_Handler::run (void) +Event_Handler::run () { send_notifications (); @@ -189,7 +189,7 @@ Event_Handler::handle_exception (ACE_HANDLE) } void -Event_Handler::send_notifications (void) +Event_Handler::send_notifications () { for (int i = 0; i != notifications_curr_; ++i) { @@ -210,7 +210,7 @@ Event_Handler::send_notifications (void) } bool -Event_Handler::done (void) const +Event_Handler::done () const { return (notifications_curr_ >= max_notifications_) && (notifications_sent_ == notifications_recv_); diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp index 38207bf6aff..08874f291c3 100644 --- a/ACE/tests/Reactor_Notify_Test.cpp +++ b/ACE/tests/Reactor_Notify_Test.cpp @@ -35,18 +35,18 @@ static const time_t SHORT_TIMEOUT = 2; class Quiet_Notify_Tester : public ACE_Task<ACE_NULL_SYNCH> { public: - Quiet_Notify_Tester (void) : result_ (0) {} - ~Quiet_Notify_Tester (void) { this->wait (); } + Quiet_Notify_Tester () : result_ (0) {} + ~Quiet_Notify_Tester () override { this->wait (); } //FUZZ: disable check_for_lack_ACE_OS /// Start the reactor event thread. - virtual int open (void * = 0); + int open (void * = 0) override; // Run the reactor event loop. - virtual int svc (void); + int svc () override; // Return the test result, 0 ok, -1 fail - int result (void) const { return this->result_; } + int result () const { return this->result_; } private: ACE_Reactor r_; @@ -61,7 +61,7 @@ Quiet_Notify_Tester::open (void *) } int -Quiet_Notify_Tester::svc (void) +Quiet_Notify_Tester::svc () { // Count on the main thread doing a notify in less than LONG_TIMEOUT // seconds. If we don't get it, report a failure. @@ -87,7 +87,7 @@ Quiet_Notify_Tester::svc (void) } static int -run_quiet_notify_test (void) +run_quiet_notify_test () { ACE_DEBUG ((LM_DEBUG, "(%t) Starting quiet notify test\n")); Quiet_Notify_Tester t; @@ -113,33 +113,33 @@ public: const ACE_Time_Value &tv); /// Destructor. - ~Supplier_Task (void); + ~Supplier_Task () override; //FUZZ: disable check_for_lack_ACE_OS /// Make this an Active Object. - virtual int open (void * = 0); + int open (void * = 0) override; /// Close down the supplier. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; /// Generates events and sends them to the <Reactor>'s <notify> /// method. - virtual int svc (void); + int svc () override; /// Releases the <waiter_> semaphore when called by the <Reactor>'s /// notify handler. - virtual int handle_exception (ACE_HANDLE); + int handle_exception (ACE_HANDLE) override; /** * Called every time through the main <ACE_Reactor> event loop to * illustrate the difference between "limited" and "unlimited" * notification. */ - virtual int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; /// Release the <waiter_>. - void release (void); + void release (); private: /// Perform the notifications. @@ -169,7 +169,7 @@ private: }; void -Supplier_Task::release (void) +Supplier_Task::release () { this->waiter_.release (); } @@ -235,7 +235,7 @@ Supplier_Task::close (u_long) return 0; } -Supplier_Task::~Supplier_Task (void) +Supplier_Task::~Supplier_Task () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) ~Supplier_Task\n"))); @@ -292,7 +292,7 @@ Supplier_Task::perform_notifications (int notifications) } int -Supplier_Task::svc (void) +Supplier_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) **** starting unlimited notifications test\n"))); @@ -364,7 +364,7 @@ run_test (int disable_notify_pipe, -1); // Make sure this stuff gets cleaned up when this function exits. - auto_ptr<ACE_Reactor> r (reactor); + std::unique_ptr<ACE_Reactor> r (reactor); // Set the Singleton Reactor. ACE_Reactor *orig_reactor = ACE_Reactor::instance (reactor); @@ -447,7 +447,7 @@ run_test (int disable_notify_pipe, class Purged_Notify : public ACE_Event_Handler { - virtual int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) + int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) override { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Got a notify that should have been purged!\n")), @@ -456,7 +456,7 @@ class Purged_Notify : public ACE_Event_Handler }; static int -run_notify_purge_test (void) +run_notify_purge_test () { int status; ACE_Reactor *r = ACE_Reactor::instance (); @@ -465,7 +465,7 @@ run_notify_purge_test (void) Purged_Notify *n2; ACE_NEW_RETURN (n2, Purged_Notify, -1); - auto_ptr<Purged_Notify> ap (n2); + std::unique_ptr<Purged_Notify> ap (n2); // First test: // Notify EXCEPT, and purge ALL diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp index c241ebfeb3c..0578aea9997 100644 --- a/ACE/tests/Reactor_Performance_Test.cpp +++ b/ACE/tests/Reactor_Performance_Test.cpp @@ -13,16 +13,18 @@ #include "test_config.h" #include "Reactor_Performance_Test.h" -#include "ace/Profile_Timer.h" -#include "ace/Get_Opt.h" -#include "ace/SOCK_Connector.h" -#include "ace/SOCK_Acceptor.h" + #include "ace/Acceptor.h" +#include "ace/Auto_Ptr.h" #include "ace/Connector.h" +#include "ace/Get_Opt.h" +#include "ace/Profile_Timer.h" #include "ace/Reactor.h" -#include "ace/WFMO_Reactor.h" +#include "ace/SOCK_Acceptor.h" +#include "ace/SOCK_Connector.h" #include "ace/Select_Reactor.h" -#include "ace/Auto_Ptr.h" +#include "ace/WFMO_Reactor.h" +#include <utility> #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT @@ -146,7 +148,7 @@ Write_Handler::open (void *) } int -Write_Handler::send_data (void) +Write_Handler::send_data () { int send_size = sizeof (ACE_ALPHABET) - 1; @@ -160,8 +162,8 @@ Write_Handler::send_data (void) } // Connection factories -typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR> CONNECTOR; -typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR; +using CONNECTOR = ACE_Connector<Write_Handler, ACE_SOCK_Connector>; +using ACCEPTOR = ACE_Acceptor<Read_Handler, ACE_SOCK_Acceptor>; // Execute the client tests. void * @@ -245,7 +247,7 @@ client (void *arg) // Sets up the correct reactor (based on platform and options). void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; @@ -333,15 +335,15 @@ run_main (int argc, ACE_TCHAR *argv[]) create_reactor (); // Manage memory automagically. - auto_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ()); - auto_ptr<ACE_Reactor_Impl> impl; + std::unique_ptr<ACE_Reactor> reactor (ACE_Reactor::instance ()); + std::unique_ptr<ACE_Reactor_Impl> impl; // If we are using other that the default implementation, we must // clean up. if (opt_select_reactor || opt_wfmo_reactor) { - auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ()); - impl = auto_impl; + std::unique_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ()); + impl = std::move(auto_impl); } Read_Handler::set_countdown (opt_nconnections); diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index 3f11928bfe0..f4d98da89e5 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -29,12 +29,12 @@ public: ACE_HANDLE read, ACE_HANDLE write); - ~Event_Handler (void); + ~Event_Handler () override; - int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask) override; ACE_Pipe pipe_; bool ok_; @@ -86,7 +86,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor, this->ok_ = true; } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Event_Handler::~Event_Handler for %@\n"), diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index ff2bd3898ad..16f23a6cbf1 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -36,13 +36,13 @@ public: protected: - virtual ~Bogus_Handler (void); + ~Bogus_Handler () override; - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - virtual int resume_handler (void); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; + int resume_handler () override; private: @@ -65,12 +65,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } -Bogus_Handler::~Bogus_Handler (void) +Bogus_Handler::~Bogus_Handler () { } ACE_HANDLE -Bogus_Handler::get_handle (void) const +Bogus_Handler::get_handle () const { return this->read_handle_; } @@ -102,7 +102,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, } int -Bogus_Handler::resume_handler (void) +Bogus_Handler::resume_handler () { // We don't want the reactor to resume this event handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -119,20 +119,20 @@ public: bool & okay_to_close, bool suspension_test); - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; protected: - virtual ~Bad_Handler (void); + ~Bad_Handler () override; private: - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; - int handle_input_result (void) const; + int handle_input_result () const; private: @@ -164,12 +164,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, } -Bad_Handler::~Bad_Handler (void) +Bad_Handler::~Bad_Handler () { } ACE_HANDLE -Bad_Handler::get_handle (void) const +Bad_Handler::get_handle () const { return this->read_handle_; } @@ -243,7 +243,7 @@ Bad_Handler::handle_close (ACE_HANDLE, } int -Bad_Handler::handle_input_result (void) const +Bad_Handler::handle_input_result () const { return (this->suspension_test_ @@ -362,15 +362,15 @@ handle_events (ACE_Reactor & reactor, // ------------------------------------------------------------ -typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void); +using reactor_factory_type = std::unique_ptr<ACE_Reactor_Impl> (*)(); -auto_ptr<ACE_Reactor_Impl> -tp_reactor_factory (void) +std::unique_ptr<ACE_Reactor_Impl> +tp_reactor_factory () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Creating ACE_TP_Reactor.\n"))); - return auto_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor); + return std::unique_ptr<ACE_Reactor_Impl> (new ACE_TP_Reactor); } // ------------------------------------------------------------ @@ -412,7 +412,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void> ACE_TEXT ("** Running removal test **\n"))); } - auto_ptr<ACE_Reactor_Impl> the_factory (factory ()); + std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ()); ACE_Reactor reactor (the_factory.get ()); // In this test, it's only okay to close the Bogus_Handler diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index 083dda5e5ff..943304eaf49 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -40,13 +40,13 @@ public: protected: - virtual ~Bogus_Handler (void); + ~Bogus_Handler () override; - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - virtual int resume_handler (void); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; + int resume_handler () override; private: @@ -69,12 +69,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } -Bogus_Handler::~Bogus_Handler (void) +Bogus_Handler::~Bogus_Handler () { } ACE_HANDLE -Bogus_Handler::get_handle (void) const +Bogus_Handler::get_handle () const { return this->read_handle_; } @@ -106,7 +106,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, } int -Bogus_Handler::resume_handler (void) +Bogus_Handler::resume_handler () { // We don't want the reactor to resume this event handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -123,20 +123,20 @@ public: bool & okay_to_close, bool suspension_test); - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; protected: - virtual ~Bad_Handler (void); + ~Bad_Handler () override; private: - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; - int handle_input_result (void) const; + int handle_input_result () const; private: @@ -168,12 +168,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, } -Bad_Handler::~Bad_Handler (void) +Bad_Handler::~Bad_Handler () { } ACE_HANDLE -Bad_Handler::get_handle (void) const +Bad_Handler::get_handle () const { return this->read_handle_; } @@ -247,7 +247,7 @@ Bad_Handler::handle_close (ACE_HANDLE, } int -Bad_Handler::handle_input_result (void) const +Bad_Handler::handle_input_result () const { return (this->suspension_test_ @@ -366,15 +366,15 @@ handle_events (ACE_Reactor & reactor, // ------------------------------------------------------------ -typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void); +using reactor_factory_type = std::unique_ptr<ACE_Reactor_Impl> (*)(); -auto_ptr<ACE_Reactor_Impl> -dev_poll_reactor_factory (void) +std::unique_ptr<ACE_Reactor_Impl> +dev_poll_reactor_factory () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Creating ACE_Dev_Poll_Reactor.\n"))); - return auto_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor); + return std::unique_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor); } // ------------------------------------------------------------ @@ -416,7 +416,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void> ACE_TEXT ("** Running removal test **\n"))); } - auto_ptr<ACE_Reactor_Impl> the_factory (factory ()); + std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ()); ACE_Reactor reactor (the_factory.get ()); // In this test, it's only okay to close the Bogus_Handler diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp index a3c2a3def0c..06158decf5c 100644 --- a/ACE/tests/Reactor_Timer_Test.cpp +++ b/ACE/tests/Reactor_Timer_Test.cpp @@ -33,15 +33,15 @@ public: Time_Handler (); /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; /// Called when <Time_Handler> is removed. - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; /// Return our timer id. - long timer_id (void) const; + long timer_id () const; /// Set our timer id; void timer_id (long); @@ -106,7 +106,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, } long -Time_Handler::timer_id (void) const +Time_Handler::timer_id () const { return this->timer_id_; } @@ -118,7 +118,7 @@ Time_Handler::timer_id (long t) } static void -test_registering_all_handlers (void) +test_registering_all_handlers () { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, @@ -141,7 +141,7 @@ test_registering_all_handlers (void) } static void -test_registering_one_handler (void) +test_registering_one_handler () { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, @@ -166,7 +166,7 @@ test_registering_one_handler (void) } static void -test_canceling_odd_timers (void) +test_canceling_odd_timers () { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, @@ -203,7 +203,7 @@ test_canceling_odd_timers (void) } static void -test_resetting_timer_intervals (void) +test_resetting_timer_intervals () { ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"), __LINE__, @@ -255,7 +255,7 @@ run_main (int argc, ACE_TCHAR *[]) // to do it right in at least one test. Notice the lack of // ACE_NEW_RETURN, that monstrosity has no business in proper C++ // code ... - auto_ptr<ACE_Timer_Heap_Variable_Time_Source> tq( + std::unique_ptr<ACE_Timer_Heap_Variable_Time_Source> tq( new ACE_Timer_Heap_Variable_Time_Source); // ... notice how the policy is in the derived timer queue type. // The abstract timer queue does not have a time policy ... diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp index dad89ebb4a0..c174fce9773 100644 --- a/ACE/tests/Reactors_Test.cpp +++ b/ACE/tests/Reactors_Test.cpp @@ -32,20 +32,20 @@ static const int MAX_TASKS = 20; class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (void *args = 0); - virtual int close (u_long flags = 0); - virtual int svc (void); + int open (void *args = 0) override; + int close (u_long flags = 0) override; + int svc () override; // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, - ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, + ACE_Reactor_Mask close_mask) override; private: /// Number of iterations handled. size_t handled_; @@ -60,7 +60,7 @@ int Test_Task::task_count_ = 0; static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex recursive_lock; -Test_Task::Test_Task (void) +Test_Task::Test_Task () : handled_ (0) { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock); @@ -72,7 +72,7 @@ Test_Task::Test_Task (void) Test_Task::task_count_)); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock); @@ -107,7 +107,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) svc\n"))); diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp index a4cc9bad69c..a9c747f5f2f 100644 --- a/ACE/tests/Reader_Writer_Test.cpp +++ b/ACE/tests/Reader_Writer_Test.cpp @@ -57,7 +57,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, long> current_writers; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp index 04e6224dca0..c2e4c9a6f8e 100644 --- a/ACE/tests/Recursive_Condition_Bug_Test.cpp +++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp @@ -27,14 +27,14 @@ // Number of iterations for the performance tests. static int max_iterations = 30; -typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue; +using Thread_Timer_Queue = ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>; class Test_Handler; class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + int svc () override { while (--max_iterations > 0) { @@ -72,7 +72,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0) + int open (void * = 0) override { //FUZZ: enable check_for_lack_ACE_OS if (ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP, 1) != 0) @@ -95,8 +95,8 @@ private: class Test_Handler : public ACE_Event_Handler { public: - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n"))); diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp index e1e596edf71..b7b30248c4b 100644 --- a/ACE/tests/Recursive_Condition_Test.cpp +++ b/ACE/tests/Recursive_Condition_Test.cpp @@ -22,16 +22,16 @@ #if defined (ACE_HAS_THREADS) -typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue; +using Thread_Timer_Queue = ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>; class Test_Handler : public ACE_Event_Handler { public: - Test_Handler (void) : nr_expirations_ (0) {} - int nr_expirations (void) { return this->nr_expirations_; } + Test_Handler () : nr_expirations_ (0) {} + int nr_expirations () { return this->nr_expirations_; } - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n"))); ++this->nr_expirations_; @@ -87,7 +87,7 @@ waiter (void *) } static int -test_1 (void) +test_1 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) @@ -116,7 +116,7 @@ test_1 (void) } static int -test_2 (void) +test_2 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) @@ -146,7 +146,7 @@ test_2 (void) } static int -test_3 (void) +test_3 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn_n (4, waiter) == -1) @@ -174,7 +174,7 @@ test_3 (void) } static int -test_4 (void) +test_4 () { const int recurse_count = 3; diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp index dab2e6658ab..891cf42b6df 100644 --- a/ACE/tests/Recursive_Mutex_Test.cpp +++ b/ACE/tests/Recursive_Mutex_Test.cpp @@ -35,7 +35,7 @@ typedef ACE_Process_Mutex ACE_TEST_MUTEX; #else # include "ace/Thread_Mutex.h" - typedef ACE_Recursive_Thread_Mutex ACE_TEST_MUTEX; + using ACE_TEST_MUTEX = ACE_Recursive_Thread_Mutex; #endif #if !defined (ACE_HAS_MUTEX_TIMEOUTS) diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp index a8b8049fdb7..5c79a13ef1b 100644 --- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp @@ -35,7 +35,7 @@ Printer::Printer (const char *message) ++Printer::instance_count_; } -Printer::~Printer (void) +Printer::~Printer () { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ Printer::~Printer (void) } void -Printer::print (void) +Printer::print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %C\n"), @@ -54,7 +54,7 @@ Printer::print (void) #if defined (ACE_HAS_THREADS) -typedef ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex> Printer_var; +using Printer_var = ACE_Refcounted_Auto_Ptr<Printer, ACE_Thread_Mutex>; /** * @class Scheduler @@ -71,27 +71,27 @@ class Scheduler : public ACE_Task<ACE_SYNCH> friend class Method_Request_end; public: /// Constructor. - Scheduler (void); + Scheduler (); //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; /// Terminator. - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Destructor. - virtual ~Scheduler (void); + ~Scheduler () override; // = These methods are part of the Active Object Proxy interface. void print (Printer_var &printer); - void end (void); + void end (); protected: /// Runs the Scheduler's event loop, which dequeues <Method_Requests> /// and dispatches them. - virtual int svc (void); + int svc () override; private: // = These are the <Scheduler> implementation details. @@ -107,10 +107,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (void); + ~Method_Request_print () override; /// This is the entry point into the Active Object method. - virtual int call (void); + int call () override; private: Printer_var printer_; @@ -126,7 +126,7 @@ Method_Request_print::Method_Request_print (Printer_var &printer) printer_.count ())); } -Method_Request_print::~Method_Request_print (void) +Method_Request_print::~Method_Request_print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); @@ -136,7 +136,7 @@ Method_Request_print::~Method_Request_print (void) } int -Method_Request_print::call (void) +Method_Request_print::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -156,8 +156,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + ~Method_Request_end () override; + int call () override; private: Scheduler *scheduler_; @@ -168,12 +168,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their @@ -186,7 +186,7 @@ Method_Request_end::call (void) // Associates the activation queue with this task's message queue, // allowing easy access to the message queue for shutting it down // when it's time to stop this object's service threads. -Scheduler::Scheduler (void) +Scheduler::Scheduler () : activation_queue_ (msg_queue ()) { ACE_DEBUG ((LM_DEBUG, @@ -195,7 +195,7 @@ Scheduler::Scheduler (void) // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); @@ -225,7 +225,7 @@ Scheduler::close (u_long) // Service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -238,7 +238,7 @@ Scheduler::svc (void) ACE_TEXT ("(%t) activation queue shut down\n"))); break; } - auto_ptr<ACE_Method_Request> mo (mo_p); + std::unique_ptr<ACE_Method_Request> mo (mo_p); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) calling method request\n"))); @@ -253,7 +253,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -276,7 +276,7 @@ static int n_loops = 10; // This will be used in a single thread to test the reset and release // methods. See Bugzilla #1925 for history. -typedef ACE_Refcounted_Auto_Ptr <Printer, ACE_Null_Mutex> Printer_Ptr; +using Printer_Ptr = ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex>; static bool expect (const ACE_TCHAR *name, const Printer_Ptr &ptr, @@ -323,7 +323,7 @@ static bool expect (const ACE_TCHAR *name, return !fail; } -static int test_reset_release (void) +static int test_reset_release () { int errors = 0; @@ -381,7 +381,7 @@ static int test_reset_release (void) return errors; } -static int test_operator(void) +static int test_operator() { int errors = 0; @@ -486,7 +486,7 @@ run_main (int, ACE_TCHAR *[]) Scheduler (), -1); - auto_ptr<Scheduler> scheduler(scheduler_ptr); + std::unique_ptr<Scheduler> scheduler(scheduler_ptr); if (scheduler->open () == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp index d0f233993e8..92bad5dd0dd 100644 --- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp +++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp @@ -32,16 +32,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -82,14 +82,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 4e5dc94ae29..61ab493c66c 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -43,23 +43,23 @@ public: Reference_Counted_Event_Handler (int &events); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; - int handle_signal (int, siginfo_t *, ucontext_t *); + int handle_signal (int, siginfo_t *, ucontext_t *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference () override; ACE_Pipe pipe_; @@ -81,7 +81,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int &events) this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { ACE_DEBUG ((LM_DEBUG, "Reference count in ~Reference_Counted_Event_Handler() is %d\n", @@ -182,7 +182,7 @@ Reference_Counted_Event_Handler::handle_close (ACE_HANDLE handle, } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::add_reference (void) +Reference_Counted_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -195,7 +195,7 @@ Reference_Counted_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::remove_reference (void) +Reference_Counted_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -474,19 +474,19 @@ public: Simple_Event_Handler (int &events, int close_count); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; - int handle_signal (int, siginfo_t *, ucontext_t *); + int handle_signal (int, siginfo_t *, ucontext_t *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; ACE_Pipe pipe_; @@ -509,7 +509,7 @@ Simple_Event_Handler::Simple_Event_Handler (int &events, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n"))); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n"))); @@ -772,16 +772,16 @@ public: Closed_In_Upcall_Event_Handler (int &events); - ~Closed_In_Upcall_Event_Handler (void); + ~Closed_In_Upcall_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference () override; ACE_Pipe pipe_; @@ -803,7 +803,7 @@ Closed_In_Upcall_Event_Handler::Closed_In_Upcall_Event_Handler (int &events) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Closed_In_Upcall_Event_Handler()\n"))); } -Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler (void) +Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Closed_In_Upcall_Event_Handler()\n"))); @@ -860,7 +860,7 @@ Closed_In_Upcall_Event_Handler::handle_close (ACE_HANDLE handle, } ACE_Event_Handler::Reference_Count -Closed_In_Upcall_Event_Handler::add_reference (void) +Closed_In_Upcall_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -873,7 +873,7 @@ Closed_In_Upcall_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Closed_In_Upcall_Event_Handler::remove_reference (void) +Closed_In_Upcall_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -940,11 +940,11 @@ template <class REACTOR_IMPLEMENTATION> class test { public: - test (void); + test (); }; template <class REACTOR_IMPLEMENTATION> -test<REACTOR_IMPLEMENTATION>::test (void) +test<REACTOR_IMPLEMENTATION>::test () { if (test_simple_event_handler) simple (new REACTOR_IMPLEMENTATION); diff --git a/ACE/tests/Reverse_Lock_Test.cpp b/ACE/tests/Reverse_Lock_Test.cpp index f9f8cefd2d6..fa8d5c32868 100644 --- a/ACE/tests/Reverse_Lock_Test.cpp +++ b/ACE/tests/Reverse_Lock_Test.cpp @@ -17,7 +17,7 @@ #include "ace/Guard_T.h" #include "ace/Reverse_Lock_T.h" -typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX; +using REVERSE_MUTEX = ACE_Reverse_Lock<ACE_MT_SYNCH::MUTEX>; int run_main (int, ACE_TCHAR *[]) diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index cc878c5da5f..78cabecb0d0 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -142,7 +142,7 @@ find_another_host (ACE_TCHAR other_host[]) } static int -fail_no_listener_nonblocking (void) +fail_no_listener_nonblocking () { ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8]; int status; @@ -224,7 +224,7 @@ fail_no_listener_nonblocking (void) // <ACE::handle_timed_complete> does checks on some systems. static int -succeed_nonblocking (void) +succeed_nonblocking () { ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8]; int status; diff --git a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp index 8951da96f1d..950aeeb67e9 100644 --- a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp +++ b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp @@ -197,7 +197,7 @@ int run_auto_test (const ACE_TCHAR *prog_name) return (receiver_exit_code); } -void print_usage (void) +void print_usage () { ACE_OS::printf("Usage:SOCK_Dgram_Bast_Test [-p port] [-n dgrams_no] [-t timeout_ms] [-s] [-r]\n" "\tp broadcast port [14521]\n" diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index decba0fbc08..d4c8e08bd2a 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -200,10 +200,10 @@ class Secondary_Ipaddr_Handler : public ACE_Event_Handler public: // Default constructor - Secondary_Ipaddr_Handler (void); + Secondary_Ipaddr_Handler (); // Destructor - virtual ~Secondary_Ipaddr_Handler (void); + ~Secondary_Ipaddr_Handler () override; //FUZZ: disable check_for_lack_ACE_OS // Initialization. Schedules a timer to run start the business. @@ -214,21 +214,21 @@ public: const char *const if_name); // Returns reference to netlink socket. Necessary for reactor. - virtual ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const override; /** * Takes care of the input. Reads the incoming messages, * makes their processing. */ - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; // Makes clean-up - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; // Runs a state machine. Controls adding/deleting of ip-address. int handle_timeout (ACE_Time_Value const & tv, - void const * arg = 0); + void const * arg = 0) override; // Sends to kernel a request to add secondary ip/mask to an // interface. @@ -418,7 +418,7 @@ Secondary_Ipaddr_Handler::open (ACE_Reactor *const reactor, } ACE_HANDLE -Secondary_Ipaddr_Handler::get_handle (void) const +Secondary_Ipaddr_Handler::get_handle () const { return this->socket_.get_handle (); } diff --git a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp index 28d9de04d4c..ef9d3e0812e 100644 --- a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp +++ b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp @@ -47,7 +47,7 @@ struct tdesc { bool ipv6_test; }; -typedef struct tdesc tdesc_t; +using tdesc_t = struct tdesc; #ifdef ACE_WIN64 // This arg is ignored on Windows and causes pointer truncation @@ -328,7 +328,7 @@ spawn_test(bool ipv6_test) } int -do_test(void) +do_test() { spawn_test(false); diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp index eeb406cb1cf..587750e5f66 100644 --- a/ACE/tests/SOCK_Send_Recv_Test.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test.cpp @@ -372,7 +372,7 @@ server (void *arg) #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SOCK_Test.cpp b/ACE/tests/SOCK_Test.cpp index e3405eaeabe..a283827c9d2 100644 --- a/ACE/tests/SOCK_Test.cpp +++ b/ACE/tests/SOCK_Test.cpp @@ -180,7 +180,7 @@ server (void *arg) } void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp index ff0b2dc2d3c..ab3a6aba346 100644 --- a/ACE/tests/SV_Shared_Memory_Test.cpp +++ b/ACE/tests/SV_Shared_Memory_Test.cpp @@ -34,7 +34,7 @@ static ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> & -myallocator (void) +myallocator () { static ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> myallocator; diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index 3f35395ed18..a2f240e4185 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -57,7 +57,7 @@ static size_t test_timeout_count = 3; // Tests the amount of time spent in a timed wait. static int -test_timeout (void) +test_timeout () { int status = 0; @@ -110,7 +110,7 @@ test_timeout (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-s n_release_count] [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Sendfile_Test.cpp b/ACE/tests/Sendfile_Test.cpp index 509dea6359e..73ad0224c49 100644 --- a/ACE/tests/Sendfile_Test.cpp +++ b/ACE/tests/Sendfile_Test.cpp @@ -262,7 +262,7 @@ server (void *arg) #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/Service_Config_DLL.cpp b/ACE/tests/Service_Config_DLL.cpp index 7befdeb437c..8b3e61d973b 100644 --- a/ACE/tests/Service_Config_DLL.cpp +++ b/ACE/tests/Service_Config_DLL.cpp @@ -35,7 +35,7 @@ invoke_service_config (void *arg) return 0; } -Service_Config_DLL::Service_Config_DLL (void) +Service_Config_DLL::Service_Config_DLL () { ACE_OS::memset (this->directive_[0], 0, BUFSIZ * sizeof (ACE_TCHAR)); ACE_OS::memset (this->directive_[1], 0, BUFSIZ * sizeof (ACE_TCHAR)); @@ -107,13 +107,13 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[]) } int -Service_Config_DLL::fini (void) +Service_Config_DLL::fini () { return 0; } int -Service_Config_DLL::svc (void) +Service_Config_DLL::svc () { if (ACE_Thread_Manager::instance ()->spawn (invoke_service_config, this->directive_[1]) == -1) @@ -243,7 +243,7 @@ Refuses_Init::init (int, ACE_TCHAR *[]) /// Terminates object when dynamic unlinking occurs. int -Refuses_Init::fini (void) +Refuses_Init::fini () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Refuses_Init::fini should not be called!\n"))); diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp index a31165cc425..c33e875e931 100644 --- a/ACE/tests/Service_Config_Stream_DLL.cpp +++ b/ACE/tests/Service_Config_Stream_DLL.cpp @@ -33,7 +33,7 @@ Test_Task::init (int, ACE_TCHAR *[]) } int -Test_Task::fini (void) +Test_Task::fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s\n"), diff --git a/ACE/tests/Service_Config_Stream_Test.cpp b/ACE/tests/Service_Config_Stream_Test.cpp index 4d86597a457..9c490dff055 100644 --- a/ACE/tests/Service_Config_Stream_Test.cpp +++ b/ACE/tests/Service_Config_Stream_Test.cpp @@ -32,7 +32,7 @@ class Static_Task : public ACE_Task<ACE_SYNCH> { public: - int open (void *) + int open (void *) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("opening %s\n"), @@ -40,7 +40,7 @@ public: return 0; } - int close (u_long) + int close (u_long) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing %s\n"), @@ -48,7 +48,7 @@ public: return 0; } - int init (int, ACE_TCHAR *[]) + int init (int, ACE_TCHAR *[]) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("initializing %s\n"), @@ -56,7 +56,7 @@ public: return 0; } - int fini (void) + int fini () override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s\n"), diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index 0f18dec845b..faecd5b834b 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -55,7 +55,7 @@ class Test_Singleton { public: static Test_Singleton *instance (u_short variety); - ~Test_Singleton (void); + ~Test_Singleton (); private: u_short variety_; @@ -111,7 +111,7 @@ Test_Singleton::Test_Singleton (u_short variety) // We can't reliably use ACE_Log_Msg in a destructor that is called by // ACE_Object_Manager. Yet. -Test_Singleton::~Test_Singleton (void) +Test_Singleton::~Test_Singleton () { /* ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_Singleton %u dtor\n"), variety_)); */ diff --git a/ACE/tests/Sig_Handlers_Test.cpp b/ACE/tests/Sig_Handlers_Test.cpp index df5ff2e3929..495fc85aadc 100644 --- a/ACE/tests/Sig_Handlers_Test.cpp +++ b/ACE/tests/Sig_Handlers_Test.cpp @@ -38,12 +38,12 @@ public: Test_SIGINT_Handler::registration_count_++; } - ~Test_SIGINT_Handler() + ~Test_SIGINT_Handler() override { ACE_TEST_ASSERT (Test_SIGINT_Handler::handle_signal_count_ == Test_SIGINT_Handler::registration_count_); } - virtual int handle_signal (int signal, siginfo_t *, ucontext_t *) + int handle_signal (int signal, siginfo_t *, ucontext_t *) override { ACE_TEST_ASSERT (signal == SIGINT); ACE_DEBUG ((LM_DEBUG, @@ -77,7 +77,7 @@ public: result)); } - virtual int handle_signal (int signal, siginfo_t *, ucontext_t *) + int handle_signal (int signal, siginfo_t *, ucontext_t *) override { ACE_TEST_ASSERT (signal == SIGINT); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/Singleton_Restart_Test.cpp b/ACE/tests/Singleton_Restart_Test.cpp index 9d1e69b5ab9..f18966df030 100644 --- a/ACE/tests/Singleton_Restart_Test.cpp +++ b/ACE/tests/Singleton_Restart_Test.cpp @@ -23,8 +23,8 @@ void report_error (const ACE_TCHAR *lock) ACE_TEXT ("failed to allocate\n"), lock)); } -typedef ACE_Singleton<int, ACE_SYNCH_MUTEX> Singleton1; -typedef ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> Singleton2; +using Singleton1 = ACE_Singleton<int, ACE_MT_SYNCH::MUTEX>; +using Singleton2 = ACE_Singleton<int, ACE_MT_SYNCH::RECURSIVE_MUTEX>; int main () { diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp index 459900efb4a..0b1973d4f47 100644 --- a/ACE/tests/Svc_Handler_Test.cpp +++ b/ACE/tests/Svc_Handler_Test.cpp @@ -20,7 +20,7 @@ #include "ace/Svc_Handler.h" #include "ace/Synch_Traits.h" -typedef ACE_Buffered_Svc_Handler <ACE_FILE_IO, ACE_NULL_SYNCH> SVC_HANDLER; +using SVC_HANDLER = ACE_Buffered_Svc_Handler<ACE_FILE_IO, ACE_NULL_SYNCH>; static void run_test (SVC_HANDLER &svc_handler, diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 50e34740ada..48691c478c4 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -124,19 +124,19 @@ public: class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): sem_ ((unsigned int) 0), + MyTask (): sem_ ((unsigned int) 0), my_reactor_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (void); + int svc () override; int start (int num_threads); - int stop (void); + int stop (); private: - int create_reactor (void); - int delete_reactor (void); + int create_reactor (); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -144,7 +144,7 @@ private: }; int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -172,7 +172,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -213,7 +213,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -237,7 +237,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) MyTask started\n"))); @@ -255,7 +255,7 @@ MyTask::svc (void) // ************************************************************* -Acceptor::Acceptor (void) +Acceptor::Acceptor () : ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR> ((ACE_Reactor *) 0), sessions_ (0), total_snd_(0), @@ -269,14 +269,14 @@ Acceptor::Acceptor (void) this->list_receivers_[i] =0; } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->reactor (0); stop (); } void -Acceptor::stop (void) +Acceptor::stop () { // this method can be called only after reactor event loop id done // in all threads @@ -384,7 +384,7 @@ Receiver::Receiver (Acceptor * acceptor, size_t index) } -Receiver::~Receiver (void) +Receiver::~Receiver () { this->reactor (0); if (acceptor_ != 0) @@ -405,7 +405,7 @@ Receiver::~Receiver (void) } int -Receiver::check_destroy (void) +Receiver::check_destroy () { if (flg_mask_ == ACE_Event_Handler::NULL_MASK) return -1; @@ -614,7 +614,7 @@ Receiver::handle_output (ACE_HANDLE h) // ************************************************************* -Connector::Connector (void) +Connector::Connector () : ACE_Connector<Sender,ACE_SOCK_CONNECTOR> ((ACE_Reactor *) 0), sessions_ (0), total_snd_(0), @@ -628,7 +628,7 @@ Connector::Connector (void) this->list_senders_[i] = 0; } -Connector::~Connector (void) +Connector::~Connector () { this->reactor (0); stop (); @@ -763,7 +763,7 @@ Sender::Sender (Connector* connector, size_t index) } -Sender::~Sender (void) +Sender::~Sender () { this->reactor (0); if (connector_ != 0) @@ -784,7 +784,7 @@ Sender::~Sender (void) } int -Sender::check_destroy (void) +Sender::check_destroy () { if (flg_mask_ == ACE_Event_Handler::NULL_MASK) return -1; @@ -815,7 +815,7 @@ int Sender::open (void *) } int -Sender::initiate_write (void) +Sender::initiate_write () { if ( this->msg_queue ()->message_count () < 20) // flow control { diff --git a/ACE/tests/TSS_Leak_Test.cpp b/ACE/tests/TSS_Leak_Test.cpp index 2b7bf87e453..e405fa2a216 100644 --- a/ACE/tests/TSS_Leak_Test.cpp +++ b/ACE/tests/TSS_Leak_Test.cpp @@ -20,7 +20,7 @@ struct Task : ACE_Task_Base { explicit Task (ACE_TSS<X> *tss) : tss_(tss) {} - int svc (void) + int svc () override { X *x = *tss_; ACE_UNUSED_ARG (x); diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index abe6e5b7bf9..b15d5bb57a6 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -40,10 +40,10 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// activate/spawn the threads. ///FUZZ: enable check_for_lack_ACE_OS - int open (void*); + int open (void*) override; /// svc thread entry point - virtual int svc (void); + int svc () override; private: }; diff --git a/ACE/tests/Task_Group_Test.cpp b/ACE/tests/Task_Group_Test.cpp index 93017948af8..d46c32597a1 100644 --- a/ACE/tests/Task_Group_Test.cpp +++ b/ACE/tests/Task_Group_Test.cpp @@ -28,11 +28,11 @@ class Waiter_Task : public ACE_Task_Base public: Waiter_Task (ACE_Thread_Manager* tm = 0) : ACE_Task_Base (tm) {} - virtual int svc(void); + int svc() override; }; int -Waiter_Task::svc(void) +Waiter_Task::svc() { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|grp_id=%d) waiting for thread cancellation.\n"), this->grp_id ())); diff --git a/ACE/tests/Task_Test.cpp b/ACE/tests/Task_Test.cpp index 967fa03f5fb..29168a8a423 100644 --- a/ACE/tests/Task_Test.cpp +++ b/ACE/tests/Task_Test.cpp @@ -30,8 +30,8 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> close_cleanups (0); class My_Thread_Hook : public ACE_Thread_Hook { public: - virtual ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, - void *arg); + ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, + void *arg) override; }; class Barrier_Task : public ACE_Task<ACE_MT_SYNCH> @@ -43,11 +43,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + int svc () override; private: /// Reference to the tester barrier. This controls each iteration of @@ -94,7 +94,7 @@ Barrier_Task::close (u_long) // Iterate <n_iterations> time printing off a message and "waiting" // for all other threads to complete this iteration. int -Barrier_Task::svc (void) +Barrier_Task::svc () { for (int iterations = 1; iterations <= this->n_iterations_; diff --git a/ACE/tests/Task_Wait_Test.cpp b/ACE/tests/Task_Wait_Test.cpp index ba56ebc1737..0638e66ffae 100644 --- a/ACE/tests/Task_Wait_Test.cpp +++ b/ACE/tests/Task_Wait_Test.cpp @@ -33,9 +33,9 @@ static ACE_Event TaskDone; class Do_Nothing_Task : public ACE_Task_Base { public: - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; - virtual int svc (void); + int svc () override; }; // close tries to wait for other threads. There aren't any, but as long as @@ -54,7 +54,7 @@ Do_Nothing_Task::close (u_long) // svc just waits a second then exits. int -Do_Nothing_Task::svc (void) +Do_Nothing_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Task 0x%x, thread %t waiting to exit\n"), diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp index dc236ce0567..a886cfed6a3 100644 --- a/ACE/tests/Test_Output.cpp +++ b/ACE/tests/Test_Output.cpp @@ -35,7 +35,7 @@ ACE_Test_Output *ACE_Test_Output::instance_ = 0; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr, 0); @@ -59,7 +59,7 @@ ACE_Test_Output::~ACE_Test_Output (void) } OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { // the output_file_ is loaned to ACE_LOG_MSG // and something else might destroy and/or change the stream @@ -160,7 +160,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { if (this->output_file_ && (this->output_file_ == ACE_LOG_MSG->msg_ostream ())) @@ -199,19 +199,19 @@ ACE_Test_Output::instance () } const ACE_TCHAR * -ACE_Test_Output::dll_name (void) +ACE_Test_Output::dll_name () { return ACE_TEXT ("Test_Output"); } const ACE_TCHAR * -ACE_Test_Output::name (void) +ACE_Test_Output::name () { return ACE_TEXT ("ACE_Test_Output"); } void -ACE_Test_Output::close_singleton (void) +ACE_Test_Output::close_singleton () { delete ACE_Test_Output::instance_; ACE_Test_Output::instance_ = 0; diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp index 8a6f4317e11..3f70624918c 100644 --- a/ACE/tests/Thread_Attrs_Test.cpp +++ b/ACE/tests/Thread_Attrs_Test.cpp @@ -23,11 +23,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS // Spawn the thread - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS // Check the cancel settings against what is expected then exit. - virtual int svc (void); + int svc () override; /// Returns true iff settings match what was requested. bool operator! (); @@ -50,7 +50,7 @@ Cancel_Check::Cancel_Check (bool enable, bool async) } int -Cancel_Check::svc (void) +Cancel_Check::svc () { #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) int state; @@ -132,11 +132,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the thread - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Check the stack size against what is expected then exit. - virtual int svc (void); + int svc () override; /// Returns true iff failed_ == false. bool operator! (); @@ -160,7 +160,7 @@ Stack_Size_Check::Stack_Size_Check (size_t stack_size) } int -Stack_Size_Check::svc (void) +Stack_Size_Check::svc () { size_t my_size = 0; diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index 2a13f4a5aa7..04d501e1eb6 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -57,11 +57,11 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (void); + ~Thread_Pool () override; /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + int svc () override; /// Start the threads in the pool. void start(); @@ -80,11 +80,11 @@ public: private: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the threads in the pool. - virtual int open (void * = 0); + int open (void * = 0) override; /// Close hook. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; /// Total number of threads activated through this thread pool ever. ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> total_activated_threads_; @@ -103,7 +103,7 @@ Thread_Pool::operator!() return ! this->failed_; } -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -139,7 +139,7 @@ Thread_Pool::start () } int -Thread_Pool::svc (void) +Thread_Pool::svc () { unsigned long t = ++this->total_activated_threads_; if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index a31d7f1ee12..5a991655193 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -147,7 +147,7 @@ class ThrMgr_Task : public ACE_Task_Base { public: ThrMgr_Task (ACE_Thread_Manager *); - virtual int svc (void); + int svc () override; static int errors; }; @@ -162,7 +162,7 @@ ThrMgr_Task::ThrMgr_Task (ACE_Thread_Manager *mgr) // svc just waits til it's been cancelled, then exits. int -ThrMgr_Task::svc (void) +ThrMgr_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Task 0x%x, thread %t waiting to be cancelled\n"), diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp index de1bf1f59e9..b8b0485b56b 100644 --- a/ACE/tests/Thread_Mutex_Test.cpp +++ b/ACE/tests/Thread_Mutex_Test.cpp @@ -32,7 +32,7 @@ typedef ACE_Process_Mutex ACE_TEST_MUTEX; #else # include "ace/Thread_Mutex.h" - typedef ACE_Thread_Mutex ACE_TEST_MUTEX; + using ACE_TEST_MUTEX = ACE_Thread_Mutex; #endif #if !defined (ACE_HAS_MUTEX_TIMEOUTS) @@ -236,7 +236,7 @@ test (void *args) #endif /* ACE_HAS_THREADS */ static void -spawn (void) +spawn () { #if defined (ACE_HAS_THREADS) ACE_TEST_MUTEX mutex; diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index 3770f3d63ec..16835222354 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -43,7 +43,7 @@ #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Resume_Test.h" -typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR; +using ACCEPTOR = ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_Acceptor>; // Accepting end point. This is actually "localhost:10010", but some // platform couldn't resolve the name so we use the IP address @@ -149,12 +149,12 @@ Request_Handler::open (void *arg) return result; } -Request_Handler::~Request_Handler (void) +Request_Handler::~Request_Handler () { } int -Request_Handler::resume_handler (void) +Request_Handler::resume_handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) resume_handler () called\n"))); diff --git a/ACE/tests/Thread_Pool_Reactor_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Test.cpp index 15d718d6c1e..07c134f96fd 100644 --- a/ACE/tests/Thread_Pool_Reactor_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Test.cpp @@ -46,7 +46,7 @@ #if defined (ACE_HAS_THREADS) && !defined ACE_LACKS_ACCEPT #include "Thread_Pool_Reactor_Test.h" -typedef ACE_Strategy_Acceptor <Request_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR; +using ACCEPTOR = ACE_Strategy_Acceptor<Request_Handler, ACE_SOCK_Acceptor>; // Accepting end point. This is actually "localhost:10010", but some // platform couldn't resolve the name so we use the IP address diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 6e4d0a061bf..0a76061e31a 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -45,14 +45,14 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (void); + ~Thread_Pool () override; /** * Activate the task's thread pool, produce the messages that are * consumed by the threads in the thread pool, and demonstate how to * shutdown using the <ACE_Message_Queue::deactivate> method. */ - int test_queue_deactivation_shutdown (void); + int test_queue_deactivation_shutdown (); /** * Activate the task's thread pool, produce the messages that are, @@ -60,24 +60,24 @@ public: * thread pool, and demonstrate how to shutdown by enqueueing * "empty" messages into the queue. */ - int test_empty_message_shutdown (void); + int test_empty_message_shutdown (); /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + int svc () override; /// Allows the producer to pass messages to the <Thread_Pool>. - virtual int put (ACE_Message_Block *mb, - ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, + ACE_Time_Value *tv = 0) override; private: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the threads in the pool. - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Close hook. - virtual int close (u_long); + int close (u_long) override; /// Serialize access to <ACE_Message_Block> reference count, which /// will be decremented by multiple threads. @@ -87,7 +87,7 @@ private: int n_threads_; }; -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -117,7 +117,7 @@ Thread_Pool::put (ACE_Message_Block *mb, // other threads to complete this iteration. int -Thread_Pool::svc (void) +Thread_Pool::svc () { // Keep looping, reading a message out of the queue, until we get a // message with a length == 0, which signals us to quit. @@ -195,7 +195,7 @@ Thread_Pool::open (void *) // shutdown using the <ACE_Message_Queue::deactivate> method. int -Thread_Pool::test_queue_deactivation_shutdown (void) +Thread_Pool::test_queue_deactivation_shutdown () { if (this->open () == -1) return -1; @@ -287,7 +287,7 @@ Thread_Pool::test_queue_deactivation_shutdown (void) // messages into the queue. int -Thread_Pool::test_empty_message_shutdown (void) +Thread_Pool::test_empty_message_shutdown () { if (this->open () == -1) return -1; diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index 600f9cba8d5..f932dbd2ad5 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -52,9 +52,7 @@ class CCustomEventHandlerUpcall { public: - typedef ACE_Timer_Queue_T<ICustomEventHandler*, - CCustomEventHandlerUpcall, - ACE_Null_Mutex> TTimerQueue; + using TTimerQueue = ACE_Timer_Queue_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>; /// Default constructor CCustomEventHandlerUpcall() @@ -130,7 +128,7 @@ class CTestEventHandler : public ICustomEventHandler /// Default destructor. /// /// @return - virtual ~CTestEventHandler() + ~CTestEventHandler() override { ACE_DEBUG((LM_DEBUG, ACE_TEXT("%I(%t) Destroying test event handler.\n"))); } @@ -139,7 +137,7 @@ class CTestEventHandler : public ICustomEventHandler /// /// @return int /// @param p_vParameter - virtual int operator() (void* p_vParameter) + int operator() (void* p_vParameter) override { long iParameter = ACE_Utils::truncate_cast<long> ((intptr_t)p_vParameter); @@ -162,14 +160,9 @@ class CTestEventHandler : public ICustomEventHandler }; // Used for the actual timer queue thread adapter -typedef ACE_Timer_Wheel_T <ICustomEventHandler*, - CCustomEventHandlerUpcall, - ACE_Null_Mutex> TTimerWheel; -typedef ACE_Timer_Wheel_Iterator_T <ICustomEventHandler*, - CCustomEventHandlerUpcall, - ACE_Null_Mutex> TTimerWheelIterator; -typedef ACE_Thread_Timer_Queue_Adapter<TTimerWheel, - ICustomEventHandler*> TTimerWheelThreadAdapter; +using TTimerWheel = ACE_Timer_Wheel_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>; +using TTimerWheelIterator = ACE_Timer_Wheel_Iterator_T<ICustomEventHandler *, CCustomEventHandlerUpcall, ACE_Null_Mutex>; +using TTimerWheelThreadAdapter = ACE_Thread_Timer_Queue_Adapter<TTimerWheel, ICustomEventHandler *>; #endif /* ACE_HAS_THREADS */ diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index b48f2a8849c..b4f3aa96d46 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -20,14 +20,14 @@ class Deadlock : public ACE_Task_Base { public: - int svc (void); + int svc () override; int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + const void *act) override; }; int -Deadlock::svc (void) +Deadlock::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deadlock starts accessing Reactor and Timer Queue....\n"))); @@ -59,10 +59,10 @@ public: Event_Handler (Deadlock &deadlock); int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + const void *act) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask) override; Deadlock &deadlock_; }; diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index c1e0925d203..94f7f395e85 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -48,13 +48,13 @@ public: Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask masks); + ACE_Reactor_Mask masks) override; int expected_number_of_handle_close_calls_; int number_of_handle_close_calls_; @@ -73,7 +73,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int expected_n this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -249,7 +249,7 @@ cancellation_test<TIMER_QUEUE>::cancellation_test (const char *timer_queue_type) } } -typedef int (*Expire_Function) (ACE_Timer_Queue &timer_queue); +using Expire_Function = int (*)(ACE_Timer_Queue &); int invoke_expire (ACE_Timer_Queue &timer_queue) @@ -350,25 +350,25 @@ class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (void); + Simple_Event_Handler (); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; }; -Simple_Event_Handler::Simple_Event_Handler (void) +Simple_Event_Handler::Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, "Simple_Event_Handler()\n")); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/Timer_Queue_Test.cpp b/ACE/tests/Timer_Queue_Test.cpp index 563c988b984..dd78a5840a9 100644 --- a/ACE/tests/Timer_Queue_Test.cpp +++ b/ACE/tests/Timer_Queue_Test.cpp @@ -52,17 +52,17 @@ static long *timer_ids = 0; class Example_Handler : public ACE_Event_Handler { public: - Example_Handler (void): close_count_ (0) {} + Example_Handler (): close_count_ (0) {} - virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) override { ACE_TEST_ASSERT (mask == ACE_Event_Handler::TIMER_MASK); this->close_count_++; return 0; } - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { int *act = (int *) arg; ACE_TEST_ASSERT (*act == 42 || *act == 007); @@ -82,9 +82,9 @@ public: struct Interval_Handler : public ACE_Event_Handler { - Interval_Handler (void) : trip_count_ (0) { } + Interval_Handler () : trip_count_ (0) { } - virtual int handle_timeout (const ACE_Time_Value & , const void *) + int handle_timeout (const ACE_Time_Value & , const void *) override { ++trip_count_; return 0; @@ -521,7 +521,7 @@ test_performance (ACE_Timer_Queue *tq, // of ACE_Timer_Heap timer IDs around the boundary of having to enlarge // the heap. static void -test_unique_timer_heap_ids (void) +test_unique_timer_heap_ids () { Example_Handler eh; ACE_Timer_Heap timer_heap (44); @@ -684,11 +684,7 @@ run_main (int argc, ACE_TCHAR *argv[]) -1); // new (optimized) version - typedef ACE_Timer_Heap_T<ACE_Event_Handler *, - ACE_Event_Handler_Handle_Timeout_Upcall, - ACE_SYNCH_RECURSIVE_MUTEX, - ACE_HR_Time_Policy> - timer_heap_hr_type; + using timer_heap_hr_type = ACE_Timer_Heap_T<ACE_Event_Handler *, ACE_Event_Handler_Handle_Timeout_Upcall, ACE_MT_SYNCH::RECURSIVE_MUTEX, ACE_HR_Time_Policy>; ACE_NEW_RETURN (tq_stack, Timer_Queue_Stack (new timer_heap_hr_type, ACE_TEXT ("ACE_Timer_Heap (high-res timer)"), diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index ae53a319d69..be38354ffdf 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -33,13 +33,13 @@ public: Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO, int threads = 5, int invocations = 10); - ~Token_Strategy_Test (void); + ~Token_Strategy_Test () override; //FUZZ: disable check_for_lack_ACE_OS - int open (void *a = 0); + int open (void *a = 0) override; //FUZZ: enable check_for_lack_ACE_OS - int svc (void); + int svc () override; private: // Number of threads for the test, must be 5 or more. @@ -105,7 +105,7 @@ Token_Strategy_Test::Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy, this->invocations_)); } -Token_Strategy_Test::~Token_Strategy_Test (void) +Token_Strategy_Test::~Token_Strategy_Test () {} int @@ -121,7 +121,7 @@ Token_Strategy_Test::open (void *) } int -Token_Strategy_Test::svc (void) +Token_Strategy_Test::svc () { int current = this->active_.value (); ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> > active_counter (this->active_); diff --git a/ACE/tests/UUID_Test.cpp b/ACE/tests/UUID_Test.cpp index 7585d6b173e..972464ed2ce 100644 --- a/ACE/tests/UUID_Test.cpp +++ b/ACE/tests/UUID_Test.cpp @@ -17,16 +17,16 @@ class Tester { public: - int test (void); + int test (); }; int -Tester::test (void) +Tester::test () { int retval = 0; // Generate UUID - auto_ptr <ACE_Utils::UUID> uuid (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ()); + std::unique_ptr <ACE_Utils::UUID> uuid (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID ()); ACE_CString uuid_str (uuid->to_string ()->c_str ()); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Generated UUID\n %C\n"), @@ -107,7 +107,7 @@ Tester::test (void) -1); // Generate UUID with process and thread ids. - auto_ptr <ACE_Utils::UUID> + std::unique_ptr <ACE_Utils::UUID> uuid_with_tp_id (ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID (0x0001, 0xc0)); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/Unbounded_Set_Test.cpp b/ACE/tests/Unbounded_Set_Test.cpp index b551735de33..8c9e18875f8 100644 --- a/ACE/tests/Unbounded_Set_Test.cpp +++ b/ACE/tests/Unbounded_Set_Test.cpp @@ -100,7 +100,7 @@ run_main (int, ACE_TCHAR *[]) // Test assigment of sets. // To do that, we also test some of the iterator methods. - typedef ACE_Unbounded_Set<MyNode> MySet; + using MySet = ACE_Unbounded_Set<MyNode>; MySet ubs2 = ubs; // Test a typedef of a set. if (ubs2.size() != ubs.size()) { diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index f7bf15892ca..e0f02830709 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -72,7 +72,7 @@ static Linked_List *linked_list_ptr; // 0 if not found, // -1 on an error static int -find_last (void) +find_last () { find_called++; @@ -97,7 +97,7 @@ find_last (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n") @@ -144,7 +144,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // while we have a read lock. int -Reader_Task::svc (void) +Reader_Task::svc () { ACE_Profile_Timer timer; ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time; @@ -219,7 +219,7 @@ Reader_Task::svc (void) // checking that nobody steps on it while we can write it. int -Writer_Task::svc (void) +Writer_Task::svc () { ACE_Profile_Timer timer; ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time; @@ -269,7 +269,7 @@ Time_Calculation::report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time } void -Time_Calculation ::print_stats (void) +Time_Calculation ::print_stats () { ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time = this->times_; u_int iterations = 1; @@ -310,7 +310,7 @@ Time_Calculation ::print_stats (void) } static int -init (void) +init () { char entry[MAX_STRING_SIZE]; ACE_CString *cString_ptr = 0; diff --git a/ACE/tests/Vector_Test.cpp b/ACE/tests/Vector_Test.cpp index cac2f398faa..50b9a08f038 100644 --- a/ACE/tests/Vector_Test.cpp +++ b/ACE/tests/Vector_Test.cpp @@ -15,9 +15,9 @@ #include "ace/Vector_T.h" -typedef size_t DATA; -typedef ACE_Vector<DATA> VECTOR; -typedef ACE_Vector<DATA>::Iterator ITERATOR; +using DATA = size_t; +using VECTOR = ACE_Vector<DATA>; +using ITERATOR = ACE_Vector<DATA>::Iterator; const size_t TOP = 100; const size_t LEFT = 10; diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index 52eab82cd74..9a92df4f4fc 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -135,7 +135,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t, n), pd_constant_value (v), pd_et (t), - ifr_added_ (0) + ifr_added_ (false) { } @@ -148,7 +148,7 @@ AST_Constant::AST_Constant (AST_Expression::ExprType t, n), pd_constant_value (v), pd_et (t), - ifr_added_ (0) + ifr_added_ (false) { // Avoids a truncation warning on MSVC when assigning a decimal // literal to a float constant. Must also check that the input @@ -290,7 +290,7 @@ AST_Constant::enum_full_name () { UTL_Scope * const s = this->defined_in (); AST_Decl * const d = s->lookup_by_name (this->pd_constant_value->n (), - 1); + true); return (d ? (ScopeAsDecl (d->defined_in ()))->name () : nullptr); } else diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 5ad0e4bb1c1..e2803ef69af 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -895,16 +895,16 @@ AST_Decl::is_child (AST_Decl *s) AST_Decl *d = ScopeAsDecl (this->defined_in ()); if (!d) { - return 0; + return false; } if (!ACE_OS::strcmp (d->full_name (), s->full_name ())) { - return 1; + return true; } } - return 0; // Not a child. + return false; // Not a child. } bool diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp index f57812ca7eb..c7b023cbfb2 100644 --- a/TAO/TAO_IDL/ast/ast_exception.cpp +++ b/TAO/TAO_IDL/ast/ast_exception.cpp @@ -176,7 +176,7 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) // Not in recursion. if (self_test) this->in_recursion_ = 0; - return 0; //this->in_recursion_; + return false; //this->in_recursion_; } // Dump this AST_Exception node to the ostream o. diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 781a35d2a72..4471118069d 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -1604,9 +1604,9 @@ incompatible_types (AST_Expression::ExprType t1, case AST_Expression::EV_ulonglong: case AST_Expression::EV_octet: case AST_Expression::EV_bool: - return 0; + return false; default: - return 1; + return true; } case AST_Expression::EV_float: case AST_Expression::EV_double: @@ -1616,9 +1616,9 @@ incompatible_types (AST_Expression::ExprType t1, case AST_Expression::EV_float: case AST_Expression::EV_double: case AST_Expression::EV_longdouble: - return 0; + return false; default: - return 1; + return true; } case AST_Expression::EV_fixed: return t2 != AST_Expression::EV_fixed; @@ -1632,7 +1632,7 @@ incompatible_types (AST_Expression::ExprType t1, case AST_Expression::EV_void: case AST_Expression::EV_none: default: - return 0; + return false; } } @@ -2540,8 +2540,8 @@ AST_Expression::type_mismatch (AST_Expression::ExprType t) return incompatible_types (this->pd_ev->et, t); } - bool v1_mismatch = 0; - bool v2_mismatch = 0; + bool v1_mismatch = false; + bool v2_mismatch = false; if (this->pd_v1 != nullptr) { @@ -2567,7 +2567,7 @@ AST_Expression::check_and_coerce (AST_Expression::ExprType t, { AST_Decl *enum_val = idl_global->scopes ().top_non_null ()->lookup_by_name (this->pd_n, - 1); + true); if (enum_val != nullptr) { diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 45558733013..0ded8e138f0 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -412,7 +412,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, void AST_Interface::redef_clash_populate_r (AST_Type *t) { - if (this->insert_non_dup (t, 0) == 0) + if (this->insert_non_dup (t, false) == 0) { return; } diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 53645653611..feb4facbaa5 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -105,7 +105,7 @@ AST_Decl::NodeType const AST_Module::AST_Module (UTL_ScopedName *n, AST_Module *previous) : AST_Decl (AST_Decl::NT_module, n), UTL_Scope (AST_Decl::NT_module), - pd_has_nested_valuetype_ (0), + pd_has_nested_valuetype_ (false), previous_opening_ (previous), last_in_same_parent_scope_ (this), from_inst_ (nullptr), @@ -168,7 +168,7 @@ AST_Module::set_has_nested_valuetype () } } - this->pd_has_nested_valuetype_ = 1; + this->pd_has_nested_valuetype_ = true; } bool diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index 08c9d0059f9..282635fe6f9 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -81,10 +81,10 @@ AST_Type::AST_Type (AST_Decl::NodeType nt, : COMMON_Base (), AST_Decl (nt, n), - ifr_added_ (0), - ifr_fwd_added_ (0), + ifr_added_ (false), + ifr_fwd_added_ (false), size_type_ (AST_Type::SIZE_UNKNOWN), - has_constructor_ (0), + has_constructor_ (false), nested_type_name_ (nullptr), in_recursion_ (-1), recursing_in_legal_pk_ (false) @@ -140,7 +140,7 @@ bool AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> & /*list*/) { // By default we are not involved in recursion. - return 0; + return false; } bool diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index 34bb18159a8..08606bab3db 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -304,7 +304,7 @@ AST_Union::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) // Not in recursion. if (self_test) this->in_recursion_ = 0; - return 0; + return false; } // Look up the default branch in union. @@ -686,7 +686,7 @@ AST_Union::compute_default_value () this->default_value_.u.wchar_val = 0; break; case AST_Expression::EV_bool: - this->default_value_.u.bool_val = 0; + this->default_value_.u.bool_val = false; break; case AST_Expression::EV_enum: this->default_value_.u.enum_val = 0; diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 6b2859ef63a..876c01a32e2 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -378,7 +378,7 @@ TAO_CodeGen::start_client_stubs (const char *fname) // header file. *this->client_stubs_ << "\n\n#if !defined (__ACE_INLINE__)"; *this->client_stubs_ << "\n#include \"" - << be_global->be_get_client_inline_fname (1) + << be_global->be_get_client_inline_fname (true) << "\""; *this->client_stubs_ << "\n#endif /* !defined INLINE */"; } @@ -498,7 +498,7 @@ TAO_CodeGen::start_server_header (const char *fname) UTL_String idl_name_str (idl_name); char const * const server_hdr = - BE_GlobalData::be_get_server_hdr (&idl_name_str, 1); + BE_GlobalData::be_get_server_hdr (&idl_name_str, true); idl_name_str.destroy (); @@ -655,7 +655,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname) // Generate the include statement for the server header. *this->server_skeletons_ << "\n#include \"" - << be_global->be_get_server_hdr_fname (1) + << be_global->be_get_server_hdr_fname (true) << "\""; this->gen_skel_src_includes (); @@ -956,7 +956,7 @@ TAO_CodeGen::start_anyop_source (const char *fname) // Generate the include statement for the client header. We just // need to put only the base names. Path info is not required. *this->anyop_source_ << "\n#include \"" - << be_global->be_get_anyop_header_fname (1) + << be_global->be_get_anyop_header_fname (true) << "\""; this->gen_typecode_includes (this->anyop_source_); @@ -1608,7 +1608,7 @@ TAO_CodeGen::start_implementation_header (const char *fname) "", "_H_"); - const char* server_hdr = BE_GlobalData::be_get_server_hdr_fname (1); + const char* server_hdr = BE_GlobalData::be_get_server_hdr_fname (true); *this->implementation_header_<< "#include \"" << server_hdr <<"\""; @@ -1695,7 +1695,7 @@ TAO_CodeGen::end_client_header () // Insert the code to include the inline file. *this->client_header_ << "#if defined (__ACE_INLINE__)\n"; *this->client_header_ << "#include \"" - << be_global->be_get_client_inline_fname (1) + << be_global->be_get_client_inline_fname (true) << "\"\n"; *this->client_header_ << "#endif /* defined INLINE */\n\n"; } @@ -1838,7 +1838,7 @@ TAO_CodeGen::end_server_template_header () << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"; *this->server_template_header_ << be_nl << "#include \"" - << be_global->be_get_server_template_skeleton_fname (1) + << be_global->be_get_server_template_skeleton_fname (true) << "\""; *this->server_template_header_ << be_nl << "#endif /* defined REQUIRED SOURCE */"; @@ -1848,7 +1848,7 @@ TAO_CodeGen::end_server_template_header () << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"; *this->server_template_header_ << be_nl << "#pragma implementation (\"" - << be_global->be_get_server_template_skeleton_fname (1) + << be_global->be_get_server_template_skeleton_fname (true) << "\")"; *this->server_template_header_ << be_nl << "#endif /* defined REQUIRED PRAGMA */"; @@ -2578,7 +2578,7 @@ TAO_CodeGen::gen_stub_hdr_includes () UTL_String idl_name_str = idl_name; char const * const anyop_hdr = - BE_GlobalData::be_get_anyop_header (&idl_name_str, 1); + BE_GlobalData::be_get_anyop_header (&idl_name_str, true); idl_name_str.destroy (); diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index 28b866663db..5262752f986 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -364,18 +364,12 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) while (ancestor != nullptr) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"" << ancestor->repoID () << "\"" << be_uidt_nl - << ") == 0 ||" << be_uidt_nl; + *os << "std::strcmp (value, \"" << ancestor->repoID () << "\") == 0 ||" << be_nl; ancestor = ancestor->base_component (); } - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl - << ") == 0" << be_uidt << be_uidt_nl; + *os << "std::strcmp (value, \"IDL:omg.org/Components/CCMObject:1.0\") == 0" << be_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp index 8ca3b873ff4..6b84169bffc 100644 --- a/TAO/TAO_IDL/be/be_eventtype.cpp +++ b/TAO/TAO_IDL/be/be_eventtype.cpp @@ -27,7 +27,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n, bool abstract, bool truncatable, bool custom) - : COMMON_Base (0, + : COMMON_Base (false, abstract), AST_Decl (AST_Decl::NT_eventtype, n), @@ -39,7 +39,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - 0, + false, abstract), be_scope (AST_Decl::NT_eventtype), be_decl (AST_Decl::NT_eventtype, @@ -51,7 +51,7 @@ be_eventtype::be_eventtype (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - 0, + false, abstract), AST_ValueType (n, inherits, diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index e1c1f936b2f..9aa2fb1d5e5 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -23,8 +23,8 @@ #include "global_extern.h" be_factory::be_factory (UTL_ScopedName *n) - : COMMON_Base (1, - 0), //@@ Always local, never abstract + : COMMON_Base (true, + false), //@@ Always local, never abstract AST_Decl (AST_Decl::NT_factory, n), UTL_Scope (AST_Decl::NT_factory), @@ -60,7 +60,7 @@ be_factory::be_add_argument (AST_Argument *arg) { this->add_to_scope (arg); this->add_to_referenced (arg, - 0, + false, nullptr); return arg; } diff --git a/TAO/TAO_IDL/be/be_finder.cpp b/TAO/TAO_IDL/be/be_finder.cpp index 229df018592..43416cfdf60 100644 --- a/TAO/TAO_IDL/be/be_finder.cpp +++ b/TAO/TAO_IDL/be/be_finder.cpp @@ -15,8 +15,8 @@ #include "be_visitor.h" be_finder::be_finder (UTL_ScopedName *n) - : COMMON_Base (1, - 0), //@@ Always local, never abstract + : COMMON_Base (true, + false), //@@ Always local, never abstract AST_Decl (AST_Decl::NT_finder, n), UTL_Scope (AST_Decl::NT_finder), diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 7b93bf1e9ba..2aeaa3f633b 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -96,7 +96,7 @@ BE_GlobalData::BE_GlobalData () any_support_ (true), cdr_support_ (true), tc_support_ (true), - obv_opt_accessor_ (0), + obv_opt_accessor_ (false), gen_impl_files_ (false), gen_impl_debug_info_ (false), gen_copy_ctor_ (false), @@ -3420,7 +3420,7 @@ BE_GlobalData::parse_args (long &i, char **av) else if (av[i][2] == 't') { // Optimized typecode generation. - be_global->opt_tc (1); + be_global->opt_tc (true); } else if (av[i][2] == 'p') { @@ -3488,7 +3488,7 @@ BE_GlobalData::parse_args (long &i, char **av) size_t j; size_t k = i; // Generate implementation files. - be_global->gen_impl_files (1); + be_global->gen_impl_files (true); for (j = 0; j < options; ++j) { diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 7cb827f423c..ba3b0ce5ff0 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2309,10 +2309,7 @@ be_interface::is_a_helper (be_interface * /*derived*/, TAO_OutStream *os) { // Emit the comparison code. - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"" << bi->repoID () << "\"" << be_uidt_nl - << ") == 0 ||" << be_uidt_nl; + *os << "std::strcmp (value, \"" << bi->repoID () << "\") == 0 ||" << be_nl; return 0; } @@ -2756,34 +2753,25 @@ be_interface::gen_is_a_ancestors (TAO_OutStream *os) if (this->is_abstract () || this->has_mixed_parentage ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" << be_uidt_nl - << ") == 0"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0"; } else if (this->is_local ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/LocalObject:1.0\"" << be_uidt_nl - << ") == 0"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/LocalObject:1.0\") == 0"; } if (this->has_mixed_parentage () || this->is_local ()) { - *os << " ||" << be_uidt_nl; + *os << " ||" << be_nl; } else if (this->is_abstract ()) { - *os << be_uidt << be_uidt_nl; + *os << be_nl; } if (! this->is_abstract ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl - << ") == 0" << be_uidt << be_uidt_nl; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0" << be_nl; } return 0; diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp index 60fdf5067fd..012bc7bdd08 100644 --- a/TAO/TAO_IDL/be/be_operation.cpp +++ b/TAO/TAO_IDL/be/be_operation.cpp @@ -86,7 +86,7 @@ be_operation::be_add_argument (AST_Argument *arg) { this->add_to_scope (arg); this->add_to_referenced (arg, - 0, + false, nullptr); return arg; } diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index 980ab36b945..cc605a4e5c1 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -279,7 +279,7 @@ be_util::prep_be_arg (char *s) } else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg) { - be_global->obv_opt_accessor (1); + be_global->obv_opt_accessor (true); } else if (ACE_OS::strstr (arg, ciao_container_type) == arg) { diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index d924ac798e0..02dcf8f8228 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -37,7 +37,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, bool abstract, bool truncatable, bool custom) - : COMMON_Base (0, + : COMMON_Base (false, abstract), AST_Decl (AST_Decl::NT_valuetype, n), @@ -49,7 +49,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - 0, + false, abstract), be_scope (AST_Decl::NT_valuetype), be_decl (AST_Decl::NT_valuetype, @@ -61,7 +61,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, n_inherits, inherits_flat, n_inherits_flat, - 0, + false, abstract), AST_ValueType (n, inherits, @@ -197,7 +197,7 @@ be_valuetype::determine_factory_style () // Check whether we have at least one operation or not. bool have_operation = this->have_operation (); - bool have_factory = 0; + bool have_factory = false; // Try only our own scope. if (this->nmembers () > 0) @@ -225,7 +225,7 @@ be_valuetype::determine_factory_style () if (node_type == AST_Decl::NT_factory) { - have_factory = 1; + have_factory = true; break; } diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index 727c236143c..e9bc800f9a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -59,7 +59,7 @@ int be_visitor_any_extracted_type_decl::visit_eventtype ( be_eventtype *node) { - os_ << node->full_name () << " * " << var_name_ << " = 0;"; + os_ << node->full_name () << " * " << var_name_ << " = nullptr;"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index 67a02e82e40..c759000c029 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -1212,7 +1212,7 @@ be_visitor_arg_traits::generated (be_decl *node) const case TAO_CodeGen::TAO_ROOT_SH: return node->srv_arg_traits_gen (); default: - return 0; + return false; } } diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp index 67a4d2d56bf..ed5cb8e796f 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp @@ -45,6 +45,6 @@ be_visitor_array_any_op_ch::visit_array (be_array *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 6f37294187f..cd6b9c256c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -115,6 +115,6 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp index b499783f07a..bfcec987fbd 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -306,7 +306,7 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << storage_class.c_str() << node->nested_type_name (scope, "_slice", "_") << " *" << be_nl; *os << node->nested_type_name (scope, "_alloc", "_") - << " (void);" << be_nl_2; + << " ();" << be_nl_2; *os << storage_class.c_str() << "void" << be_nl << node->nested_type_name (scope, "_free", "_") << " (" << be_idt << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index b8455fbae3f..eafc05c4e2d 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -341,7 +341,7 @@ int be_visitor_array_ci::visit_array (be_array *node) *os << be_nl_2 << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl - << "TAO::Array_Traits<" << fname << "_forany>::alloc (void)" + << "TAO::Array_Traits<" << fname << "_forany>::alloc ()" << be_idt << be_uidt_nl << "{" << be_idt_nl << "return " << fname << "_alloc ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index af82023fa96..df353da2a53 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -111,7 +111,7 @@ int be_visitor_array_cs::visit_array (be_array *node) // alloc method. *os << fname << "_slice *" << be_nl; - *os << fname << "_alloc (void)" << be_nl; + *os << fname << "_alloc ()" << be_nl; *os << "{" << be_idt_nl; *os << fname << "_slice *retval = 0;" << be_nl; *os << "ACE_NEW_RETURN (retval, "; diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp index 7d9a2616112..b65ee3bf8c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp @@ -129,6 +129,6 @@ be_visitor_array_cdr_op_ch::visit_array (be_array *node) *os << be_global->core_versioning_end (); - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp index 37873af1783..731e32bb18d 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp @@ -114,7 +114,7 @@ be_visitor_attr_return::visit_predefined_type ( << this->attr_name_string_.c_str () << ".in ());"; break; case AST_PredefinedType::PT_any: - os_ << "::CORBA::Any * retval = 0;" << be_nl + os_ << "::CORBA::Any * retval {};" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl << "retval," << be_nl << "::CORBA::Any (" diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp index 1e3ed1925fb..42d8ac9a8b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp @@ -153,7 +153,7 @@ be_visitor_component_ami_rh_ex_base::gen_attr_op ( } os_ << "set_" << node->local_name ()->get_string () - << " (void)" << (for_defn ? "" : ";"); + << " ()" << (for_defn ? "" : ";"); this->gen_op_body (); diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp index d304a7360c7..55661cadbf5 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp @@ -38,8 +38,8 @@ be_visitor_component_ami_rh_exh::visit_uses (be_uses *node) << "public virtual ::CORBA::LocalObject" << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << this->class_name_ << " (void);" << be_nl - << "virtual ~" << this->class_name_ << " (void);"; + << this->class_name_ << " ();" << be_nl + << "virtual ~" << this->class_name_ << " ();"; /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. @@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exh::visit_operation ( if (count == 0 && vrt) { - os_ << "void);"; + os_ << ");"; } else { diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp index f881d964bf7..854c2c0f2c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp @@ -35,13 +35,13 @@ be_visitor_component_ami_rh_exs::visit_uses (be_uses *node) os_ << be_nl_2 << this->class_name_ << "::" - << this->class_name_ << " (void)" << be_nl + << this->class_name_ << " ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << this->class_name_ << "::~" - << this->class_name_ << " (void)" << be_nl + << this->class_name_ << " ()" << be_nl << "{" << be_nl << "}"; @@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exs::visit_operation ( if (count == 0 && vrt) { - os_ << "void)"; + os_ << ")"; } else { diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp index 40eafca117a..7ae81441c30 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp @@ -108,7 +108,7 @@ be_visitor_context_svth::visit_component (be_component *node) << "PortableServer::Servant sv," << be_nl << "const char *id);" << be_uidt << be_nl_2; - os_ << "virtual ~" << lname << "_Context_T (void);"; + os_ << "virtual ~" << lname << "_Context_T ();"; os_ << be_nl_2 << "/** @name Operations and members for " << lname @@ -161,12 +161,12 @@ be_visitor_context_svth::visit_uses (be_uses *node) { os_ << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl - << "get_connections_" << port_name << " (void);"; + << "get_connections_" << port_name << " ();"; } else { os_ << "::" << obj_name << "_ptr" << be_nl - << "get_connection_" << port_name << " (void);"; + << "get_connection_" << port_name << " ();"; } os_ << be_nl << be_uidt_nl @@ -187,7 +187,7 @@ be_visitor_context_svth::visit_uses (be_uses *node) } else { - os_ << "void);"; + os_ << ");"; } os_ << be_uidt_nl << be_nl @@ -276,7 +276,7 @@ be_visitor_context_svth::visit_emits (be_emits *node) os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "disconnect_" << port_name << " (void);"; + << "disconnect_" << port_name << " ();"; os_ << be_uidt_nl << be_nl << "protected:" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp index a852dc0b99b..3b1355474cb 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -70,7 +70,7 @@ be_visitor_context_svts::visit_component (be_component *node) os_ << be_nl_2 << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << lname << "_Context_T<CONTAINER_TYPE, BASE>::~" - << lname << "_Context_T (void)" << be_nl + << lname << "_Context_T ()" << be_nl << "{" << be_nl << "}"; @@ -192,7 +192,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node) os_ << be_nl << be_nl - << "::Components::Cookie * retv = 0;" << be_nl + << "::Components::Cookie * retv {};" << be_nl << "ACE_NEW_THROW_EX (retv," << be_nl << " ::CIAO::Cookie_Impl (ptr)," << be_nl @@ -303,7 +303,7 @@ be_visitor_context_svts::visit_emits (be_emits *node) << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "Consumer_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "::" << fname << "Consumer_var ciao_emits_" << port_name << " =" << be_idt_nl << "this->ciao_emits_" << port_name << "_consumer_._retn ();" << be_uidt_nl << be_nl @@ -329,7 +329,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connection_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return ::" << fname << "::_duplicate (" << be_idt_nl << "this->ciao_uses_" << port_name << "_.in ());" @@ -361,7 +361,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl @@ -387,7 +387,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connections_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl; os_ << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl @@ -397,7 +397,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << " 0);" << be_nl_2; os_ << "::" << node_->full_name () << "::" << port_name - << "Connections * tmp_retv = 0;" << be_nl + << "Connections * tmp_retv {};" << be_nl << "ACE_NEW_THROW_EX (tmp_retv," << be_nl << " ::" << node_->full_name () << "::" << port_name << "Connections (" << be_nl @@ -465,7 +465,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << "}"; os_ << be_nl_2 - << "::Components::Cookie * ck = 0;" << be_nl + << "::Components::Cookie * ck {};" << be_nl << "ACE_NEW_THROW_EX (ck," << be_nl << " ::CIAO::Cookie_Impl (ptr)," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 8d754378186..412debc236a 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -81,11 +81,11 @@ be_visitor_executor_exh::visit_component (be_component *node) << "public:" << be_idt_nl; os_ << "/// Constructor" << be_nl - << lname << "_exec_i (void);"; + << lname << "_exec_i ();"; os_ << be_nl << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; os_ << be_nl_2 << "/** @name Supported operations and attributes. */" << be_nl @@ -147,18 +147,18 @@ be_visitor_executor_exh::visit_component (be_component *node) { os_ << be_nl_2 << "/// Component state change method to configuration_complete state" << be_nl - << "virtual void configuration_complete (void);"; + << "virtual void configuration_complete ();"; os_ << be_nl_2 << "/// Component state change method to activated state" << be_nl - << "virtual void ccm_activate (void);" << be_nl_2 + << "virtual void ccm_activate ();" << be_nl_2 << "/// Component state change method to passivated state" << be_nl - << "virtual void ccm_passivate (void);"; + << "virtual void ccm_passivate ();"; } os_ << be_nl_2 << "/// Component state change method to removed state" << be_nl - << "virtual void ccm_remove (void);"; + << "virtual void ccm_remove ();"; os_ << be_nl << "//@}"; @@ -268,7 +268,7 @@ be_visitor_executor_exh::visit_component (be_component *node) os_ << be_nl_2 << "/// Get the ACE_Reactor" << be_nl << "/// @return non-owning pointer to reactor" << be_nl - << "ACE_Reactor* reactor (void);"; + << "ACE_Reactor* reactor ();"; } os_ << be_uidt_nl @@ -302,7 +302,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node) << "/// @return existing instance of facet if one exists, else creates one" << be_nl << "virtual " << global << sname << "::CCM_" << lname << "_ptr" << be_nl - << "get_" << port_name << " (void);"; + << "get_" << port_name << " ();"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp index ad4f0abe99b..d2d93264f93 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp @@ -72,7 +72,7 @@ be_visitor_executor_exs::visit_attribute (be_attribute *node) os_ << be_nl << this->node_->original_local_name () << "_exec_i::" << this->ctx_->port_prefix ().c_str () - << node->local_name () << " (void)" << be_nl + << node->local_name () << " ()" << be_nl << "{" << be_idt; be_visitor_attr_return ar_visitor (this->ctx_); @@ -152,7 +152,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_exec_i::" << lname - << "_exec_i (void)"; + << "_exec_i ()"; /// The overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. @@ -195,7 +195,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_exec_i::~" << lname - << "_exec_i (void)" << be_nl + << "_exec_i ()" << be_nl << "{" << be_nl << "}"; @@ -206,9 +206,9 @@ be_visitor_executor_exs::visit_component (be_component *node) { os_ << be_nl << "ACE_Reactor*" << be_nl - << lname << "_exec_i::reactor (void)" << be_nl + << lname << "_exec_i::reactor ()" << be_nl << "{" << be_idt_nl - << "ACE_Reactor* reactor = 0;" << be_nl + << "ACE_Reactor* reactor {};" << be_nl << "::CORBA::Object_var ccm_object = " << be_idt_nl << "this->ciao_context_->get_CCM_object();" << be_uidt_nl << "if (! ::CORBA::is_nil (ccm_object.in ())) " << be_idt_nl @@ -297,7 +297,7 @@ be_visitor_executor_exs::visit_component (be_component *node) { os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::configuration_complete (void)" + << lname << "_exec_i::configuration_complete ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl @@ -305,14 +305,14 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_activate (void)" << be_nl + << lname << "_exec_i::ccm_activate ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_passivate (void)" << be_nl + << lname << "_exec_i::ccm_passivate ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; @@ -320,7 +320,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_remove (void)" << be_nl + << lname << "_exec_i::ccm_remove ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; @@ -352,12 +352,12 @@ be_visitor_executor_exs::visit_provides (be_provides *node) << global << sname << "::CCM_" << iname << "_ptr" << be_nl << node_->local_name () << "_exec_i::get_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "if ( ::CORBA::is_nil (this->ciao_" << port_name << "_.in ()))" << be_idt_nl << "{" << be_idt_nl - << lname << "_exec_i *tmp = 0;" << be_nl + << lname << "_exec_i *tmp {};" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl << "tmp," << be_nl << lname << "_exec_i (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp index 50a469d95ac..8ba4b0082f3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -69,7 +69,7 @@ be_visitor_facet_exh::visit_provides (be_provides *node) << this->node_->local_name () << "_Context_ptr ctx);" << be_uidt_nl << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; if (impl->node_type () == AST_Decl::NT_interface) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp index 019198e7639..1c401ba88db 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp @@ -106,7 +106,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) os_ << be_nl_2 << lname << "_exec_i::~" << lname - << "_exec_i (void)" << be_nl + << "_exec_i ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 69f694f1f3a..9fbd6a8de25 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -75,7 +75,7 @@ be_visitor_servant_svh::visit_component (be_component *node) os_ << be_nl << "virtual ~" << lname << "_Servant" - << " (void);" << be_nl; + << " ();" << be_nl; if (this->node_->has_rw_attributes ()) { @@ -166,13 +166,13 @@ be_visitor_servant_svh::visit_provides (be_provides *node) os_ << be_uidt_nl << be_nl << "public:" << be_idt_nl << "virtual ::" << obj_name << "_ptr" << be_nl - << "provide_" << port_name << " (void);"; + << "provide_" << port_name << " ();"; } os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << "void" << be_nl - << "setup_" << port_name << "_i (void);"; + << "setup_" << port_name << "_i ();"; if (!be_global->gen_lwccm ()) { @@ -207,12 +207,12 @@ be_visitor_servant_svh::visit_uses (be_uses *node) { os_ << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl - << "get_connections_" << port_name << " (void);"; + << "get_connections_" << port_name << " ();"; } else { os_ << "::" << obj_name << "_ptr" << be_nl - << "get_connection_" << port_name << " (void);"; + << "get_connection_" << port_name << " ();"; } os_ << be_nl_2 @@ -232,7 +232,7 @@ be_visitor_servant_svh::visit_uses (be_uses *node) } else { - os_ << "void);"; + os_ << ");"; } return 0; @@ -276,7 +276,7 @@ be_visitor_servant_svh::visit_emits (be_emits *node) os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "disconnect_" << port_name << " (void);"; + << "disconnect_" << port_name << " ();"; } return 0; } @@ -329,7 +329,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) << "_Context_ptr c);" << be_uidt_nl << be_nl; os_ << "virtual ~" << ev_lname << "Consumer_" << port_name - << "_Servant (void);"; + << "_Servant ();"; os_ << be_nl_2 << "virtual void" << be_nl @@ -344,7 +344,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) os_ << be_nl_2 << "/// Get component implementation." << be_nl << "virtual ::CORBA::Object_ptr" << be_nl - << "_get_component (void);"; + << "_get_component ();"; os_ << be_uidt_nl << be_nl << "protected:" << be_idt_nl; @@ -364,14 +364,14 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) { os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "get_consumer_" << port_name << " (void);"; + << "get_consumer_" << port_name << " ();"; } os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; os_ << "void" << be_nl - << "setup_consumer_" << port_name << "_i (void);"; + << "setup_consumer_" << port_name << "_i ();"; os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; @@ -406,7 +406,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::ReceptacleDescriptions *" << be_nl - << "get_all_receptacles (void);"; + << "get_all_receptacles ();"; } AST_Decl::NodeType nt = this->node_->node_type (); @@ -420,7 +420,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::PublisherDescriptions *" << be_nl - << "get_all_publishers (void);"; + << "get_all_publishers ();"; } if (this->node_->n_emits () != 0UL) @@ -428,7 +428,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::EmitterDescriptions *" << be_nl - << "get_all_emitters (void);"; + << "get_all_emitters ();"; } } diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 42d6631b98e..3f081adcfb4 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -110,7 +110,7 @@ be_visitor_servant_svs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_Servant::~" - << lname << "_Servant (void)" << be_nl + << lname << "_Servant ()" << be_nl << "{" << be_nl << "}"; @@ -285,7 +285,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node) os_ << be_nl_2 << "::" << obj_name << "_ptr" << be_nl << node_->local_name () << "_Servant::provide_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl; os_ << "return" << be_idt_nl @@ -297,7 +297,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node) os_ << be_nl_2 << "void" << be_nl << node_->local_name () << "_Servant::setup_" - << port_name << "_i (void)" << be_nl + << port_name << "_i ()" << be_nl << "{" << be_idt_nl << "ACE_CString obj_id (this->ins_name_);" << be_nl << "obj_id += \"_" << port_name << "\";" << be_nl_2 @@ -416,7 +416,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node) os_ << be_nl << node_->local_name () << "_Servant::get_connection" << (is_multiple ? "s" : "") << "_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return this->context_->get_connection" << (is_multiple ? "s" : "") << "_" @@ -486,7 +486,7 @@ be_visitor_servant_svs::visit_emits (be_emits *node) os_ << be_nl_2 << "::" << obj_name << "Consumer_ptr" << be_nl << node_->local_name () << "_Servant::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return this->context_->disconnect_" << port_name << " ();" << be_uidt_nl @@ -529,14 +529,14 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << comp_lname << "_Servant::" << lname << "Consumer_" << port_name << "_Servant::~" << lname << "Consumer_" - << port_name << "_Servant (void)" << be_nl + << port_name << "_Servant ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << "::CORBA::Object_ptr" << be_nl << comp_lname << "_Servant::" << lname << "Consumer_" - << port_name << "_Servant::_get_component (void)" << be_nl + << port_name << "_Servant::_get_component ()" << be_nl << "{" << be_idt_nl; if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0) @@ -585,7 +585,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << "::" << fname << "Consumer_ptr" << be_nl << node_->local_name () << "_Servant::get_consumer_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return" << be_idt_nl << "::" << fname << "Consumer::_duplicate (" << be_idt_nl @@ -597,7 +597,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << "void" << be_nl << node_->local_name () << "_Servant::setup_consumer_" - << port_name << "_i (void)" << be_nl + << port_name << "_i ()" << be_nl << "{" << be_idt_nl << "ACE_CString obj_id (this->ins_name_);" << be_nl << "obj_id += \"_" << port_name << "\";" << be_nl_2 @@ -773,9 +773,9 @@ be_visitor_servant_svs::gen_publishes_top () os_ << be_nl_2 << "::Components::PublisherDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_publishers (void)" << be_nl + << "_Servant::get_all_publishers ()" << be_nl << "{" << be_idt_nl - << "::Components::PublisherDescriptions *retval = 0;" + << "::Components::PublisherDescriptions *retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::PublisherDescriptions," @@ -880,9 +880,9 @@ be_visitor_servant_svs::gen_uses_top () os_ << be_nl_2 << "::Components::ReceptacleDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_receptacles (void)" << be_nl + << "_Servant::get_all_receptacles ()" << be_nl << "{" << be_idt_nl - << "::Components::ReceptacleDescriptions * retval = 0;" + << "::Components::ReceptacleDescriptions * retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::ReceptacleDescriptions," @@ -1001,9 +1001,9 @@ be_visitor_servant_svs::gen_get_all_emitters () os_ << be_nl_2 << "::Components::EmitterDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_emitters (void)" << be_nl + << "_Servant::get_all_emitters ()" << be_nl << "{" << be_idt_nl - << "::Components::EmitterDescriptions *retval = 0;" + << "::Components::EmitterDescriptions *retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::EmitterDescriptions," diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index 9e0b92736c3..c7f28aeccf3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -287,7 +287,7 @@ be_visitor_component_scope::gen_exec_entrypoint_decl () << "extern \"C\" " << export_macro_.c_str () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } void @@ -297,7 +297,7 @@ be_visitor_component_scope::gen_exec_entrypoint_defn () << "extern \"C\" " << export_macro_.c_str () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void)" << be_nl + << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp index 2e9bc13474c..40230a812e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp @@ -83,6 +83,6 @@ be_visitor_connector_ami_exh::gen_entrypoint () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << ScopeAsDecl (this->node_->defined_in ())->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp index a8b3d8a4477..8cbe4b5832c 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp @@ -76,7 +76,7 @@ be_visitor_connector_ami_exs::gen_entrypoint () os_ << be_nl_2 << "extern \"C\" ::Components::EnterpriseComponent_ptr" << be_nl - << "create_" << s->flat_name () << "_Impl (void)" << be_nl + << "create_" << s->flat_name () << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index bc6cbed0a46..03394c4b548 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -154,9 +154,9 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) os_ << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << this->node_->local_name () << "_exec_i (void);" << be_nl + << this->node_->local_name () << "_exec_i ();" << be_nl << "virtual ~" << this->node_->local_name () - << "_exec_i (void);" << be_uidt_nl + << "_exec_i ();" << be_uidt_nl << "};"; this->gen_exec_entrypoint_decl (); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index dd06f3341b9..d114738c868 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -46,7 +46,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) { os_ << be_nl << this->node_->local_name () << "_exec_i::" - << this->node_->local_name () << "_exec_i (void)" + << this->node_->local_name () << "_exec_i ()" << be_idt_nl << ": " << this->base_tname_ << "_Connector_T"; @@ -130,7 +130,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) os_ << be_nl_2 << this->node_->local_name () << "_exec_i::~" - << this->node_->local_name () << "_exec_i (void)" << be_nl + << this->node_->local_name () << "_exec_i ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp index 81ed0c13f74..bea0ef5deb2 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp @@ -43,9 +43,9 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << scope->local_name () << suffix << " (void);" << be_nl + << scope->local_name () << suffix << " ();" << be_nl << "virtual ~" << scope->local_name () << suffix - << " (void);"; + << " ();"; if (this->visit_scope (node) == -1) { @@ -65,11 +65,11 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << "::Components::" << be_global->ciao_container_type () << "Context_ptr ctx);" << be_nl_2 - << "virtual void configuration_complete (void);" + << "virtual void configuration_complete ();" << be_nl_2 - << "virtual void ccm_activate (void);" << be_nl - << "virtual void ccm_passivate (void);" << be_nl - << "virtual void ccm_remove (void);"; + << "virtual void ccm_activate ();" << be_nl + << "virtual void ccm_passivate ();" << be_nl + << "virtual void ccm_remove ();"; os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; @@ -116,7 +116,7 @@ be_visitor_executor_ami_exh::visit_provides (be_provides *node) AST_Decl *d = i.item (); os_ << d->local_name () << "_" - << node->local_name () << " (void);"; + << node->local_name () << " ();"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp index ae3d2f30984..68933967984 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp @@ -35,7 +35,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << class_name << "::" - << class_name << " (void)" << be_idt_nl; + << class_name << " ()" << be_idt_nl; /// The port is the only item in the connector's scope. UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls); @@ -75,7 +75,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << class_name << "::~" - << class_name << " (void)" << be_nl + << class_name << " ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -115,7 +115,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::configuration_complete (void)" << be_nl + << class_name << "::configuration_complete ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -125,13 +125,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_activate (void)" << be_nl + << class_name << "::ccm_activate ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_passivate (void)" << be_nl + << class_name << "::ccm_passivate ()" << be_nl << "{" << be_nl << "}"; @@ -142,7 +142,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_remove (void)" << be_nl + << class_name << "::ccm_remove ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -179,7 +179,7 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) const char *exec_ext = (ACE_OS::strstr (loc_name, "sync") ? "1" : "0"); os_ << d->local_name () << "_" - << node->local_name () << " (void)" << be_nl + << node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return " << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate (" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index e4ed07fbbcb..c8cd22615a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -83,8 +83,8 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node) be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); get_op.set_name ((UTL_IdList *) node->name ()->copy ()); if (this->visit_operation (&get_op) == -1) @@ -120,8 +120,8 @@ be_visitor_facet_ami_exh::visit_attribute (be_attribute *node) be_operation set_op (&rt, AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); set_op.set_name ((UTL_IdList *) node->name ()->copy ()); set_op.be_add_argument (arg); @@ -239,7 +239,7 @@ be_visitor_facet_ami_exh::gen_reply_handler_class () << this->iface_name_ << "ReplyHandler_ptr callback," << be_nl << "::PortableServer::POA_ptr poa);" << be_uidt_nl << be_nl - << "virtual ~" << this->iface_name_ << suffix << " (void);"; + << "virtual ~" << this->iface_name_ << suffix << " ();"; int const status = this->callback_iface_->traverse_inheritance_graph ( @@ -288,9 +288,9 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << iface_name << suffix << " (void);" << be_nl_2 + << iface_name << suffix << " ();" << be_nl_2 << "virtual ~" << iface_name << suffix - << " (void);"; + << " ();"; ACE_CString handler_str ( @@ -371,7 +371,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () const char *smart_scope = (is_global ? "" : "::"); os_ << be_nl_2 - << "virtual ::CORBA::Object_ptr _get_component (void);"; + << "virtual ::CORBA::Object_ptr _get_component ();"; os_ << be_nl_2 << "virtual void _set_component (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index 7d865123259..176da224463 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -74,8 +74,8 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node) be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); get_op.set_name ((UTL_IdList *) node->name ()->copy ()); if (this->visit_operation (&get_op) == -1) { @@ -111,8 +111,8 @@ be_visitor_facet_ami_exs::visit_attribute (be_attribute *node) be_operation set_op (&rt, AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); set_op.set_name ((UTL_IdList *) node->name ()->copy ()); set_op.be_add_argument (arg); @@ -268,7 +268,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class () os_ << be_nl_2 << iface_name << suffix << "::~" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; @@ -337,13 +337,13 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () os_ << be_nl_2 << iface_name << suffix << "::" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << iface_name << suffix << "::~" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; @@ -421,7 +421,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () os_ << be_nl_2 << "::CORBA::Object_ptr" << be_nl - << iface_name << "_exec_i::_get_component (void)" << be_nl + << iface_name << "_exec_i::_get_component ()" << be_nl << "{" << be_idt_nl << "return" << be_idt_nl << "::" << s->name () << smart_scope diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp index d56235baa5f..15cc1cd7069 100644 --- a/TAO/TAO_IDL/be/be_visitor_context.cpp +++ b/TAO/TAO_IDL/be/be_visitor_context.cpp @@ -23,8 +23,8 @@ be_visitor_context::be_visitor_context () alias_ (nullptr), tdef_ (nullptr), attr_ (nullptr), - exception_ (0), - comma_ (0), + exception_ (false), + comma_ (false), interface_ (nullptr) { } @@ -85,8 +85,8 @@ be_visitor_context::reset () this->alias_ = nullptr; this->tdef_ = nullptr; this->attr_ = nullptr; - this->exception_ = 0; - this->comma_ = 0; + this->exception_ = false; + this->comma_ = false; this->interface_ = nullptr; this->template_args_ = nullptr; this->template_params_ = nullptr; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index cf94a17602c..1a2c6dc7fd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -95,6 +95,6 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) *os << "\n\n#endif"; } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 401a69ae418..f6d8c7f5b35 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -171,6 +171,6 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) *os << "\n\n#endif"; } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp index d8c642eed23..32f9694a2ba 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp @@ -38,7 +38,7 @@ be_visitor_enum_ch::visit_enum (be_enum *node) TAO_OutStream *os = this->ctx_->stream (); // Comma to be generated by the scope visitor. - this->ctx_->comma (1); + this->ctx_->comma (true); *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index 21e102f68b6..8d19cc74442 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -106,7 +106,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) -1); } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 3bbd359fa5e..c38649bd11a 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -258,7 +258,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) -1); } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp index 7c8541de940..d190c985d5e 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp @@ -67,6 +67,6 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node) -1); } - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp index 65897a6192a..eb400f07815 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp @@ -177,7 +177,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index c29bd84da8f..ad0751a4dad 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -58,10 +58,10 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) // Constructors and destructor. *os << be_nl_2 - << node->local_name () << " (void);" << be_nl + << node->local_name () << " ();" << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl - << "~" << node->local_name () << " (void);\n" << be_nl; + << "~" << node->local_name () << " () = default;\n" << be_nl; // Assignment operator. *os << node->local_name () << " &operator= (const " @@ -77,11 +77,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) << "static const " << node->local_name () << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2; - *os << "static ::CORBA::Exception *_alloc (void);" << be_nl_2; + *os << "static ::CORBA::Exception *_alloc ();" << be_nl_2; *os << "virtual ::CORBA::Exception *" - << "_tao_duplicate (void) const;\n" << be_nl - << "virtual void _raise (void) const;\n" << be_nl + << "_tao_duplicate () const;\n" << be_nl + << "virtual void _raise () const;\n" << be_nl << "virtual void _tao_encode (TAO_OutputCDR &cdr) const;" << be_nl << "virtual void _tao_decode (TAO_InputCDR &cdr);"; @@ -106,7 +106,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) if (be_global->tc_support ()) { *os << be_nl_2 - << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + << "virtual ::CORBA::TypeCode_ptr _tao_type () const;"; } *os << be_uidt_nl << "};"; @@ -126,6 +126,6 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) } } - node->cli_hdr_gen (1); + node->cli_hdr_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index d0d71d046c0..a25dc7fb3da 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -99,7 +99,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Default constructor. *os << node->name () << "::" << node->local_name () - << " (void)" << be_idt_nl; + << " ()" << be_idt_nl; *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->local_name () << "\")" << be_uidt @@ -107,12 +107,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "{" << be_nl; *os << "}" << be_nl_2; - // Destructor. - *os << node->name () << "::~" << node->local_name () - << " (void)" << be_nl; - *os << "{" << be_nl; - *os << "}" << be_nl_2; - // Copy constructor. *os << node->name () << "::" << node->local_name () << " (const ::" << node->name () << " &_tao_excp)" << be_idt_nl; @@ -201,25 +195,25 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Generate the _alloc method. *os << "::CORBA::Exception *" << node->name () - << "::_alloc (void)" << be_nl; + << "::_alloc ()" << be_nl; *os << "{" << be_idt_nl; - *os << "::CORBA::Exception *retval = 0;" << be_nl + *os << "::CORBA::Exception *retval {};" << be_nl << "ACE_NEW_RETURN (retval, ::" << node->name () - << ", 0);" << be_nl + << ", nullptr);" << be_nl << "return retval;" << be_uidt_nl; *os << "}" << be_nl_2; *os << "::CORBA::Exception *" << be_nl - << node->name () << "::_tao_duplicate (void) const" << be_nl + << node->name () << "::_tao_duplicate () const" << be_nl << "{" << be_idt_nl - << "::CORBA::Exception *result = 0;" << be_nl + << "::CORBA::Exception *result {};" << be_nl << "ACE_NEW_RETURN (result, " - << "::" << node->name () << " (*this), 0);" + << "::" << node->name () << " (*this), nullptr);" << be_nl << "return result;" << be_uidt_nl << "}" << be_nl_2; - *os << "void " << node->name () << "::_raise (void) const" << be_nl + *os << "void " << node->name () << "::_raise () const" << be_nl << "{" << be_idt_nl << "throw *this;" << be_uidt_nl << "}" << be_nl_2; @@ -277,7 +271,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) { *os << "// TAO extension - the virtual _type method." << be_nl << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl + << "::_tao_type () const" << be_nl << "{" << be_idt_nl << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl << "ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (" @@ -309,7 +303,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index 167ec05bf43..c0953bcfbb7 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -119,11 +119,11 @@ be_visitor_home_exh::gen_exec_class () os_ << be_nl << "/// Constructor" << be_nl - << lname << "_exec_i (void);"; + << lname << "_exec_i ();"; os_ << be_nl_2 << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; be_home *h = node_; @@ -169,7 +169,7 @@ be_visitor_home_exh::gen_exec_class () << "/// Factory method"; os_ << be_nl - << "virtual ::Components::EnterpriseComponent_ptr create (void);"; + << "virtual ::Components::EnterpriseComponent_ptr create ();"; os_ << be_uidt_nl << "};"; @@ -185,7 +185,7 @@ be_visitor_home_exh::gen_entrypoint () << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } int diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index 860a76b1c1f..634b9cb3ae0 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -126,12 +126,12 @@ be_visitor_home_exs::gen_exec_class () << comment_end_border_; os_ << be_nl_2 - << lname << "_exec_i::" << lname << "_exec_i (void)" << be_nl + << lname << "_exec_i::" << lname << "_exec_i ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 - << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl + << lname << "_exec_i::~" << lname << "_exec_i ()" << be_nl << "{" << be_nl << "}"; @@ -188,7 +188,7 @@ be_visitor_home_exs::gen_exec_class () os_ << be_nl_2 << "::Components::EnterpriseComponent_ptr" << be_nl - << lname << "_exec_i::create (void)" << be_nl + << lname << "_exec_i::create ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl @@ -213,7 +213,7 @@ be_visitor_home_exs::gen_entrypoint () << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void)" << be_nl + << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::HomeExecutorBase_ptr retval =" << be_idt_nl << "::Components::HomeExecutorBase::_nil ();" diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp index 0844ba3ad7e..dcf444cd61b 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp @@ -153,7 +153,7 @@ be_visitor_home_svh::gen_servant_class () << "_Container_ptr c);" << be_uidt; os_ << be_nl_2 - << "virtual ~" << lname << "_Servant (void);"; + << "virtual ~" << lname << "_Servant ();"; if (this->node_->has_rw_attributes ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index f84301b086b..805646d81b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -235,7 +235,7 @@ be_visitor_home_svs::gen_servant_class () << "}"; os_ << be_nl_2 - << lname << "_Servant::~" << lname << "_Servant (void)" + << lname << "_Servant::~" << lname << "_Servant ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp index d04f2fa09de..7dd6916b136 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp @@ -72,8 +72,8 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node) *os << be_nl << "{" << be_nl << "public:" << be_idt_nl - << rh_skel_class_name.c_str () << " (void);" << be_nl - << "virtual ~" << rh_skel_class_name.c_str () << " (void);"; + << rh_skel_class_name.c_str () << " ();" << be_nl + << "virtual ~" << rh_skel_class_name.c_str () << " ();"; // Generate code for elements in the scope (e.g., operations). if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp index 801142ae7bc..c95bbdba3a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp @@ -68,7 +68,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; *os << rh_skel_full_scope_name.c_str () - << "::" << rh_skel_class_name.c_str () << " (void)" << be_nl + << "::" << rh_skel_class_name.c_str () << " ()" << be_nl << ": TAO_AMH_Response_Handler ()," << be_idt_nl << "::" << node->full_name () << " ()" << be_uidt << be_uidt_nl << "{" << be_nl @@ -76,7 +76,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node) *os << rh_skel_full_scope_name.c_str () << "::~" << rh_skel_class_name.c_str () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; *os << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 86082b15c9d..74a665c0482 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -107,7 +107,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "protected:" << be_idt_nl - << class_name.c_str () << " (void);" << be_uidt_nl << be_nl + << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; // No copy constructor for locality constraint interface. @@ -128,7 +128,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) // The _interface_repository_id method. *os << be_nl << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; if (this->visit_scope (node) == -1) { @@ -373,5 +373,5 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // interfaces is "special", because the returned type is not exactly // the type of the class, but the original class that "implied" the // AMH one. - *os << non_amh_name.c_str () << " *_this (void);\n" << be_uidt; + *os << non_amh_name.c_str () << " *_this ();\n" << be_uidt; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index d55894d85a2..e792b18f3c4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -66,12 +66,12 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str () << "*" << be_nl << full_skel_name - << "::_this (void)" << be_nl + << "::_this ()" << be_nl << "{" << be_idt_nl << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2; *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl - << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl + << "::CORBA::Object_ptr tmp {};" << be_nl << be_nl << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl << "stub->servant_orb_var ()->orb_core ()->" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index 4fbc6485a02..b95446f3f0d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -117,7 +117,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp index 9d36bece90e..b65572712f8 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp @@ -251,7 +251,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node) "codegen for scope failed\n"), -1); } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp index 5be866512d4..2453440ca1f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp @@ -74,7 +74,7 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) } this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN); - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index 071bd2eab0d..a9ac02c8953 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -137,7 +137,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index 431c1fb8b0c..ea9855ced65 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -78,7 +78,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( << "{" << be_nl << "public:" << be_idt_nl; // Dtor - *os << "virtual ~" << node->direct_proxy_impl_name () << " (void);"; + *os << "virtual ~" << node->direct_proxy_impl_name () << " ();"; if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp index ec542b5ec27..50134bfb463 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp @@ -29,7 +29,7 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface ( // Destructor Implementation *os << node->full_direct_proxy_impl_name () << "::~" - << node->direct_proxy_impl_name () << " (void)" + << node->direct_proxy_impl_name () << " ()" << be_nl << "{" << be_nl << "}" << be_nl_2; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp index 29dc80b456e..21130dd0ba5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp @@ -64,7 +64,7 @@ be_visitor_facet_svth::visit_interface (be_interface *node) << "typename EXEC::_ptr_type executor," << be_nl << "::Components::CCMContext_ptr ctx);" << be_uidt_nl << be_nl; - os_ << "virtual ~" << lname << "_Servant_T (void);"; + os_ << "virtual ~" << lname << "_Servant_T ();"; if (is_intf) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp index f86cb614bf1..441df38fd93 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp @@ -66,7 +66,7 @@ be_visitor_facet_svts::visit_interface (be_interface *node) os_ << be_nl_2 << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl << lname << "_Servant_T<BASE, EXEC, CONTEXT>::~" - << lname << "_Servant_T (void)" << be_nl + << lname << "_Servant_T ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 58d33e95a11..102a7c67036 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -104,7 +104,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } } - *os << "static " << node->local_name () << "_ptr _nil (void);"; + *os << "static " << node->local_name () << "_ptr _nil ();"; // Generate code for the interface definition by traversing thru the // elements of its scope. We depend on the front-end to have made sure @@ -142,7 +142,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // we have to override _add_ref() to avoid ambiguity. if (node->has_mixed_parentage ()) { - *os << "virtual void _add_ref (void);" << be_nl_2; + *os << "virtual void _add_ref ();" << be_nl_2; } // The _is_a method @@ -151,13 +151,13 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // The _interface_repository_id method. *os << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; if (be_global->gen_static_desc_operations ()) { - *os << be_nl << "static const char* _desc_repository_id (void);"; + *os << be_nl << "static const char* _desc_repository_id ();"; - *os << be_nl << "static const char* _desc_interface_name (void);"; + *os << be_nl << "static const char* _desc_interface_name ();"; } // The virtual marshal method, to prevent marshal of local interfaces. @@ -171,8 +171,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << be_nl << "virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);" << be_nl << "virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);" << be_nl - << "virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;" << be_nl - << "virtual TAO_Policy_Scope _tao_scope (void) const;" << be_nl; + << "virtual TAO_Cached_Policy_Type _tao_cached_type () const;" << be_nl + << "virtual TAO_Policy_Scope _tao_scope () const;" << be_nl; } if (be_global->gen_ostream_operators ()) @@ -192,7 +192,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (! node->is_abstract ()) { *os << "// Concrete interface only." << be_nl - << node->local_name () << " (void);" + << node->local_name () << " ();" << be_nl_2; } } @@ -201,7 +201,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { // Protected default constructor for abstract interfaces. *os << "// Abstract or local interface only." << be_nl - << node->local_name () << " (void);" << be_nl_2; + << node->local_name () << " ();" << be_nl_2; } if (node->is_abstract ()) @@ -228,8 +228,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << node->local_name () << " (" << be_idt << be_idt_nl << "TAO_Stub *objref," << be_nl << "::CORBA::Boolean _tao_collocated = false," << be_nl - << "TAO_Abstract_ServantBase *servant = 0," << be_nl - << "TAO_ORB_Core *orb_core = 0);" + << "TAO_Abstract_ServantBase *servant = nullptr," << be_nl + << "TAO_ORB_Core *orb_core = nullptr);" << be_uidt << be_uidt; } @@ -243,7 +243,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // Protected destructor. *os << be_nl_2 - << "virtual ~" << node->local_name () << " (void);"; + << "virtual ~" << node->local_name () << " ();"; // Private copy constructor and assignment operator. These are not // allowed, hence they are private. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp index fbd638a5d87..5129d1965d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -63,7 +63,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) *os << be_nl_2 << "ACE_INLINE" << be_nl << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}" << be_nl_2; *os << "ACE_INLINE" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index a4068518afa..072a877ecad 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -83,7 +83,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl_2 << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" + << "TAO::Objref_Traits<" << node->name () << ">::nil ()" << be_nl << "{" << be_idt_nl << "return " << node->name () << "::_nil ();" << be_uidt_nl @@ -129,12 +129,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << " return false;" << be_nl << "}" << be_nl << be_nl << "TAO_Cached_Policy_Type" << be_nl - << "CORBA::Policy::_tao_cached_type (void) const" << be_nl + << "CORBA::Policy::_tao_cached_type () const" << be_nl << "{" << be_nl << "return TAO_CACHED_POLICY_UNCACHED;" << be_nl << "}" << be_nl << be_nl << "TAO_Policy_Scope" << be_nl - << "CORBA::Policy::_tao_scope (void) const" << be_nl + << "CORBA::Policy::_tao_scope () const" << be_nl << "{" << be_nl << " return TAO_POLICY_DEFAULT_SCOPE;" << be_nl << "}" << be_nl; @@ -189,7 +189,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; } @@ -197,7 +197,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; @@ -206,7 +206,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl_2 << node->name () << "::~" << node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl << "}" << be_nl_2; bool gen_any_destructor = @@ -230,7 +230,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (node->has_mixed_parentage ()) { *os << "void" << be_nl - << node->name () << "::_add_ref (void)" << be_nl + << node->name () << "::_add_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::Object::_add_ref ();" << be_uidt_nl @@ -260,7 +260,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) // The _nil method *os << node->full_name () << "_ptr" << be_nl - << node->full_name () << "::_nil (void)" + << node->full_name () << "::_nil ()" << be_nl << "{" << be_idt_nl << "return nullptr;" << be_uidt_nl @@ -308,7 +308,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) -1); } - *os << ")" << be_nl + *os << ")" << be_uidt_nl << "{" << be_idt_nl << "return true; // success using local knowledge" << be_uidt_nl << "}" << be_uidt_nl @@ -328,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "const char* " << node->full_name () - << "::_interface_repository_id (void) const" + << "::_interface_repository_id () const" << be_nl << "{" << be_idt_nl << "return \"" << node->repoID () @@ -338,7 +338,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (be_global->gen_static_desc_operations ()) { *os << be_nl_2 << "const char* " << node->full_name () - << "::_desc_repository_id (void)" + << "::_desc_repository_id ()" << be_nl << "{" << be_idt_nl << "return \"" << node->repoID () @@ -346,7 +346,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl_2 << "const char* " << node->full_name () - << "::_desc_interface_name (void)" + << "::_desc_interface_name ()" << be_nl << "{" << be_idt_nl << "return \"" << node->local_name() @@ -471,7 +471,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, } else { - *os << "return" << be_idt_nl; + *os << "return "; if (!node->is_abstract ()) { @@ -484,18 +484,17 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << node->local_name () << ">::" << pre <<" ("; } - *os << be_idt << be_idt_nl - << "_tao_objref"; + *os << "_tao_objref"; if (ACE_OS::strcmp (pre, "narrow") == 0) { - *os << "," << be_nl + *os << ", " << "\"" << node->repoID () << "\""; } *os << ");"; - *os << be_uidt << be_uidt << be_uidt << be_uidt_nl + *os << be_uidt_nl << "}" << be_nl_2; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 85b6c23811c..448c1ebf838 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -74,7 +74,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) << "public:" << be_idt_nl << "// Constructor" << be_nl << be_global->impl_class_prefix () << namebuf - << be_global->impl_class_suffix () << " (void);" << be_nl_2; + << be_global->impl_class_suffix () << " ();" << be_nl_2; if (be_global->gen_copy_ctor () && !node->is_local ()) { @@ -97,7 +97,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) *os << "// Destructor" << be_nl << "virtual " << "~" << be_global->impl_class_prefix () << namebuf - << be_global->impl_class_suffix () << " (void);"; + << be_global->impl_class_suffix () << " ();"; // Generate code for elements in the scope (e.g., operations). diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp index 76e1e2b1781..0d7589dbbd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp @@ -46,7 +46,7 @@ be_visitor_interface_is::visit_interface (be_interface *node) << be_global->impl_class_suffix () <<"::" << be_global->impl_class_prefix () << node->flat_name () << be_global->impl_class_suffix () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl << "}" << be_nl_2; @@ -58,7 +58,7 @@ be_visitor_interface_is::visit_interface (be_interface *node) << be_global->impl_class_suffix () <<"::~" << be_global->impl_class_prefix () << node->flat_name () << be_global->impl_class_suffix () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" <<be_nl; *os << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index 789b4497c5c..0dd4c94accc 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -101,7 +101,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "protected:" << be_idt_nl; // Default constructor. - *os << class_name.c_str () << " (void);" + *os << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; @@ -117,7 +117,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // Copy constructor and destructor. *os << class_name.c_str () << " (const " << class_name.c_str () << "& rhs);" << be_nl - << "virtual ~" << class_name.c_str () << " (void);" << be_nl_2; + << "virtual ~" << class_name.c_str () << " ();" << be_nl_2; // _is_a *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2; @@ -133,7 +133,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // The _interface_repository_id method. *os << be_nl << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; // Generate code for elements in the scope (e.g., operations). if (this->visit_scope (node) == -1) @@ -263,7 +263,7 @@ be_visitor_interface_sh::this_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); // Print out the _this() method. - *os << "::" << node->full_name () << " *_this (void);" + *os << "::" << node->full_name () << " *_this ();" << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 9847a170dd7..81256400f5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -108,14 +108,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << full_skel_name << "::" << local_name_prefix << node_local_name - << " (void)" << be_idt_nl; + << " ()" << be_idt_nl; *os << ": TAO_ServantBase ()" << be_uidt_nl; // Default constructor body. *os << "{" << be_idt_nl - << "this->optable_ = &tao_" << flat_name - << "_optable;" << be_uidt_nl + << "this->optable_ = std::addressof(tao_" << flat_name + << "_optable);" << be_uidt_nl << "}" << be_nl_2; // find if we are at the top scope or inside some module @@ -143,7 +143,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << full_skel_name << "::~" << local_name_prefix << node_local_name - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; *os << "}" << be_nl; @@ -182,27 +182,20 @@ be_visitor_interface_ss::visit_interface (be_interface *node) -1); } - *os << "!std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl - << ")"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0"; if (node->has_mixed_parentage ()) { - *os << " ||" << be_uidt_nl - << "!std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" - << be_uidt_nl - << ")"; + *os << " ||" << be_nl + << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0"; } - *os << be_uidt << be_uidt_nl + *os << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl_2; *os << "const char* " << full_skel_name - << "::_interface_repository_id (void) const" + << "::_interface_repository_id () const" << be_nl; *os << "{" << be_idt_nl; *os << "return \"" << node->repoID () << "\";" << be_uidt_nl; @@ -374,7 +367,7 @@ be_visitor_interface_ss::this_method (be_interface *node) // The _this () operation. *os << node->full_name () << " *" << be_nl << node->full_skel_name () - << "::_this (void)" << be_nl + << "::_this ()" << be_nl << "{" << be_idt_nl << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2 @@ -382,7 +375,7 @@ be_visitor_interface_ss::this_method (be_interface *node) /* Coverity whines about an unused return value from _nil() when initializing tmp. Just use zero instead. */ - *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" + *os << "::CORBA::Object_ptr tmp {};" << be_nl_2; *os << "::CORBA::Boolean const _tao_opt_colloc =" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index 67307bd46ca..d403ce016d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -54,7 +54,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "// flexibility of having a different smart proxy per object "<<be_nl <<"// instead of per interface."<<be_nl<< be_nl << "virtual ~TAO_" << node->flat_name () - << "_Default_Proxy_Factory (void);" << be_nl_2 + << "_Default_Proxy_Factory ();" << be_nl_2 << "virtual "<< node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () @@ -73,16 +73,16 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl << "bool one_shot_factory = true" << be_uidt_nl << ");" << be_uidt_nl << be_nl - << "void unregister_proxy_factory (void);" << be_nl_2 + << "void unregister_proxy_factory ();" << be_nl_2 << node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () << "_ptr proxy" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << be_nl << "protected:" << be_idt_nl << "TAO_" << node->flat_name () - << "_Proxy_Factory_Adapter (void);" << be_nl + << "_Proxy_Factory_Adapter ();" << be_nl << "~TAO_" << node->flat_name () - << "_Proxy_Factory_Adapter (void);" << be_nl + << "_Proxy_Factory_Adapter ();" << be_nl << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter &operator= (" << be_idt << be_idt_nl << "const TAO_" << node->flat_name () @@ -138,19 +138,19 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "{" << be_nl << "public:" << be_idt_nl - << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();" << be_nl // Just to keep Old g++ complier (version: 2.7.2.3) happy it's // necesssary to declare and define the destructor explicitly. - << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();" << be_nl // This method will delegate this method to the <base_proxy_> // member of the smart proxy and so the smart proxy's (nil) // stubobj will not be returned. - << "virtual TAO_Stub *_stubobj (void) const;" + << "virtual TAO_Stub *_stubobj () const;" << be_nl // Another version of the above method.. -<< "virtual TAO_Stub *_stubobj (void);" +<< "virtual TAO_Stub *_stubobj ();" << be_uidt_nl; // Generate code for the interface definition by traversing thru the @@ -169,7 +169,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "protected:" << be_idt_nl << "::" << node->full_name () - << "_ptr get_proxy (void);" << be_nl + << "_ptr get_proxy ();" << be_nl << "::" << node->full_name () << "_var proxy_;" << be_uidt_nl << "};\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 0018662095f..2379e9acf52 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -65,7 +65,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Default_Proxy_Factory::~"; *os <<"TAO_" - << node->flat_name () << "_Default_Proxy_Factory (void)" + << node->flat_name () << "_Default_Proxy_Factory ()" << be_nl << be_uidt << be_uidt << "{" << be_nl << "}"; @@ -98,7 +98,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; *os << "TAO_" - << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_idt_nl + << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_idt_nl << ": proxy_factory_ (0)," << be_idt_nl << "one_shot_factory_ (false)," << be_nl << "disable_factory_ (false)" << be_uidt << be_uidt_nl @@ -116,7 +116,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; *os << "~TAO_" - << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_nl + << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_nl << "{" << be_idt_nl << "// Making sure the factory which the adapter" << " has is destroyed with it." @@ -167,7 +167,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_"<< node->flat_name () - << "_Proxy_Factory_Adapter::unregister_proxy_factory (void)" << be_nl + << "_Proxy_Factory_Adapter::unregister_proxy_factory ()" << be_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl << "ACE_GUARD (" << be_idt << be_idt_nl @@ -236,7 +236,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; *os << "TAO_" - << node->flat_name () << "_Smart_Proxy_Base (void)" << be_uidt_nl + << node->flat_name () << "_Smart_Proxy_Base ()" << be_uidt_nl << "{" << be_nl << "}" << be_nl_2; @@ -249,7 +249,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; *os << "~TAO_" - << node->flat_name () << "_Smart_Proxy_Base (void)" <<be_nl + << node->flat_name () << "_Smart_Proxy_Base ()" <<be_nl << "{" << be_nl << "}\n\n"; @@ -263,7 +263,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; - *os << "_stubobj (void) const"<<be_nl + *os << "_stubobj () const"<<be_nl << "{" << be_idt_nl << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl << "}"<< be_nl_2; @@ -277,7 +277,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) if (node->is_nested ()) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; - *os << "_stubobj (void)"<<be_nl + *os << "_stubobj ()"<<be_nl << "{" << be_idt_nl << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl << "}" << be_nl_2; @@ -302,7 +302,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::" - << "get_proxy (void)" << be_idt_nl + << "get_proxy ()" << be_idt_nl << be_uidt_nl; *os << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index 7a16a8ac9c0..85f7e25cbf1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -88,20 +88,20 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "::CORBA::Boolean release = true);" << be_uidt << be_uidt_nl << "/// dtor" << be_nl - << "~" << tiename << " (void);" << be_nl + << "~" << tiename << " ();" << be_nl << "// TIE specific functions" << be_nl << "/// return the underlying object" << be_nl - << "T *_tied_object (void);" << be_nl + << "T *_tied_object ();" << be_nl << "/// set the underlying object" << be_nl << "void _tied_object (T &obj);" << be_nl << "/// set the underlying object and the ownership flag" << be_nl << "void _tied_object (T *obj, ::CORBA::Boolean release = true);" << be_nl << "/// do we own it" << be_nl - << "::CORBA::Boolean _is_owner (void);" << be_nl + << "::CORBA::Boolean _is_owner ();" << be_nl << "/// set the ownership" << be_nl_2 << "void _is_owner ( ::CORBA::Boolean b);" << be_nl << "// overridden ServantBase operations" << be_nl - << "PortableServer::POA_ptr _default_POA (void);"; + << "PortableServer::POA_ptr _default_POA ();"; int status = node->traverse_inheritance_graph ( diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp index 40976c5b33b..2aefd8183b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp @@ -111,7 +111,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "{}" << be_nl_2; *os << "template <class T>" << be_nl - << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl + << fulltiename << "<T>::~" << localtiename << " ()" << be_nl << "{" << be_idt_nl << "if (this->rel_)" << be_idt_nl << "{" << be_idt_nl @@ -120,7 +120,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "template <class T> T *" << be_nl - << fulltiename << "<T>::_tied_object (void)" << be_nl + << fulltiename << "<T>::_tied_object ()" << be_nl << "{" << be_idt_nl << "return this->ptr_;" << be_uidt_nl << "}" << be_nl_2; @@ -149,7 +149,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "template <class T> ::CORBA::Boolean" << be_nl - << fulltiename << "<T>::_is_owner (void)" << be_nl + << fulltiename << "<T>::_is_owner ()" << be_nl << "{" << be_idt_nl << "return this->rel_;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index fcccf6da943..7136b8cce2e 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -106,6 +106,6 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( *os << "\n\n#endif"; } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index f6b68cab462..1af551c91c2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -57,6 +57,6 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index de538be52bf..b073286e4d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -136,7 +136,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) // type is void. No need to generate argument list. *os << be_nl_2 - << "TAO::Argument ** _the_tao_operation_signature = 0;"; + << "TAO::Argument ** _the_tao_operation_signature {};"; nargs = 0; // Don't count the reply handler. } else diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index ede3ab5369e..8be04af15e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -205,7 +205,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( << "0);" << be_uidt << be_uidt_nl; - *os << "::Messaging::ExceptionHolder* exception_holder_ptr = 0;" << be_nl + *os << "::Messaging::ExceptionHolder* exception_holder_ptr {};" << be_nl << "ACE_NEW (" << be_idt << be_idt_nl << "exception_holder_ptr," << be_nl << "::TAO::ExceptionHolder (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 8dfd3973eff..4827c027ba9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -134,7 +134,7 @@ be_visitor_operation_upcall_command_ss::visit ( << "}" << be_nl_2; // Generate execute() method. - os << "virtual void execute (void)" << be_nl + os << "virtual void execute ()" << be_nl << "{" << be_idt_nl; if (!node->void_return_type ()) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index 8098e494498..0dd0d3522b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -128,6 +128,6 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) << node->flat_name () << "_H_ */"; } - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 7589ff6fb06..e54fa0d0c03 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -203,7 +203,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "#endif /* _TAO_CDR_OP_" << node->flat_name () << "_CPP_ */"; - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 54f8899304a..dcd96d21466 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -195,7 +195,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << "public:" << be_idt; *os << be_nl - << node->local_name () << " (void);"; + << node->local_name () << " ();"; if (node->unbounded ()) { @@ -245,16 +245,16 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << node->local_name () << "& operator= (" << node->local_name () << " &&) = default;" << be_nl; - *os << "virtual ~" << node->local_name () << " (void);"; + *os << "virtual ~" << node->local_name () << " ();"; if (be_global->alt_mapping () && node->unbounded ()) { *os << be_nl_2 - << "virtual ::CORBA::ULong length (void) const;" + << "virtual ::CORBA::ULong length () const;" << be_nl << "virtual void length (::CORBA::ULong);" << be_nl_2 - << "virtual ::CORBA::ULong maximum (void) const;"; + << "virtual ::CORBA::ULong maximum () const;"; } *os << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 38050ca3a6f..978866d68b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -109,7 +109,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // default constructor *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; // for unbounded sequences, we have a different set of constructors @@ -204,14 +204,14 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // Destructor. *os << be_nl_2 << node->name () << "::~" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; if (be_global->alt_mapping () && node->unbounded ()) { *os << be_nl_2 << "::CORBA::ULong" << be_nl - << node->name () << "::length (void) const" << be_nl + << node->name () << "::length () const" << be_nl << "{" << be_idt_nl << "return this->size ();" << be_uidt_nl << "}"; @@ -226,7 +226,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl_2 << "::CORBA::ULong" << be_nl - << node->name () << "::maximum (void) const" << be_nl + << node->name () << "::maximum () const" << be_nl << "{" << be_idt_nl << "return this->capacity ();" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index 53700954348..df8603b9463 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -110,7 +110,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) -1); } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 3471d0cd6dd..aa234e85fa4 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -227,7 +227,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) -1); } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index cfe93648ba0..ae8161b414b 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -132,7 +132,7 @@ be_visitor_traits::visit_interface (be_interface *node) << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl << "static void release (" << be_idt << be_idt_nl << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl - << "static ::" << fname << "_ptr nil (void);" << be_nl + << "static ::" << fname << "_ptr nil ();" << be_nl << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl << "const ::" << fname << "_ptr p," << be_nl << "TAO_OutputCDR & cdr);" << be_uidt << be_uidt << be_uidt_nl @@ -454,7 +454,7 @@ be_visitor_traits::visit_array (be_array *node) << "const " << name << "_slice * _tao_from);" << be_uidt << be_uidt_nl - << "static " << name << "_slice * alloc (void);" + << "static " << name << "_slice * alloc ();" << be_nl << "static void zero (" << be_idt << be_idt_nl << name << "_slice * _tao_slice);" diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp index 2f568927ad2..4d3811f2e0a 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp @@ -125,7 +125,7 @@ be_visitor_typedef_any_op_ch::visit_typedef (be_typedef *node) this->ctx_->tdef (nullptr); // reset } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp index c57d759a548..0865d98dc57 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp @@ -125,7 +125,7 @@ be_visitor_typedef_cdr_op_ch::visit_typedef (be_typedef *node) this->ctx_->tdef (nullptr); } - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp index 1f43246e813..9045ff559a8 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp @@ -121,7 +121,7 @@ be_visitor_typedef_cdr_op_cs::visit_typedef (be_typedef *node) this->ctx_->tdef (nullptr); // reset } - node->cli_stub_cdr_op_gen (1); + node->cli_stub_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 4fcba8bffc1..11ece6e78d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -230,7 +230,7 @@ be_visitor_typedef_ch::visit_array (be_array *node) *os << be_nl << "ACE_INLINE " << static_decl << be_nl << td_name << "_slice *" << be_nl - << td_name << "_alloc (void);" << be_nl; + << td_name << "_alloc ();" << be_nl; // _dup *os << be_nl << "ACE_INLINE " << static_decl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp index 971d9fb24f4..c305d181e52 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp @@ -170,7 +170,7 @@ be_visitor_typedef_ci::visit_array (be_array *node) *os << be_nl << "ACE_INLINE" << be_nl << tdef->name () << "_slice *" << be_nl; - *os << tdef->name () << "_alloc (void)" << be_nl; + *os << tdef->name () << "_alloc ()" << be_nl; *os << "{" << be_idt_nl; *os << "return " << bt->name () << "_alloc ();" << be_uidt_nl; *os << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 96c2289b6c6..b8b2a3eedc9 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -131,7 +131,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) -1); } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index 5df518c35d3..d0c95024982 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -247,7 +247,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) -1); } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index a4b2a4e1bad..142279b0dbf 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -91,6 +91,6 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) -1); } - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp index 5869e229fd5..9f4f09196be 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp @@ -70,7 +70,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node) *os << be_nl_2 << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl; // The get method. - *os << bt->nested_type_name (bu) << " _d (void) const;"; + *os << bt->nested_type_name (bu) << " _d () const;"; return 0; } @@ -103,7 +103,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type *os << be_nl_2 << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl; // The get method. - *os << bt->nested_type_name (bu) << " _d (void) const;"; + *os << bt->nested_type_name (bu) << " _d () const;"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index d15699f32ad..ce1b7ca49e6 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -100,7 +100,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node) *os << "// Accessor to get the discriminant." << be_nl << "ACE_INLINE" << be_nl << bt->name () << be_nl - << bu->name () << "::_d (void) const" << be_nl + << bu->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->disc_;" << be_uidt_nl << "}"; @@ -210,7 +210,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( *os << "// Accessor to get the discriminant." << be_nl << "ACE_INLINE" << be_nl << "::" << bt->name () << be_nl - << bu->name () << "::_d (void) const" << be_nl + << bu->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->disc_;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp index 1add0b5e828..3943c07a55f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -49,11 +49,11 @@ int be_visitor_union_ch::visit_union (be_union *node) << "public:" << be_idt_nl // Generate default and copy constructors. - << node->local_name () << " (void);" << be_nl + << node->local_name () << " ();" << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl // Generate destructor. - << "~" << node->local_name () << " (void);"; + << "~" << node->local_name () << " ();"; // Generate assignment operator. *os << be_nl_2 @@ -123,7 +123,7 @@ int be_visitor_union_ch::visit_union (be_union *node) // Only if all cases are not covered AND there is no explicit // default, we get the _default () method. *os << be_nl_2 - << "void _default (void);"; + << "void _default ();"; } *os << be_uidt_nl; @@ -154,7 +154,7 @@ int be_visitor_union_ch::visit_union (be_union *node) // The reset method (TAO extension). *os << be_nl_2 << "/// TAO extension - frees any allocated storage." << be_nl; - *os << "void _reset (void);"; + *os << "void _reset ();"; *os << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index f04a3b23e88..5cfcba36781 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -77,7 +77,7 @@ int be_visitor_union_cs::visit_union (be_union *node) // Generate the copy constructor and the assignment operator here. *os << be_nl_2 - << node->name () << "::" << node->local_name () << " (void)" << be_nl + << node->name () << "::" << node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl; @@ -189,7 +189,7 @@ int be_visitor_union_cs::visit_union (be_union *node) *os << be_uidt_nl << "}" << be_nl_2; *os << node->name () << "::~" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "// Finalize." << be_nl << "this->_reset ();" << be_uidt_nl @@ -267,7 +267,7 @@ int be_visitor_union_cs::visit_union (be_union *node) this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS); *os << "/// Reset method to reset old values of a union." << be_nl; - *os << "void " << node->name () << "::_reset (void)" << be_nl; + *os << "void " << node->name () << "::_reset ()" << be_nl; *os << "{" << be_idt_nl; if (!boolDisc) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 5f7aa44601e..566027008ec 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -118,7 +118,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node) << "_" << bt->local_name () << ");" << be_nl; // The get method. *os << "_" << bt->local_name () << "_slice * " << ub->local_name () - << " (void) const; // get method"; + << " () const; // get method"; } else { @@ -133,7 +133,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node) << be_nl; // The get method. *os << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; } return 0; @@ -196,7 +196,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node) << be_nl; // the get method. *os << bt->nested_type_name (bu) << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -239,7 +239,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -282,7 +282,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -325,7 +325,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -368,7 +368,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -411,7 +411,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node) << ")" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -457,23 +457,23 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu, "_ptr") << ");" << be_nl; *os << bt->nested_type_name (bu, "_ptr") << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; break; case AST_PredefinedType::PT_value: *os << be_nl_2 << "void " << ub->local_name () << " ( " << bt->nested_type_name (bu, " *") << ");" << be_nl; *os << bt->nested_type_name (bu, " *") << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; break; case AST_PredefinedType::PT_any: *os << be_nl_2 << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl; *os << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" << be_nl; + << ub->local_name () << " () const;" << be_nl; *os << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void);"; + << ub->local_name () << " ();"; break; case AST_PredefinedType::PT_void: break; @@ -482,7 +482,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no << "void " << ub->local_name () << " ( " << bt->nested_type_name (bu) << ");" << be_nl; *os << bt->nested_type_name (bu) << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; } return 0; @@ -551,10 +551,10 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl; *os << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl; *os << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } @@ -589,7 +589,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) *os << "void " << ub->local_name () << " (const ::CORBA::String_var&);" << be_nl; *os << "const char *" << ub->local_name () - << " (void) const;"; + << " () const;"; } else { @@ -600,7 +600,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);" << be_nl; *os << "const ::CORBA::WChar *" << ub->local_name () - << " (void) const;"; + << " () const;"; } return 0; @@ -659,10 +659,10 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } @@ -752,10 +752,10 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 9b50f8363e2..add0becee4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -186,7 +186,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -257,7 +257,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -347,7 +347,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "_ptr" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -437,7 +437,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "_ptr" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -532,7 +532,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common (be_type *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "*" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -681,7 +681,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl; @@ -694,7 +694,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl; @@ -707,7 +707,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << " *" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl; @@ -720,7 +720,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "const ::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -730,7 +730,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -743,7 +743,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -819,7 +819,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) *os << "/// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -828,7 +828,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) *os << "/// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -999,7 +999,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) } *os << bu->name () << "::" << ub->local_name () - << " (void) const // get method" << be_nl + << " () const // get method" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -1106,7 +1106,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node) *os << "// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; if (bt->size_type () == be_type::VARIABLE @@ -1125,7 +1125,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node) *os << "// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; if (bt->size_type () == be_type::VARIABLE @@ -1263,7 +1263,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node) *os << "// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -1272,7 +1272,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node) *os << "// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index 71fd4646168..7d17a24f206 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -102,6 +102,6 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) *os << "\n\n#endif"; } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp index 6487b9870ab..082faf2daf5 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp @@ -189,6 +189,6 @@ be_visitor_valuebox_any_op_cs::visit_valuebox (be_valuebox *node) *os << "\n\n#endif"; } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp index ddf8989d506..30afffb23ee 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp @@ -50,6 +50,6 @@ be_visitor_valuebox_cdr_op_ch::visit_valuebox (be_valuebox *node) *os << be_global->core_versioning_end () << be_nl; - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index 87e72160172..fa546645e9b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -128,7 +128,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node) *os << "void " << field->local_name () << " (" << fname << ");" << be_nl; *os << "const " << fname << "_slice *" << field->local_name () - << " (void) const;" << be_nl; + << " () const;" << be_nl; return 0; } @@ -520,5 +520,5 @@ be_visitor_valuebox_field_ch::emit_member_get (be_decl *field, TAO_OutStream *os = this->ctx_->stream (); *os << const_prefix << field_type->name () << type_suffix << " " - << field->local_name () << " (void) " << const_method << ";" << be_nl; + << field->local_name () << " () " << const_method << ";" << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index 61b5e2ebf0e..31bbb25ea69 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -138,7 +138,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node) *os << "ACE_INLINE const " << fname << "_slice *" << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << ";" << be_uidt_nl @@ -589,7 +589,7 @@ be_visitor_valuebox_field_ci::emit_member_get (be_decl *field, *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) " << const_method << be_nl + << " () " << const_method << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << access_modifier << ";" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index fe77c0de8c5..562a4fa0dea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -135,7 +135,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node) *os << "ACE_INLINE const " << fname << "_slice *" << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << " ();" << be_uidt_nl @@ -544,7 +544,7 @@ be_visitor_valuebox_union_member_ci::emit_member_get ( *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) " << const_method << be_nl + << " () " << const_method << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << " ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index ecda2bb3291..56f8e7ee686 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -72,17 +72,17 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) << "_downcast ( ::CORBA::ValueBase *);" << be_nl; // _copy_value method - *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl_2; + *os << "::CORBA::ValueBase * _copy_value ();" << be_nl_2; // repository id methods *os << "virtual const char* " - << "_tao_obv_repository_id (void) const;" + << "_tao_obv_repository_id () const;" << be_nl_2 << "virtual void " << "_tao_obv_truncatable_repo_ids (Repository_Id_List &ids) const;" << be_nl_2 << "static const char* " - << "_tao_obv_static_repository_id (void);" << be_nl_2; + << "_tao_obv_static_repository_id ();" << be_nl_2; // unmarshal method *os << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl @@ -92,7 +92,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) if (be_global->tc_support ()) { - *os << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;" + *os << "virtual ::CORBA::TypeCode_ptr _tao_type () const;" << be_nl_2; } @@ -117,7 +117,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl; - *os << "virtual ~" << node->local_name () << " (void);" << be_nl; + *os << "virtual ~" << node->local_name () << " ();" << be_nl; // Methods for marshalling and unmarshalling the value *os << "virtual ::CORBA::Boolean " @@ -183,9 +183,9 @@ be_visitor_valuebox_ch::visit_array (be_array *node) *os << "// Accessors and modifier" << be_nl; *os << "const " << node->full_name () << "_slice* " - << "_value (void) const;" << be_nl; + << "_value () const;" << be_nl; - *os << node->full_name () << "_slice* " << "_value (void);" << be_nl; + *os << node->full_name () << "_slice* " << "_value ();" << be_nl; *os << "void" << " _value (const " << node->full_name () << " val);" << be_nl_2; @@ -200,12 +200,12 @@ be_visitor_valuebox_ch::visit_array (be_array *node) // Explicit conversion functions *os << "const " << node->full_name () - << "_slice * _boxed_in (void) const;" + << "_slice * _boxed_in () const;" << be_nl; - *os << node->full_name () << "_slice * _boxed_inout (void);" << be_nl; + *os << node->full_name () << "_slice * _boxed_inout ();" << be_nl; - *os << node->full_name () << "_slice * _boxed_out (void);" << be_nl + *os << node->full_name () << "_slice * _boxed_out ();" << be_nl << be_nl; // Member variable of underlying type; @@ -362,8 +362,8 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) } *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2 - << "::CORBA::ULong maximum (void) const;" << be_nl - << "::CORBA::ULong length (void) const;" << be_nl + << "::CORBA::ULong maximum () const;" << be_nl + << "::CORBA::ULong length () const;" << be_nl << "void length ( ::CORBA::ULong len);" << be_nl_2; // Member variable of underlying type; @@ -435,7 +435,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Accessor function takes no arguments and returns a const char * *os << "const " << node->full_name () - << " _value (void) const;" << be_nl_2; + << " _value () const;" << be_nl_2; *os << "// Modifiers" << be_nl; @@ -725,7 +725,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node, *os << "// Accessor and modifier" << be_nl; *os << node->full_name () << type_suffix - << " _value (void) const;" << be_nl; + << " _value () const;" << be_nl; *os << "void" << " _value (" << node->full_name () << type_suffix << " val);" << be_nl_2; @@ -751,7 +751,7 @@ be_visitor_valuebox_ch::emit_default_constructor () *os << be_nl_2 << "// Constructors" << be_nl; // Public default constructor - *os << vb_node->local_name () << " (void);" << be_nl; + *os << vb_node->local_name () << " ();" << be_nl; } void @@ -812,11 +812,11 @@ be_visitor_valuebox_ch::emit_boxed_access (be_decl *node, // Access to the boxed value for method signatures *os << const_prefix << node->full_name () << type_suffix << in_ref_modifier - << " _boxed_in (void) const;" << be_nl + << " _boxed_in () const;" << be_nl << node->full_name () << type_suffix << "&" - << " _boxed_inout (void);" << be_nl + << " _boxed_inout ();" << be_nl << node->full_name () << type_suffix << out_ref_modifier << "&" - << " _boxed_out (void);" << be_nl; + << " _boxed_out ();" << be_nl; } void @@ -827,11 +827,11 @@ be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node) *os << "// Accessors and modifier" << be_nl; // Public accessor method (const) - *os << "const " << node->full_name () << "& _value (void) const;" + *os << "const " << node->full_name () << "& _value () const;" << be_nl; // Public accessor method - *os << node->full_name () << "& _value (void);" << be_nl; + *os << node->full_name () << "& _value ();" << be_nl; // Public modifier method *os << "void" << " _value (const " << node->full_name () << "& val);" diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 221a666a0b2..1e1f560c15c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -73,7 +73,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Public default constructor *os << "ACE_INLINE" << be_nl - << vb_node->name () << "::" << vb_node->local_name () << " (void)" + << vb_node->name () << "::" << vb_node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "this->_pd_value = " << node->full_name () << "_alloc ();" << be_uidt_nl << "}" << be_nl_2; @@ -111,13 +111,13 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Public accessor and modifier methods *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl - << vb_node->name () << "::_value (void)" << be_nl + << vb_node->name () << "::_value ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; @@ -146,19 +146,19 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Explicit conversion functions *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; @@ -228,14 +228,14 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) // Generate maximum() accessor *os << "ACE_INLINE ::CORBA::ULong" << be_nl - << vb_node->name () << "::maximum (void) const" << be_nl + << vb_node->name () << "::maximum () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->maximum ();" << be_uidt_nl << "}" << be_nl_2; // Generate length() accessor *os << "ACE_INLINE ::CORBA::ULong" << be_nl - << vb_node->name () << "::length (void) const" << be_nl + << vb_node->name () << "::length () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->length ();" << be_uidt_nl << "}" << be_nl_2; @@ -325,7 +325,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Accessor function takes no arguments and returns a const char * *os << "ACE_INLINE const " << node->full_name () << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; @@ -356,19 +356,19 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Access to the boxed value for method signatures *os << "ACE_INLINE const " << node->full_name () << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; @@ -555,7 +555,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) << "}" << be_nl_2; *os << "ACE_INLINE " << bt->nested_type_name (node) << be_nl - << vb_node->name () << "::_d (void) const" << be_nl + << vb_node->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->_d ();" << be_uidt_nl << "}" << be_nl_2; @@ -596,7 +596,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, // Public accessor method *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; @@ -612,19 +612,19 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, // Explicit conversion functions *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; @@ -645,7 +645,7 @@ be_visitor_valuebox_ci::emit_default_constructor () // Public default constructor *os << "ACE_INLINE" << be_nl; *os << vb_node->name () << "::" << vb_node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{}" << be_nl_2; } @@ -661,7 +661,7 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node) // Public default constructor *os << "ACE_INLINE" << be_nl - << vb_node->name () << "::" << vb_node->local_name () << " (void)" + << vb_node->name () << "::" << vb_node->local_name () << " ()" << be_nl << "{" << be_idt_nl << node->full_name () << "* p = 0;" << be_nl << "ACE_NEW (" << be_idt_nl @@ -809,14 +809,14 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node) // Public accessor method (const) *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; // Public accessor method *os << "ACE_INLINE " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_value (void)" << be_nl + << vb_node->name () << "::_value ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; @@ -845,20 +845,20 @@ be_visitor_valuebox_ci::emit_boxed_access (be_decl *node, // Access to the boxed value for method signatures *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << out_ref_modifier << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index a576e4e3322..97ee366b542 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -94,7 +94,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // _copy_value method *os << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_copy_value (void)" << be_nl + << node->name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *result = 0;" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl @@ -106,7 +106,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // The _tao_obv_repository_id method. *os << "const char *" << be_nl - << node->name () << "::_tao_obv_repository_id (void) const" + << node->name () << "::_tao_obv_repository_id () const" << be_nl << "{" << be_idt_nl << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl << "}" << be_nl_2; @@ -155,7 +155,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}" << be_nl_2; @@ -729,7 +729,7 @@ be_visitor_valuebox_cs::emit_destructor () be_decl * const vb_node = this->ctx_->node (); // Protected destructor - os << vb_node->name () << "::~" << vb_node->local_name () << " (void)" + os << vb_node->name () << "::~" << vb_node->local_name () << " ()" << be_nl << "{" << be_nl << "}" << be_nl_2; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp index c84536d2103..e36744ab7c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp @@ -102,7 +102,7 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node) *os << "\n\n#endif"; } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp index 99b92890d4b..e12e0aea8cf 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp @@ -207,7 +207,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node) *os << "\n\n#endif"; } - node->cli_stub_any_op_gen (1); + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 16722cf0364..3047404a425 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -79,7 +79,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) } else { - *os << "void)"; + *os << ")"; } be_visitor_context ctx = *this->ctx_; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp index d2946a27aef..d25849117d9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp @@ -87,7 +87,7 @@ be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node) visitor.visit_valuetype (node); } - node->cli_hdr_cdr_op_gen (1); + node->cli_hdr_cdr_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index 0fbfa14f7ea..772ff73a4b4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -117,10 +117,10 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node) // The get method. *os << pre_op () << "const _" << bt->local_name () << "_slice * " << ub->local_name () - << " (void) const" << post_op () << be_nl; + << " () const" << post_op () << be_nl; *os << pre_op () << "_" << bt->local_name () << "_slice * " << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); } else { @@ -131,11 +131,11 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node) // The get method. *os << pre_op () << bt->name () << "_slice *" << ub->local_name () - << " (void)" << post_op () << be_nl; + << " ()" << post_op () << be_nl; // The get (read/write) method. *os << pre_op () << "const " << bt->name () << "_slice *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } return 0; @@ -195,7 +195,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node) << bt->name () << ")" << post_op () << be_nl; // The get method. *os << pre_op () << bt->name () << " " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -238,7 +238,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node) // Get method. *os << pre_op () << "::" << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -281,7 +281,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node) // Get method. *os << pre_op () << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -324,7 +324,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -367,7 +367,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -416,7 +416,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -469,7 +469,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) // Get method. *os << pre_op () << "::" << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); break; case AST_PredefinedType::PT_any: // Set method. @@ -478,11 +478,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) << post_op () << be_nl; // Get method (read-only). *os << pre_op () << "const ::" << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Get method (read/write). *os << pre_op () << "::" << bt->name () << " &" - << ub->local_name () << " (void)" + << ub->local_name () << " ()" << post_op (); break; case AST_PredefinedType::PT_void: @@ -495,7 +495,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) // Get method. *os << pre_op () << "::" << bt->name () << " " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } return 0; @@ -577,11 +577,11 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Read/write. *os << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" + << " ()" << post_op (); return 0; @@ -621,7 +621,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) << post_op () << be_nl; // Get method. *os << pre_op () << "const char *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } else { @@ -636,7 +636,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) << post_op () << be_nl; // Get method. *os << pre_op() << "const ::CORBA::WChar *" << ub->local_name () - << " (void) const" << post_op(); + << " () const" << post_op(); } return 0; @@ -697,11 +697,11 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &"; - *os << ub->local_name () << " (void) const" + *os << ub->local_name () << " () const" << post_op () << be_nl // Read/write. << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); return 0; } @@ -782,11 +782,11 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Read/write. *os << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp index 114f3c01e56..e765dc4fd1a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp @@ -17,7 +17,7 @@ be_visitor_valuetype_field_ci::be_visitor_valuetype_field_ci ( be_visitor_context *ctx ) : be_visitor_decl (ctx), - in_obv_space_ (0) + in_obv_space_ (false) { setenclosings (""); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index 09cc71e4896..1e591d5837d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -16,7 +16,7 @@ be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs ( be_visitor_context *ctx) : be_visitor_decl (ctx), - in_obv_space_ (0) + in_obv_space_ (false) { setenclosings (""); } @@ -162,7 +162,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -175,7 +175,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -650,7 +650,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -666,7 +666,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -680,7 +680,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -698,7 +698,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -785,7 +785,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node) os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -799,7 +799,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -942,7 +942,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) os); *os << "::" << ub->local_name () - << " (void) const // get method" << be_nl + << " () const // get method" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1026,7 +1026,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1040,7 +1040,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1138,7 +1138,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1152,7 +1152,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index aa9426d846f..201b7a51ac1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -219,7 +219,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) this->class_name (node, os); - *os << "::truncation_hook (void)" << be_nl + *os << "::truncation_hook ()" << be_nl << "{" << be_idt_nl << "this->require_truncation_ = true;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 2c5d3dde82d..89ec6a82ac8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -96,8 +96,8 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) be_operation get_op (node->field_type (), AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); get_op.set_name ((UTL_IdList *) node->name ()->copy ()); @@ -138,8 +138,8 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) be_operation set_op (&rt, AST_Operation::OP_noflags, node->name (), - 0, - 0); + false, + false); set_op.set_name ((UTL_IdList *) node->name ()->copy ()); set_op.be_add_argument (arg); @@ -842,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node) // Generate the body. *os << "{" << be_nl << "public:" << be_idt_nl - << "virtual ~" << node->local_name () << "_init (void);" << be_nl; + << "virtual ~" << node->local_name () << "_init ();" << be_nl; *os << "virtual const char* tao_repository_id (void);\n" << be_nl; *os << "// create () goes here" << be_nl; @@ -880,11 +880,11 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node) node->local_name ()); // Destructor. - *os << fname << "::~" << lname << " (void)" << be_nl + *os << fname << "::~" << lname << " ()" << be_nl << "{" << be_nl << "}\n\n"; *os << "const char*" << be_nl - << fname << "::tao_repository_id (void)" << be_nl + << fname << "::tao_repository_id ()" << be_nl << "{" << be_idt_nl << "return " << node->local_name () << "::_tao_obv_static_repository_id ();" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index d772cc6a386..08e9c233fbc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -176,8 +176,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl << ": exception (ex)" << be_uidt_nl << "{}" << be_nl_2 - << "virtual ~" << node->local_name () << " (void);" << be_nl - << "virtual ::CORBA::ValueBase *_copy_value (void);"; + << "virtual ~" << node->local_name () << " ();" << be_nl + << "virtual ::CORBA::ValueBase *_copy_value ();"; } *os << be_nl_2 @@ -190,18 +190,18 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << node->local_name () << " *&new_object);" << be_uidt << be_uidt_nl << be_nl << "virtual const char* " - << "_tao_obv_repository_id (void) const;" + << "_tao_obv_repository_id () const;" << be_nl_2 << "virtual void " << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;" << be_nl_2 << "static const char* " - << "_tao_obv_static_repository_id (void);"; + << "_tao_obv_static_repository_id ();"; if (be_global->tc_support ()) { *os << be_nl_2 - << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + << "virtual ::CORBA::TypeCode_ptr _tao_type () const;"; } // Generate code for the valuetype definition. @@ -243,20 +243,20 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (node->n_supports () > 0) { *os << be_uidt_nl << be_nl << "public:" << be_idt_nl; - *os << be_nl << "virtual void _add_ref (void) = 0;" << be_nl; - *os << "virtual void _remove_ref (void) = 0;" << be_nl; - *os << "virtual ::CORBA::ValueBase *_tao_to_value (void);"; + *os << be_nl << "virtual void _add_ref () = 0;" << be_nl; + *os << "virtual void _remove_ref () = 0;" << be_nl; + *os << "virtual ::CORBA::ValueBase *_tao_to_value ();"; } // Generate the "protected" constructor so that users cannot // instantiate us. *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl << node->local_name () - << " (void);" << be_nl; + << " ();" << be_nl; if (!is_an_amh_exception_holder) { - *os << "virtual ~" << node->local_name () << " (void);" + *os << "virtual ~" << node->local_name () << " ();" << be_nl_2; } @@ -307,7 +307,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << "::CORBA::Boolean " << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl << "virtual void " - << "truncation_hook (void);" + << "truncation_hook ();" << be_uidt_nl << be_nl; *os << "private:" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp index 7e2d503bde4..19f77f7a4be 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -17,7 +17,7 @@ be_visitor_valuetype_ci::be_visitor_valuetype_ci (be_visitor_context *ctx) : be_visitor_valuetype (ctx), - opt_accessor_ (0) + opt_accessor_ (false) { } @@ -35,7 +35,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) if (node->opt_accessor ()) { - this->opt_accessor_ = 1; + this->opt_accessor_ = true; } TAO_OutStream *os = this->ctx_->stream (); @@ -44,7 +44,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; *os << "ACE_INLINE" << be_nl; - *os << node->name () << "::" << node->local_name () << " (void)" << be_nl; + *os << node->name () << "::" << node->local_name () << " ()" << be_nl; if (node->is_amh_excep_holder ()) { @@ -107,7 +107,7 @@ be_visitor_valuetype_ci::visit_field (be_field *node) { be_visitor_context ctx (*this->ctx_); be_visitor_valuetype_field_cs visitor (&ctx); - visitor.in_obv_space_ = 0; + visitor.in_obv_space_ = false; visitor.setenclosings ("ACE_INLINE "); if (visitor.visit_field (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 983ae4985b3..f09a8cd5313 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -97,7 +97,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The _tao_obv_repository_id method. *os << "const char *" << be_nl << node->name () - << "::_tao_obv_repository_id (void) const" << be_nl + << "::_tao_obv_repository_id () const" << be_nl << "{" << be_idt_nl << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl @@ -146,7 +146,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}" << be_nl_2; @@ -161,7 +161,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // virtual functions, including virtual destructors, wreaks havoc // with g++ >= 4.0 RTTI support when the // "-fvisibility-inlines-hidden" command line option is used. - *os << node->name () << "::~" << node->local_name () << " (void)" + *os << node->name () << "::~" << node->local_name () << " ()" << be_nl << "{}" << be_nl_2; @@ -243,7 +243,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The virtual _copy_value method. *os << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_copy_value (void)" << be_nl + << node->name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl @@ -323,7 +323,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << node->local_name () << " *&new_object" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *base = 0;" << be_nl + << "::CORBA::ValueBase *base {};" << be_nl << "::CORBA::Boolean is_indirected = false;" << be_nl << "::CORBA::Boolean is_null_object = false;" << be_nl << "::CORBA::Boolean const retval =" << be_idt_nl @@ -360,7 +360,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_tao_to_value (void)" << be_nl + << node->name () << "::_tao_to_value ()" << be_nl << "{" << be_idt_nl << "return this;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp index 478f369c7cc..86bdaea0b8e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp @@ -49,7 +49,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node) } else { - os << "void)"; + os << ")"; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 883e31041dc..2f5c07dc02b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -70,7 +70,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) { // Public constructor. os << be_nl - << node->local_name () << "_init (void);"; + << node->local_name () << "_init ();"; } if (this->visit_valuetype_scope (node) == -1) @@ -93,13 +93,13 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) // generate create_for_unmarshal os << be_nl_2 << "virtual ::CORBA::ValueBase *" << be_nl - << "create_for_unmarshal (void);"; + << "create_for_unmarshal ();"; if (node->supports_abstract ()) { os << be_nl_2 << "virtual ::CORBA::AbstractBase_ptr" << be_nl - << "create_for_unmarshal_abstract (void);" << be_uidt; + << "create_for_unmarshal_abstract ();" << be_uidt; } } @@ -109,20 +109,20 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) os << "// TAO-specific extensions" << be_uidt_nl << "public:" << be_idt_nl; - os << "virtual const char* tao_repository_id (void);"; + os << "virtual const char* tao_repository_id ();"; if (factory_style == be_valuetype::FS_ABSTRACT_FACTORY) { // Protected constructor. os << be_uidt_nl << be_nl << "protected:" << be_idt_nl - << node->local_name () << "_init (void);"; + << node->local_name () << "_init ();"; } // Protected virtual destructor. os << be_uidt_nl << be_nl << "protected:" << be_idt_nl - << "virtual ~" << node->local_name () << "_init (void);" + << "virtual ~" << node->local_name () << "_init ();" << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index b253ae89b36..ed9631216f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -74,12 +74,12 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // ctor *os << be_nl_2 - << fname << "::" << lname << " (void)" << be_nl + << fname << "::" << lname << " ()" << be_nl << "{" << be_nl << "}"; // dtor *os << be_nl_2 - << fname << "::~" << lname << " (void)" << be_nl + << fname << "::~" << lname << " ()" << be_nl << "{" << be_nl << "}"; // The _downcast method. @@ -94,7 +94,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // tao_repository_id *os << be_nl_2 << "const char*" << be_nl - << fname << "::tao_repository_id (void)" << be_nl + << fname << "::tao_repository_id ()" << be_nl << "{" << be_idt_nl << "return ::" << node->full_name () << "::_tao_obv_static_repository_id ();" @@ -106,9 +106,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // generate create_for_unmarshal() *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << fname << "::create_for_unmarshal (void)" << be_nl + << fname << "::create_for_unmarshal ()" << be_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *ret_val = 0;" << be_nl + << "::CORBA::ValueBase *ret_val = nullptr;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl @@ -121,9 +121,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::AbstractBase_ptr" << be_nl - << fname << "::create_for_unmarshal_abstract (void)" << be_nl + << fname << "::create_for_unmarshal_abstract ()" << be_nl << "{" << be_idt_nl - << "::CORBA::AbstractBase *ret_val = 0;" << be_nl + << "::CORBA::AbstractBase *ret_val = nullptr;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 22371e5e6d8..4f3c0688e53 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -145,8 +145,8 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ ; - *os << be_nl_2 << "virtual void _add_ref (void);" << be_nl; - *os << "virtual void _remove_ref (void);"; + *os << be_nl_2 << "virtual void _add_ref ();" << be_nl; + *os << "virtual void _remove_ref ();"; } if (node->have_operation ()) @@ -166,7 +166,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << "OBV_"; } - *os << node->local_name () << " (void);"; + *os << node->local_name () << " ();"; // Initializing constructor. if (node->has_member ()) @@ -193,7 +193,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) { *os << "OBV_"; } - *os << node->local_name () << " (void);"; + *os << node->local_name () << " ();"; // Virtual _copy_value() only provided in OBV_* class when // ::CORBA::DefaultValueRefCountBase has been included. @@ -205,7 +205,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) if (this->obv_need_ref_counter (node)) { *os << be_uidt_nl << be_nl << "public:" << be_idt_nl - << "virtual ::CORBA::ValueBase *_copy_value (void);"; + << "virtual ::CORBA::ValueBase *_copy_value ();"; } // Map fields to private data. @@ -228,7 +228,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl << "virtual void " - << "truncation_hook (void);" + << "truncation_hook ();" << be_uidt_nl << be_nl; *os << "private:" << be_idt; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp index e0b7151a6fe..05d34ef1a8a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp @@ -77,7 +77,7 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node) be_visitor_context new_ctx (*this->ctx_); be_visitor_valuetype_field_ci visitor (&new_ctx); - visitor.in_obv_space_ = 1; + visitor.in_obv_space_ = true; if (visitor.visit_field (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 5282c12a4bd..4ddab60b5af 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -51,7 +51,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) *os << "OBV_"; } - *os << node->local_name () << " (void)" << be_nl; + *os << node->local_name () << " ()" << be_nl; *os << ": require_truncation_ (false)" << be_nl << "{}" << be_nl_2; @@ -86,7 +86,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << "OBV_"; } - *os << node->local_name () << " (void)" << be_nl + *os << node->local_name () << " ()" << be_nl << "{}"; // Virtual _copy_value() only provided in OBV_* class when @@ -100,7 +100,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << node->full_obv_skel_name () << "::_copy_value (void)" << be_nl + << node->full_obv_skel_name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl @@ -160,7 +160,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "void" << be_nl << node->full_obv_skel_name () - << "::_add_ref (void)" << be_nl + << "::_add_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::DefaultValueRefCountBase::_add_ref ();" << be_uidt_nl @@ -168,7 +168,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) *os << be_nl << "void" << be_nl << node->full_obv_skel_name () - << "::_remove_ref (void)" << be_nl + << "::_remove_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::DefaultValueRefCountBase::_remove_ref ();" << be_uidt_nl @@ -190,7 +190,7 @@ be_visitor_valuetype_obv_cs::visit_field (be_field *node) { be_visitor_context ctx = (*this->ctx_); be_visitor_valuetype_field_cs visitor (&ctx); - visitor.in_obv_space_ = 1; + visitor.in_obv_space_ = true; if (visitor.visit_field (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 6bf1a094e90..c7032dde502 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -90,10 +90,10 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "protected:" << be_idt_nl - << class_name.c_str () << " (void);" << be_uidt_nl << be_nl + << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; - *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl; + *os << "virtual ~" << class_name.c_str () << " ();" << be_nl << be_uidt_nl; // No copy constructor for locality constraint interface. *os << "private:" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp index 9ed8c1127a6..2b4f1096991 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp @@ -73,7 +73,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) *os << full_skel_name << "::" << local_name_prefix << node_local_name - << " (void)" << be_nl + << " ()" << be_nl << "{}" << be_nl_2; // @@@ (JP) I'm commenting out the copy constructor for now. The @@ -112,7 +112,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) *os << full_skel_name << "::~" << local_name_prefix << node_local_name - << " (void)" << be_nl + << " ()" << be_nl << "{}"; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index d20531abd8e..f2debe24349 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -115,7 +115,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << "\n\n#endif"; } - node->cli_hdr_any_op_gen (1); + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h index d51ffece6c6..cc5c2ef4bef 100644 --- a/TAO/TAO_IDL/be_include/be_argument.h +++ b/TAO/TAO_IDL/be_include/be_argument.h @@ -32,7 +32,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index 75082a5c844..d021e5125be 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -31,7 +31,7 @@ public: bool local, bool abstract); - ~be_array (void); + ~be_array (); /// Generate dimensions. If slice == 1, generate dimensions for the slice /// definition. @@ -50,13 +50,13 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Create a name for us. - virtual int create_name (void); + virtual int create_name (); - virtual void compute_tc_name (void); + virtual void compute_tc_name (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h index fbbcae1ad5a..40f1ccf330a 100644 --- a/TAO/TAO_IDL/be_include/be_attribute.h +++ b/TAO/TAO_IDL/be_include/be_attribute.h @@ -31,13 +31,13 @@ public: bool abstract); // Non-virtual override of frontend method. - be_type *field_type (void) const; + be_type *field_type () const; // Visiting. virtual int accept (be_visitor *visitor); /// Cleanup. - virtual void destroy (void); + virtual void destroy (); /// Sets the original attribute from which this one was created, /// applies only to implied IDL. diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index abfa4b7cb1d..1369ca69e02 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -198,10 +198,10 @@ public: }; /// Constructor - TAO_CodeGen (void); + TAO_CodeGen (); /// Destructor - ~TAO_CodeGen (void); + ~TAO_CodeGen (); /// Set the client header stream. int start_client_header (const char *fname); @@ -249,16 +249,16 @@ public: /// Generate code at the end such as the <<= and >>= operators along /// with the ending #endif statement. - int end_client_header (void); + int end_client_header (); /// Generate necessary code at end of client inline file. - void end_client_inline (void); + void end_client_inline (); /// Generate necessary code at end of client stub file. - void end_client_stubs (void); + void end_client_stubs (); /// Put a last #endif in the server header. - int end_server_header (void); + int end_server_header (); /// Put a last #endif in the server header. int end_implementation_header (const char *fname); @@ -267,102 +267,102 @@ public: int end_implementation_skeleton (const char *fname); /// Put a last #endif in the server template header. - int end_server_template_header (void); + int end_server_template_header (); /// Put a last #endif in the server skeletons. - int end_server_template_skeletons (void); + int end_server_template_skeletons (); /// Put a last #endif in the server skeletons. - int end_server_skeletons (void); + int end_server_skeletons (); /// Put a last #endif in the anyop header. - int end_anyop_header (void); + int end_anyop_header (); /// Make sure we end with a newline. - int end_anyop_source (void); - - int end_ciao_svnt_header (void); - int end_ciao_svnt_source (void); - int end_ciao_svnt_template_header (void); - int end_ciao_svnt_template_source (void); - int end_ciao_exec_header (void); - int end_ciao_exec_source (void); - int end_ciao_exec_idl (void); - int end_ciao_conn_header (void); - int end_ciao_conn_source (void); - int end_ciao_ami_conn_idl (void); + int end_anyop_source (); + + int end_ciao_svnt_header (); + int end_ciao_svnt_source (); + int end_ciao_svnt_template_header (); + int end_ciao_svnt_template_source (); + int end_ciao_exec_header (); + int end_ciao_exec_source (); + int end_ciao_exec_idl (); + int end_ciao_conn_header (); + int end_ciao_conn_source (); + int end_ciao_ami_conn_idl (); /// Get the client header stream. - TAO_OutStream *client_header (void); + TAO_OutStream *client_header (); /// Get the client stubs stream. - TAO_OutStream *client_stubs (void); + TAO_OutStream *client_stubs (); /// Get the client inline stream. - TAO_OutStream *client_inline (void); + TAO_OutStream *client_inline (); /// get the server header stream. - TAO_OutStream *server_header (void); + TAO_OutStream *server_header (); /// Get the implementation header stream. - TAO_OutStream *implementation_header (void); + TAO_OutStream *implementation_header (); /// Get the implementation skeleton stream. - TAO_OutStream *implementation_skeleton (void); + TAO_OutStream *implementation_skeleton (); /// Get the server header template stream. - TAO_OutStream *server_template_header (void); + TAO_OutStream *server_template_header (); /// Get the server skeletons stream. - TAO_OutStream *server_skeletons (void); + TAO_OutStream *server_skeletons (); /// Get the server template skeletons stream. - TAO_OutStream *server_template_skeletons (void); + TAO_OutStream *server_template_skeletons (); /// Get the server template inline stream. - TAO_OutStream *server_template_inline (void); + TAO_OutStream *server_template_inline (); /// Get the anyop header stream. - TAO_OutStream *anyop_header (void); + TAO_OutStream *anyop_header (); /// Get the anyop source stream. - TAO_OutStream *anyop_source (void); + TAO_OutStream *anyop_source (); /// Get the CIAO servant header stream. - TAO_OutStream *ciao_svnt_header (void); + TAO_OutStream *ciao_svnt_header (); /// Get the CIAO servant source stream. - TAO_OutStream *ciao_svnt_source (void); + TAO_OutStream *ciao_svnt_source (); /// Get the CIAO template servant header stream. - TAO_OutStream *ciao_svnt_template_header (void); + TAO_OutStream *ciao_svnt_template_header (); /// Get the CIAO template servant source stream. - TAO_OutStream *ciao_svnt_template_source (void); + TAO_OutStream *ciao_svnt_template_source (); /// Get the CIAO executor impl header stream. - TAO_OutStream *ciao_exec_header (void); + TAO_OutStream *ciao_exec_header (); /// Get the CIAO executor impl source stream. - TAO_OutStream *ciao_exec_source (void); + TAO_OutStream *ciao_exec_source (); /// Get the CIAO executor IDL source stream. - TAO_OutStream *ciao_exec_idl (void); + TAO_OutStream *ciao_exec_idl (); /// Get the CIAO connector impl header stream. - TAO_OutStream *ciao_conn_header (void); + TAO_OutStream *ciao_conn_header (); /// Get the CIAO connector impl source stream. - TAO_OutStream *ciao_conn_source (void); + TAO_OutStream *ciao_conn_source (); /// Get the CIAO AMI connector IDL stream. - TAO_OutStream *ciao_ami_conn_idl (void); + TAO_OutStream *ciao_ami_conn_idl (); /// Set the gperf input file stream. void gperf_input_stream (TAO_OutStream *gperf_input); /// Retrieve the gperf input stream being used. - TAO_OutStream *gperf_input_stream (void); + TAO_OutStream *gperf_input_stream (); /// Set the gperf input file name. void gperf_input_filename (char *filename); @@ -373,7 +373,7 @@ public: * program. This is needed coz I do ACE_OS::open on this when I need * ACE_HANDLE for the file instead FILE*. */ - char *gperf_input_filename (void); + char *gperf_input_filename (); /// Convert input string to all one case. const char *upcase (const char *str); @@ -383,7 +383,7 @@ public: void gen_ident_string (TAO_OutStream *stream) const; /// Generates the export files selected on the command line. - void gen_export_files (void); + void gen_export_files (); /// Generate file include, with optional empty comment to /// short-circuit DOxygen. @@ -392,7 +392,7 @@ public: bool add_comment = false); /// Cleanup. - void destroy (void); + void destroy (); private: void gen_ifndef_string (const char *fname, @@ -401,13 +401,13 @@ private: const char *suffix); /// Utility methods for generating file includes. - void gen_stub_hdr_includes (void); - void gen_stub_src_includes (void); - void gen_skel_hdr_includes (void); - void gen_skel_src_includes (void); - void gen_seq_file_includes (void); + void gen_stub_hdr_includes (); + void gen_stub_src_includes (); + void gen_skel_hdr_includes (); + void gen_skel_src_includes (); + void gen_seq_file_includes (); void gen_any_file_includes (TAO_OutStream * stream) ; - void gen_var_file_includes (void); + void gen_var_file_includes (); void gen_stub_arg_file_includes (TAO_OutStream * stream); void gen_skel_arg_file_includes (TAO_OutStream * stream); void gen_cond_file_include (bool condition_green, @@ -419,12 +419,12 @@ private: void gen_svnt_hdr_includes (TAO_OutStream *stream); void gen_svnt_src_includes (TAO_OutStream *stream); void gen_svnt_tmpl_hdr_includes (TAO_OutStream *stream); - void gen_exec_hdr_includes (void); - void gen_exec_src_includes (void); - void gen_exec_idl_includes (void); - void gen_conn_hdr_includes (void); - void gen_conn_src_includes (void); - void gen_ami_conn_idl_includes (void); + void gen_exec_hdr_includes (); + void gen_exec_src_includes (); + void gen_exec_idl_includes (); + void gen_conn_hdr_includes (); + void gen_conn_src_includes (); + void gen_ami_conn_idl_includes (); bool is_system_file (const char * idl_name) const; diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h index 94e7ec69dac..09766163811 100644 --- a/TAO/TAO_IDL/be_include/be_component.h +++ b/TAO/TAO_IDL/be_include/be_component.h @@ -33,17 +33,17 @@ public: AST_Interface **supports_flat, long n_supports_flat); - ~be_component (void); + ~be_component (); /// Override of the AST method to eliminate narrowing of /// the return value. Non-virtual. - be_component *base_component (void) const; + be_component *base_component () const; /// Catch BE-specific members before delegating to the base class. virtual void redefine (AST_Interface *from); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); @@ -53,14 +53,14 @@ public: AST_Structure *be_add_structure (AST_Structure *t); AST_Typedef *be_add_typedef (AST_Typedef *t); - ACE_CDR::ULong n_provides (void) const; - ACE_CDR::ULong n_remote_provides (void) const; - ACE_CDR::ULong n_uses (void) const; - ACE_CDR::ULong n_remote_uses (void) const; - bool has_uses_multiple (void) const; - ACE_CDR::ULong n_publishes (void) const; - ACE_CDR::ULong n_consumes (void) const; - ACE_CDR::ULong n_emits (void) const; + ACE_CDR::ULong n_provides () const; + ACE_CDR::ULong n_remote_provides () const; + ACE_CDR::ULong n_uses () const; + ACE_CDR::ULong n_remote_uses () const; + bool has_uses_multiple () const; + ACE_CDR::ULong n_publishes () const; + ACE_CDR::ULong n_consumes () const; + ACE_CDR::ULong n_emits () const; /// Update the has_* members. void scan (UTL_Scope *s); diff --git a/TAO/TAO_IDL/be_include/be_component_fwd.h b/TAO/TAO_IDL/be_include/be_component_fwd.h index 7ba68aee0ae..01ef8cc5c6c 100644 --- a/TAO/TAO_IDL/be_include/be_component_fwd.h +++ b/TAO/TAO_IDL/be_include/be_component_fwd.h @@ -29,10 +29,10 @@ public: be_component_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_component_fwd (void); + virtual ~be_component_fwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h index 00d945e6708..da35bc73d82 100644 --- a/TAO/TAO_IDL/be_include/be_connector.h +++ b/TAO/TAO_IDL/be_include/be_connector.h @@ -13,19 +13,19 @@ public: be_connector (UTL_ScopedName *n, AST_Connector *base_connector); - virtual ~be_connector (void); + virtual ~be_connector (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); - bool dds_connector (void); - bool ami_connector (void); + bool dds_connector (); + bool ami_connector (); private: - void check_ancestors (void); + void check_ancestors (); private: bool dds_connector_; diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h index 6b460d8289e..27f307b3813 100644 --- a/TAO/TAO_IDL/be_include/be_constant.h +++ b/TAO/TAO_IDL/be_include/be_constant.h @@ -32,7 +32,7 @@ public: virtual int accept (be_visitor *visitor); //Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_consumes.h b/TAO/TAO_IDL/be_include/be_consumes.h index a71dd3ea407..941d0381a08 100644 --- a/TAO/TAO_IDL/be_include/be_consumes.h +++ b/TAO/TAO_IDL/be_include/be_consumes.h @@ -16,16 +16,16 @@ public: be_consumes (UTL_ScopedName *n, AST_Type *consumes_type); - virtual ~be_consumes (void); + virtual ~be_consumes (); // Non-virtual override of frontend method. - be_eventtype *consumes_type (void) const; + be_eventtype *consumes_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_CONSUMES_H diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h index abf5b388052..1ae61b79451 100644 --- a/TAO/TAO_IDL/be_include/be_decl.h +++ b/TAO/TAO_IDL/be_include/be_decl.h @@ -34,7 +34,7 @@ public: be_decl (AST_Decl::NodeType type, UTL_ScopedName *n); - ~be_decl (void); + ~be_decl (); // Methods used by the interface type strategy. /// Both the arguments should be non-null!!!. Applies prefix and @@ -52,63 +52,63 @@ public: // End of Methods use by the interface type strategy. /// Return the scope created by this node (if one exists). - virtual be_scope *scope (void); + virtual be_scope *scope (); // Visiting virtual int accept (be_visitor *visitor); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Temporarily set this node's is_local_ flag. void set_local (bool val); // Boolean methods to test if code was already generated. - bool cli_hdr_gen (void); - bool cli_stub_gen (void); - bool cli_inline_gen (void); - bool srv_hdr_gen (void); - bool impl_hdr_gen (void); - bool srv_skel_gen (void); - bool impl_skel_gen (void); - bool srv_inline_gen (void); - bool tie_skel_gen (void); - bool cli_hdr_any_op_gen (void); - bool cli_stub_any_op_gen (void); - bool cli_hdr_cdr_op_gen (void); - bool cli_stub_cdr_op_gen (void); - bool cli_inline_cdr_op_gen (void); - bool cli_inline_cdr_decl_gen (void); - bool cli_traits_gen (void); - bool cli_arg_traits_gen (void); - bool srv_arg_traits_gen (void); - bool srv_sarg_traits_gen (void); - bool cli_pragma_inst_gen (void); - bool cli_inarg_tmpl_class_gen (void); - bool cli_inarg_pragma_inst_gen (void); - bool cli_inoutarg_tmpl_class_gen (void); - bool cli_inoutarg_pragma_inst_gen (void); - bool cli_outarg_tmpl_class_gen (void); - bool cli_outarg_pragma_inst_gen (void); - bool cli_retarg_tmpl_class_gen (void); - bool cli_retarg_pragma_inst_gen (void); - bool srv_tmpl_class_gen (void); - bool srv_pragma_inst_gen (void); - bool srv_inarg_tmpl_class_gen (void); - bool srv_inarg_pragma_inst_gen (void); - bool srv_inoutarg_tmpl_class_gen (void); - bool srv_inoutarg_pragma_inst_gen (void); - bool srv_outarg_tmpl_class_gen (void); - bool srv_outarg_pragma_inst_gen (void); - bool srv_retarg_tmpl_class_gen (void); - bool srv_retarg_pragma_inst_gen (void); - bool ccm_pre_proc_gen (void); - bool ex_idl_facet_gen (void); - bool svnt_hdr_facet_gen (void); - bool svnt_src_facet_gen (void); - bool exec_hdr_facet_gen (void); - bool exec_src_facet_gen (void); - bool ami4ccm_ex_idl_gen (void); + bool cli_hdr_gen (); + bool cli_stub_gen (); + bool cli_inline_gen (); + bool srv_hdr_gen (); + bool impl_hdr_gen (); + bool srv_skel_gen (); + bool impl_skel_gen (); + bool srv_inline_gen (); + bool tie_skel_gen (); + bool cli_hdr_any_op_gen (); + bool cli_stub_any_op_gen (); + bool cli_hdr_cdr_op_gen (); + bool cli_stub_cdr_op_gen (); + bool cli_inline_cdr_op_gen (); + bool cli_inline_cdr_decl_gen (); + bool cli_traits_gen (); + bool cli_arg_traits_gen (); + bool srv_arg_traits_gen (); + bool srv_sarg_traits_gen (); + bool cli_pragma_inst_gen (); + bool cli_inarg_tmpl_class_gen (); + bool cli_inarg_pragma_inst_gen (); + bool cli_inoutarg_tmpl_class_gen (); + bool cli_inoutarg_pragma_inst_gen (); + bool cli_outarg_tmpl_class_gen (); + bool cli_outarg_pragma_inst_gen (); + bool cli_retarg_tmpl_class_gen (); + bool cli_retarg_pragma_inst_gen (); + bool srv_tmpl_class_gen (); + bool srv_pragma_inst_gen (); + bool srv_inarg_tmpl_class_gen (); + bool srv_inarg_pragma_inst_gen (); + bool srv_inoutarg_tmpl_class_gen (); + bool srv_inoutarg_pragma_inst_gen (); + bool srv_outarg_tmpl_class_gen (); + bool srv_outarg_pragma_inst_gen (); + bool srv_retarg_tmpl_class_gen (); + bool srv_retarg_pragma_inst_gen (); + bool ccm_pre_proc_gen (); + bool ex_idl_facet_gen (); + bool svnt_hdr_facet_gen (); + bool svnt_src_facet_gen (); + bool exec_hdr_facet_gen (); + bool exec_src_facet_gen (); + bool ami4ccm_ex_idl_gen (); // Set the flag indicating that code generation is done. void cli_hdr_gen (bool); diff --git a/TAO/TAO_IDL/be_include/be_emits.h b/TAO/TAO_IDL/be_include/be_emits.h index 2faf72315b8..813b0aa303a 100644 --- a/TAO/TAO_IDL/be_include/be_emits.h +++ b/TAO/TAO_IDL/be_include/be_emits.h @@ -16,16 +16,16 @@ public: be_emits (UTL_ScopedName *n, AST_Type *emits_type); - virtual ~be_emits (void); + virtual ~be_emits (); // Non-virtual override of frontend method. - be_eventtype *emits_type (void) const; + be_eventtype *emits_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_EMITS_H diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 0631f7d88d5..5154d85f2a1 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -35,7 +35,7 @@ public: bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h index 82c194333a1..78959570fea 100644 --- a/TAO/TAO_IDL/be_include/be_enum_val.h +++ b/TAO/TAO_IDL/be_include/be_enum_val.h @@ -31,7 +31,7 @@ public: virtual int accept (be_visitor *visitor); //Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h index a8817c1ee3b..7b5e5fcfc39 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype.h +++ b/TAO/TAO_IDL/be_include/be_eventtype.h @@ -37,13 +37,13 @@ public: bool truncatable, bool custom); - ~be_eventtype (void); + ~be_eventtype (); // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h index f56dd68a3f9..3ee3c770bc1 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h @@ -29,13 +29,13 @@ public: be_eventtype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_eventtype_fwd (void); + virtual ~be_eventtype_fwd (); // Visiting. virtual int accept (be_visitor* visitor); // Cleanup - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h index 47a829b15ee..39d42cea0d7 100644 --- a/TAO/TAO_IDL/be_include/be_exception.h +++ b/TAO/TAO_IDL/be_include/be_exception.h @@ -16,7 +16,7 @@ public: bool abstract); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_extended_port.h b/TAO/TAO_IDL/be_include/be_extended_port.h index bb918ad5855..992549a47ae 100644 --- a/TAO/TAO_IDL/be_include/be_extended_port.h +++ b/TAO/TAO_IDL/be_include/be_extended_port.h @@ -32,11 +32,11 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~be_extended_port (void); + virtual ~be_extended_port (); - be_porttype *port_type (void) const; + be_porttype *port_type () const; - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_extern.h b/TAO/TAO_IDL/be_include/be_extern.h index b6bb946bb8e..444fb4674ce 100644 --- a/TAO/TAO_IDL/be_include/be_extern.h +++ b/TAO/TAO_IDL/be_include/be_extern.h @@ -73,9 +73,9 @@ extern TAO_IDL_BE_Export BE_GlobalData *be_global; extern TAO_IDL_BE_Export int BE_init (int &, ACE_TCHAR*[]); extern TAO_IDL_BE_Export void BE_post_init (char *[], long); -extern TAO_IDL_BE_Export void BE_version (void); -extern TAO_IDL_BE_Export void BE_produce (void); -extern TAO_IDL_BE_Export void BE_cleanup (void); -extern TAO_IDL_BE_Export void BE_abort (void); +extern TAO_IDL_BE_Export void BE_version (); +extern TAO_IDL_BE_Export void BE_produce (); +extern TAO_IDL_BE_Export void BE_cleanup (); +extern TAO_IDL_BE_Export void BE_abort (); #endif // _BE_EXTERN_BE_EXTERN_HH diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h index fcea3e23ecc..5b9c3b4ac58 100644 --- a/TAO/TAO_IDL/be_include/be_factory.h +++ b/TAO/TAO_IDL/be_include/be_factory.h @@ -30,10 +30,10 @@ class be_factory : public virtual AST_Factory, public: be_factory (UTL_ScopedName *n); - ~be_factory (void); + ~be_factory (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index 523c5db704a..0f61138f6d0 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -29,7 +29,7 @@ public: Visibility vis = vis_NA); // Non-virtual override of frontend method. - be_type *field_type (void) const; + be_type *field_type () const; // Generate debugging ostream operator for members. void gen_member_ostream_operator (TAO_OutStream *os, @@ -38,14 +38,14 @@ public: bool accessor = false); // Accessors for the member. - bool port_name_prefixed (void) const; + bool port_name_prefixed () const; void port_name_prefixed (bool val); // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // If the name of a provides or uses node has already been diff --git a/TAO/TAO_IDL/be_include/be_finder.h b/TAO/TAO_IDL/be_include/be_finder.h index 65fc54c8a44..d6f7208aec6 100644 --- a/TAO/TAO_IDL/be_include/be_finder.h +++ b/TAO/TAO_IDL/be_include/be_finder.h @@ -24,10 +24,10 @@ class be_finder : public virtual AST_Finder, public: be_finder (UTL_ScopedName *n); - ~be_finder (void); + ~be_finder (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 5a7a97ad9b9..01dfa862b74 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -55,14 +55,14 @@ public: COREDX }; - BE_GlobalData (void); - ~BE_GlobalData (void); + BE_GlobalData (); + ~BE_GlobalData (); // To switch between changing or non-changing standard include // files (e.g. tao/corba.h) so that #include statements can be // generated with ""s or <>s respectively. void changing_standard_include_files (size_t changing); - size_t changing_standard_include_files (void); + size_t changing_standard_include_files (); // Helper functions that generate the file names for the C++ mapping // generated code. @@ -72,7 +72,7 @@ public: static const char *be_get_client_hdr_fname ( bool base_name_only = false); - static const char *be_get_client_stub_fname (void); + static const char *be_get_client_stub_fname (); static const char *be_get_client_inline_fname ( bool base_name_only = false); @@ -89,9 +89,9 @@ public: static const char *be_get_server_template_hdr_fname ( bool base_name_only = false); - static const char *be_get_server_skeleton_fname (void); + static const char *be_get_server_skeleton_fname (); - static const char *be_get_implementation_skeleton_fname (void); + static const char *be_get_implementation_skeleton_fname (); static const char *be_get_server_template_skeleton_fname ( bool base_name_only = false); @@ -250,14 +250,14 @@ public: /// Returns the macro name for exporting server side classes in Win32 /// DLL. - const char* skel_export_macro (void) const; + const char* skel_export_macro () const; /// Set the macro name for export server side classes in Win32 DLL. void skel_export_macro (const char* s); /// Returns the name of the include file that contains the server /// side export macro definition. - const char* skel_export_include (void) const; + const char* skel_export_include () const; /// Set the name of the include file that contains the server side /// export macro definition. @@ -265,7 +265,7 @@ public: /// Returns the name of the include file that will be generated for the /// server side export macro definition. - const char* skel_export_file (void) const; + const char* skel_export_file () const; /// Set the name of the include file that the will be generated for server /// side export macro definition. @@ -273,14 +273,14 @@ public: /// Returns the macro name for exporting client side classes in Win32 /// DLL. - const char* stub_export_macro (void) const; + const char* stub_export_macro () const; /// Set the macro name for export client side classes in Win32 DLL. void stub_export_macro (const char* s); /// Returns the name of the include file that contains the client /// side export macro definition. - const char* stub_export_include (void) const; + const char* stub_export_include () const; /// Set the name of the include file that contains the client side /// export macro definition. @@ -288,7 +288,7 @@ public: /// Returns the name of the include file will be generated for the client /// side export macro definition. - const char* stub_export_file (void) const; + const char* stub_export_file () const; /// Set the name of the include file that will be generated for the client /// side export macro definition. @@ -296,14 +296,14 @@ public: /// Returns the macro name for exporting *A.h file classes in Win32 /// DLL. - const char* anyop_export_macro (void) const; + const char* anyop_export_macro () const; /// Set the macro name for export *A.h file classes in Win32 DLL. void anyop_export_macro (const char* s); /// Returns the name of the include file that contains the *A.h /// file export macro definition. - const char* anyop_export_include (void) const; + const char* anyop_export_include () const; /// Set the name of the include file that contains the *A.h file /// export macro definition. @@ -311,14 +311,14 @@ public: /// Returns the macro name for exporting exec impl classes in Win32 /// DLL. - const char* exec_export_macro (void) const; + const char* exec_export_macro () const; /// Set the macro name for export exec impl classes in Win32 DLL. void exec_export_macro (const char* s); /// Returns the name of the include file that contains the exec /// impl export macro definition. - const char* exec_export_include (void) const; + const char* exec_export_include () const; /// Set the name of the include file that contains the exec impl /// export macro definition. @@ -326,14 +326,14 @@ public: /// Returns the macro name for exporting CIAO svnt classes in Win32 /// DLL. - const char* svnt_export_macro (void) const; + const char* svnt_export_macro () const; /// Set the macro name for export CIAO svnt classes in Win32 DLL. void svnt_export_macro (const char* s); /// Returns the name of the include file that contains the CIAO /// svnt export macro definition. - const char* svnt_export_include (void) const; + const char* svnt_export_include () const; /// Set the name of the include file that contains the CIAO svnt /// export macro definition. @@ -341,7 +341,7 @@ public: /// Returns the macro name for exporting CIAO connector /// classes in Win32 DLL. - const char* conn_export_macro (void) const; + const char* conn_export_macro () const; /// Set the macro name for export CIAO connector /// classes in Win32 DLL. @@ -349,7 +349,7 @@ public: /// Returns the name of the include file that contains the CIAO /// connector export macro definition. - const char* conn_export_include (void) const; + const char* conn_export_include () const; /// Set the name of the include file that contains the CIAO /// connector export macro definition. @@ -357,7 +357,7 @@ public: /// Returns the name of the include file to be used for precompiled /// header support. - const char* pch_include (void) const; + const char* pch_include () const; /// Set the name of the include file to be used for precompiled /// header support. @@ -365,7 +365,7 @@ public: /// Returns the name of the include file to be put at the top of /// every header file. - const char* pre_include (void) const; + const char* pre_include () const; /// Set the name of the include file to be put at the top of every /// header file. @@ -373,21 +373,21 @@ public: /// Returns the name of the include file to be put at the bottom of /// every header file. - const char* post_include (void) const; + const char* post_include () const; /// Set the name of the include file to be put at the bottom of every /// header file. void post_include (const char* s); /// Returns the guard that is placed in the client header file - const char* include_guard (void) const; + const char* include_guard () const; /// Set the guard that is placed in the client header file void include_guard (const char* s); /// Returns the name of the include file that is used instead of the own /// generated client header file - const char* safe_include (void) const; + const char* safe_include () const; /// set the name of the include file that is used instead of the own /// generated client header file @@ -395,7 +395,7 @@ public: /// Returns the name of the include file that should on get /// generated in the client header file - const char* unique_include (void) const; + const char* unique_include () const; /// Set the name of the include file that should on get /// generated in the client header file @@ -403,7 +403,7 @@ public: /// Returns the name of the include file that should be used as /// stripped_filename - const char* stripped_filename (void) const; + const char* stripped_filename () const; /// Set the name of the include file that should be used as stripped_filename void stripped_filename (const char* s); @@ -412,27 +412,27 @@ public: void versioning_begin (const char* s); /// Get text that opens a "versioned" namespace. - const char * versioning_begin (void) const; + const char * versioning_begin () const; /// Set include file for "versioned" namespace. void versioning_include (const char* s); /// Get include file for "versioned" namespace. - const char * versioning_include (void) const; + const char * versioning_include () const; /// Get text that opens a "versioned" namespace for core TAO/orbsvcs /// related code. - const char * core_versioning_begin (void) const; + const char * core_versioning_begin () const; /// Set text that closes a "versioned" namespace. void versioning_end (const char* s); /// Get text that closes a "versioned" namespace. - const char * versioning_end (void) const; + const char * versioning_end () const; /// Get text that closes a "versioned" namespace for core TAO/orbsvcs /// related code. - const char * core_versioning_end (void) const; + const char * core_versioning_end () const; // = Set and get methods for different file name endings. @@ -440,25 +440,25 @@ public: void client_hdr_ending (const char* s); /// Get the client_hdr_ending. - const char* client_hdr_ending (void) const; + const char* client_hdr_ending () const; /// Set the client_inline_ending. void client_inline_ending (const char* s); /// Get the client_inline_ending. - const char* client_inline_ending (void) const; + const char* client_inline_ending () const; /// Set the client_stub_ending. void client_stub_ending (const char* s); /// Get the client_stub_ending. - const char* client_stub_ending (void) const; + const char* client_stub_ending () const; /// Set the server_hdr_ending. void server_hdr_ending (const char* s); /// Get the server_hdr_ending. - const char* server_hdr_ending (void) const; + const char* server_hdr_ending () const; /// Set the implementation_hdr_ending. void implementation_hdr_ending (const char* s); @@ -473,121 +473,121 @@ public: void implementation_skel_ending (const char* s); /// Get the implementation_hdr_ending. - const char* implementation_hdr_ending (void) const; + const char* implementation_hdr_ending () const; ///Get implementation class prefix - const char* impl_class_prefix (void) const; + const char* impl_class_prefix () const; ///Get implementation class suffix - const char* impl_class_suffix (void) const; + const char* impl_class_suffix () const; /// Get the implementation_skel_ending. - const char* implementation_skel_ending (void) const; + const char* implementation_skel_ending () const; /// Set the server_template_hdr_ending. void server_template_hdr_ending (const char* s); /// Get the server_template_hdr_ending. - const char* server_template_hdr_ending (void) const; + const char* server_template_hdr_ending () const; /// Set the server_skeleton_ending. void server_skeleton_ending (const char* s); /// Get the server_skeleton_ending. - const char* server_skeleton_ending (void) const; + const char* server_skeleton_ending () const; /// Set the server_template_skeleton_ending. void server_template_skeleton_ending (const char* s); /// Get the server_template_skeleton_ending. - const char* server_template_skeleton_ending (void) const; + const char* server_template_skeleton_ending () const; /// Set the anyop_header_ending. void anyop_header_ending (const char* s); /// Get the anyop_header_ending. - const char* anyop_header_ending (void) const; + const char* anyop_header_ending () const; /// Set the anyop_source_ending. void anyop_source_ending (const char* s); /// Get the anyop_source_ending. - const char* anyop_source_ending (void) const; + const char* anyop_source_ending () const; /// Similar to above, but for CIAO servant and executor /// impl and executor IDL files, if generated. void ciao_svnt_header_template_ending (const char* s); - const char* ciao_svnt_header_template_ending (void) const; + const char* ciao_svnt_header_template_ending () const; void ciao_svnt_source_template_ending (const char* s); - const char* ciao_svnt_source_template_ending (void) const; + const char* ciao_svnt_source_template_ending () const; void ciao_svnt_header_ending (const char* s); - const char* ciao_svnt_header_ending (void) const; + const char* ciao_svnt_header_ending () const; void ciao_svnt_source_ending (const char* s); - const char* ciao_svnt_source_ending (void) const; + const char* ciao_svnt_source_ending () const; void ciao_exec_header_ending (const char* s); - const char* ciao_exec_header_ending (void) const; + const char* ciao_exec_header_ending () const; void ciao_exec_source_ending (const char* s); - const char* ciao_exec_source_ending (void) const; + const char* ciao_exec_source_ending () const; void ciao_exec_stub_header_ending (const char* s); - const char* ciao_exec_stub_header_ending (void) const; + const char* ciao_exec_stub_header_ending () const; void ciao_exec_idl_ending (const char* s); - const char* ciao_exec_idl_ending (void) const; + const char* ciao_exec_idl_ending () const; void ciao_conn_header_ending (const char* s); - const char* ciao_conn_header_ending (void) const; + const char* ciao_conn_header_ending () const; void ciao_conn_source_ending (const char* s); - const char* ciao_conn_source_ending (void) const; + const char* ciao_conn_source_ending () const; /// For generating TypeSupport header file includes. void dds_typesupport_hdr_ending (const char* s); - const char* dds_typesupport_hdr_ending (void) const; + const char* dds_typesupport_hdr_ending () const; /// For optionally generating CIAO AMI connector IDL file. void ciao_ami_conn_idl_ending (const char* s); - const char* ciao_ami_conn_idl_ending (void) const; + const char* ciao_ami_conn_idl_ending () const; /// For optionally generating CIAO AMI reply handler /// impl header file. void ciao_ami_conn_impl_hdr_ending (const char* s); - const char* ciao_ami_conn_impl_hdr_ending (void) const; + const char* ciao_ami_conn_impl_hdr_ending () const; /// For optionally generating CIAO AMI reply handler /// impl source file. void ciao_ami_conn_impl_src_ending (const char* s); - const char* ciao_ami_conn_impl_src_ending (void) const; + const char* ciao_ami_conn_impl_src_ending () const; /// For optionally controlling the container type, default is Session void ciao_container_type (const char* s); - const char* ciao_container_type (void) const; + const char* ciao_container_type () const; /// Set the clonable_in_args. void use_clonable_in_args (bool clonable); /// Get the clonable_in_args setting. - bool use_clonable_in_args (void) const; + bool use_clonable_in_args () const; /// Get the gen_seq_template_export_ member. - bool gen_template_export (void) const; + bool gen_template_export () const; /// Set the gen_seq_template_export_ member. void gen_template_export (bool val); /// Get the gen_ostream_operators_ member. - bool gen_ostream_operators (void) const; + bool gen_ostream_operators () const; /// Set the gen_ostream_operators_ member. void gen_ostream_operators (bool val); /// Get the gen_static_desc_operations_ member. - bool gen_static_desc_operations (void) const; + bool gen_static_desc_operations () const; /// Set the gen_static_desc_operations_ member. void gen_static_desc_operations (bool val); @@ -605,7 +605,7 @@ public: * to be kept. Default is current directory from which the * <tao_idl> is called. */ - const char* output_dir (void) const; + const char* output_dir () const; /// Set the path for all *C.* file includes. /// Default is local directory or $TAO_ROOT/tao. @@ -613,7 +613,7 @@ public: /// Get the path for all *C.* file includes. /// Default is local directory or $TAO_ROOT/tao. - const char* stub_include_dir (void) const; + const char* stub_include_dir () const; /// Set the directory where all the *S.* files are /// to be kept. Default is output_dir_. @@ -621,7 +621,7 @@ public: /// Get the directory where all the *S.* files are /// to be kept. Default is output_dir_. - const char* skel_output_dir (void) const; + const char* skel_output_dir () const; /// Set the directory where all the *A.* files are /// to be kept. Default is output_dir_. @@ -629,7 +629,7 @@ public: /// Get the directory where all the *A.* files are /// to be kept. Default is output_dir_. - const char* anyop_output_dir (void) const; + const char* anyop_output_dir () const; /// Set the directory where all the *exec.* files are /// to be kept. Default is output_dir_. @@ -637,10 +637,10 @@ public: /// Get the directory where all the *exec.* files are /// to be kept. Default is output_dir_. - const char* exec_output_dir (void) const; + const char* exec_output_dir () const; ///Get the flag for not overwriting already existing exec files. - bool overwrite_not_exec (void) const; + bool overwrite_not_exec () const; ///Set the flag for not overwriting already existing exec files. void overwrite_not_exec (bool val); @@ -649,138 +649,138 @@ public: void any_support (bool); /// Check Any support. - bool any_support (void) const; + bool any_support () const; /// Set cdr support. void cdr_support (bool); /// Check cdr support. - bool cdr_support (void) const; + bool cdr_support () const; /// Set TypeCode support. void tc_support (bool); /// Check TypeCode support - bool tc_support (void) const; + bool tc_support () const; /// Set optimized valuetype member accessor generation. void obv_opt_accessor (bool); /// Check optimized valuetype member accessor generation. - bool obv_opt_accessor (void) const; + bool obv_opt_accessor () const; /// Set generation of implementation files. void gen_impl_files (bool); /// Check if we want to generate implementation files. - bool gen_impl_files (void) const; + bool gen_impl_files () const; /// Set generation of source file and line number for implementation files. void gen_impl_debug_info (bool); /// Check generation of source file and line number implementation files. - bool gen_impl_debug_info (void) const; + bool gen_impl_debug_info () const; /// Set generation of copy constructor. void gen_copy_ctor (bool); /// Check if we want to generate the copy constructor. - bool gen_copy_ctor (void) const; + bool gen_copy_ctor () const; /// Set the generation of the assignment operator. void gen_assign_op (bool); /// Check if we want to generate the assignment operator. - bool gen_assign_op (void) const; + bool gen_assign_op () const; /// Set whether we want to generate Thru_POA collocation stubs. void gen_thru_poa_collocation (bool); /// Check if we want to generate Thru_POA collocation stubs. - bool gen_thru_poa_collocation (void) const; + bool gen_thru_poa_collocation () const; /// Set whether we want to generate Direct collocation stubs. void gen_direct_collocation (bool); /// Check if we want to generate Direct collocation stubs. - bool gen_direct_collocation (void) const; + bool gen_direct_collocation () const; /// Set whether we want to generate for CORBA/e void gen_corba_e (bool); /// Check if we want to generate for CORBA/e - bool gen_corba_e (void) const; + bool gen_corba_e () const; /// Set whether we want to generate for Minimum CORBA void gen_minimum_corba (bool); /// Check if we want to generate for Minimum CORBA - bool gen_minimum_corba (void) const; + bool gen_minimum_corba () const; /// Set whether we want to generate for noeventCCM void gen_noeventccm (bool); /// Check if we want to generate for noeventCCM - bool gen_noeventccm (void) const; + bool gen_noeventccm () const; /// Set whether we want to generate for LwCCM void gen_lwccm (bool); /// Check if we want to generate for LwCCM - bool gen_lwccm (void) const; + bool gen_lwccm () const; /// Set optimized typecodes. void opt_tc (bool); /// Check if TypeCodes are optimized. - bool opt_tc (void) const; + bool opt_tc () const; /// To enable or disable AMI4CCM call back feature void ami4ccm_call_back (bool value); /// Return the flag. - bool ami4ccm_call_back (void) const; + bool ami4ccm_call_back () const; /// To enable or disable AMI call back feature of the Messaging /// specification in the generated code. void ami_call_back (bool value); /// Return the flag. - bool ami_call_back (void) const; + bool ami_call_back () const; /// To enable or disable AMH in the generated code. void gen_amh_classes (bool value); /// Return the flag. - bool gen_amh_classes (void) const; + bool gen_amh_classes () const; /// Set the generation of tie classes and files. void gen_tie_classes (bool value); /// Return the flag. - bool gen_tie_classes (void) const; + bool gen_tie_classes () const; /// To enable or disable AMI call back feature of the Messaging /// specification in the generated code. void gen_smart_proxies (bool value); /// Return the flag. - bool gen_smart_proxies (void) const; + bool gen_smart_proxies () const; /// Set the flag. void gen_inline_constants (bool value); /// Return the flag. - bool gen_inline_constants (void) const; + bool gen_inline_constants () const; /// Set the flag. void gen_orb_h_include (bool value); /// Return the flag. - bool gen_orb_h_include (void) const; + bool gen_orb_h_include () const; /// Generate an empty anyop header (A.h) - bool gen_empty_anyop_header (void) const; + bool gen_empty_anyop_header () const; /// Generate an empty anyop header (A.h) void gen_empty_anyop_header (bool value); @@ -790,144 +790,144 @@ public: /// Return the enumerated value for the lookup strategy. Default is /// perfect hashing. - LOOKUP_STRATEGY lookup_strategy (void) const; + LOOKUP_STRATEGY lookup_strategy () const; /// Set the DDS implementation. void dds_impl (char const * const val); /// Return the enumerated value for the DDS implementation. /// Default is NDDS. - DDS_IMPL dds_impl (void) const; + DDS_IMPL dds_impl () const; /// Cleanup function. - void destroy (void); + void destroy (); /// Used in the generation of extern function declarations so we /// can use non-defined interfaces as members and parameters. ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces; /// Accessor for the member, sets it on the first call. - AST_PredefinedType *void_type (void); + AST_PredefinedType *void_type (); /// Accessor for the member, sets it on the first call. - be_interface *ccmobject (void); + be_interface *ccmobject (); /// Accessor for the member, sets it on the first call. - be_module *messaging (void); + be_module *messaging (); /// Accessor for the member, sets it on the first call. - be_valuetype *messaging_exceptionholder (void); + be_valuetype *messaging_exceptionholder (); /// Accessor for the member, sets it on the first call. - be_interface *messaging_replyhandler (void); + be_interface *messaging_replyhandler (); /// Accessors for the member. - bool gen_anyop_files (void) const; + bool gen_anyop_files () const; void gen_anyop_files (bool val); /// Accessors for the member gen_skel_files_. - bool gen_skel_files (void) const; + bool gen_skel_files () const; void gen_skel_files (bool val); /// Accessors for the member gen_svnt_cpp_files_. - bool gen_svnt_cpp_files (void) const; + bool gen_svnt_cpp_files () const; void gen_svnt_cpp_files (bool val); /// Accessors for the member gen_svnt_t_files_. - bool gen_svnt_t_files (void) const; + bool gen_svnt_t_files () const; void gen_svnt_t_files (bool val); /// Accessors for the member gen_client_inline_. - bool gen_client_inline (void) const; + bool gen_client_inline () const; void gen_client_inline (bool val); /// Accessors for the member gen_client_stub_. - bool gen_client_stub (void) const; + bool gen_client_stub () const; void gen_client_stub (bool val); /// Accessors for the member gen_client_header_. - bool gen_client_header (void) const; + bool gen_client_header () const; void gen_client_header (bool val); /// Accessors for the member gen_server_skeleton_. - bool gen_server_skeleton (void) const; + bool gen_server_skeleton () const; void gen_server_skeleton (bool val); /// Accessors for the member gen_server_header_. - bool gen_server_header (void) const; + bool gen_server_header () const; void gen_server_header (bool val); /// Accessors for the member gen_local_iface_anyops_. - bool gen_local_iface_anyops (void) const; + bool gen_local_iface_anyops () const; void gen_local_iface_anyops (bool val); /// Accessors for the member gen_custom_ending_. - bool gen_custom_ending (void) const; + bool gen_custom_ending () const; void gen_custom_ending (bool val); /// Accessors for the member gen_unique_guards_. - bool gen_unique_guards (void) const; + bool gen_unique_guards () const; void gen_unique_guards (bool val); /// Accessors for the corresponding members. - bool gen_ciao_svnt (void) const; + bool gen_ciao_svnt () const; void gen_ciao_svnt (bool val); - bool gen_ciao_exec_idl (void) const; + bool gen_ciao_exec_idl () const; void gen_ciao_exec_idl (bool val); - bool gen_ciao_exec_impl (void) const; + bool gen_ciao_exec_impl () const; void gen_ciao_exec_impl (bool val); - bool gen_ciao_exec_reactor_impl (void) const; + bool gen_ciao_exec_reactor_impl () const; void gen_ciao_exec_reactor_impl (bool val); - bool gen_ciao_conn_impl (void) const; + bool gen_ciao_conn_impl () const; void gen_ciao_conn_impl (bool val); - bool gen_dds_typesupport_idl (void) const; + bool gen_dds_typesupport_idl () const; void gen_dds_typesupport_idl (bool val); - bool gen_ciao_valuefactory_reg (void) const; + bool gen_ciao_valuefactory_reg () const; void gen_ciao_valuefactory_reg (bool val); - bool gen_stub_export_hdr_file (void) const; + bool gen_stub_export_hdr_file () const; void gen_stub_export_hdr_file (bool val); - bool gen_skel_export_hdr_file (void) const; + bool gen_skel_export_hdr_file () const; void gen_skel_export_hdr_file (bool val); - bool gen_svnt_export_hdr_file (void) const; + bool gen_svnt_export_hdr_file () const; void gen_svnt_export_hdr_file (bool val); - bool gen_exec_export_hdr_file (void) const; + bool gen_exec_export_hdr_file () const; void gen_exec_export_hdr_file (bool val); - bool gen_conn_export_hdr_file (void) const; + bool gen_conn_export_hdr_file () const; void gen_conn_export_hdr_file (bool val); - bool alt_mapping (void) const; + bool alt_mapping () const; void alt_mapping (bool val); - bool in_facet_servant (void) const; + bool in_facet_servant () const; void in_facet_servant (bool val); - bool gen_arg_traits (void) const; + bool gen_arg_traits () const; void gen_arg_traits (bool val); - bool gen_anytypecode_adapter (void) const; + bool gen_anytypecode_adapter () const; void gen_anytypecode_adapter (bool val); bool no_fixed_err () const; void no_fixed_err (bool val); - unsigned long tab_size (void) const; + unsigned long tab_size () const; void tab_size (unsigned long val); /// Command line passed to ACE_Process::spawn. Different /// implementations in IDL and IFR backends. - ACE_CString spawn_options (void); + ACE_CString spawn_options (); /** * Parse an argument that the frontend did not recognize. diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 3f6fef60936..1acdf87dbc5 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -28,12 +28,12 @@ class AST_Expression; // and use the current indentation for the succeeding line struct TAO_NL { - TAO_NL (void); + TAO_NL (); }; struct TAO_NL_2 { - TAO_NL_2 (void); + TAO_NL_2 (); }; /** @@ -123,9 +123,9 @@ public: CIAO_AMI_RH_IMPL_SRC }; - TAO_OutStream (void); + TAO_OutStream (); - virtual ~TAO_OutStream (void); + virtual ~TAO_OutStream (); /// Open the underlying low-level handle for output. int open (const char *fname, @@ -135,10 +135,10 @@ public: void stream_type (TAO_OutStream::STREAM_TYPE); /// Return the stream type - TAO_OutStream::STREAM_TYPE stream_type (void); + TAO_OutStream::STREAM_TYPE stream_type (); /// Return the underlying lowlevel file pointer. - FILE *&file (void); + FILE *&file (); /// Increment the indentation level and by default actually indent the output /// accordingly @@ -149,13 +149,13 @@ public: int decr_indent (unsigned short flag = 1); /// Reset indentation level to 0 - int reset (void); + int reset (); /// Indent starting next line - int indent (void); + int indent (); /// Put a newline and indent on the next line - int nl (void); + int nl (); /// "printf" style variable argument print int print (const char *format, ...) @@ -167,7 +167,7 @@ public: bool add_stream_type_suffix = true); /// Generate an endif statement - int gen_endif (void); + int gen_endif (); // =overloaded operators // Avoid duplication for the underlying type of size_t diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h index 1161da68920..7f4156fdfe4 100644 --- a/TAO/TAO_IDL/be_include/be_home.h +++ b/TAO/TAO_IDL/be_include/be_home.h @@ -35,12 +35,12 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~be_home (void); + virtual ~be_home (); void scan (UTL_Scope *s); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 999486b78dd..55b5bb39736 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -50,15 +50,15 @@ public: bool abstract); /// Destructor. - ~be_interface (void); + ~be_interface (); // Methods, which access the strategy. /// Return the local name. - const char *local_name (void); + const char *local_name (); /// Retrieve the fully scoped skel class name. - const char *full_skel_name (void); + const char *full_skel_name (); /// Retrieve the fully qualified collocated class name. const char *full_coll_name (int); @@ -67,21 +67,21 @@ public: const char *local_coll_name (int); /// retrieve the name of the direct proxy implementation. - virtual const char *direct_proxy_impl_name (void); + virtual const char *direct_proxy_impl_name (); /// retrieve the fully qualified name of the direct proxy /// implementation. - virtual const char *full_direct_proxy_impl_name (void); + virtual const char *full_direct_proxy_impl_name (); /// Return the client scope that encloses the interface. - virtual const char *client_enclosing_scope (void); + virtual const char *client_enclosing_scope (); /// Return the "flattened" scope that encloses /// the interface. - virtual const char *flat_client_enclosing_scope (void); + virtual const char *flat_client_enclosing_scope (); /// Return the server scope that encloses the interface. - virtual const char *server_enclosing_scope (void); + virtual const char *server_enclosing_scope (); /// Retrieve skeleton name. const char *relative_skel_name (const char *skel_name); @@ -107,7 +107,7 @@ public: /// Generate the declarations used by the template _var, _out /// classes for interfaces, and by sequence template classes. - void gen_var_out_seq_decls (void); + void gen_var_out_seq_decls (); // Each interface (to fix names "T") also defines two help classes, // the "collocated" class inherits from T, but delegates on the @@ -148,19 +148,19 @@ public: * 0 => no * 1 => yes */ - int in_mult_inheritance (void); + int in_mult_inheritance (); /// Set a new value. void in_mult_inheritance (int mi); /// Applies to interfaces, components, and homes. - bool has_rw_attributes (void) const; + bool has_rw_attributes () const; /// Pass along BE-specific member values when redefining a fwd decl. virtual void redefine (AST_Interface *from); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); @@ -237,10 +237,10 @@ public: /// Returns the original interface from which this one was created, /// applies only to implied IDL - be_interface *original_interface (void); + be_interface *original_interface (); /// Is EventConsumerBase our parent? - bool is_event_consumer (void); + bool is_event_consumer (); /** * Common code for facet generation, whether we are @@ -252,14 +252,14 @@ public: /// Used with ami4ccm. int gen_ami4ccm_idl (TAO_OutStream *os); - bool is_ami_rh (void) const; + bool is_ami_rh () const; void is_ami_rh (bool val); - bool is_ami4ccm_rh (void) const; + bool is_ami4ccm_rh () const; void is_ami4ccm_rh (bool val); /// Accessors for the member. - bool dds_connector_traits_done (void) const; + bool dds_connector_traits_done () const; void dds_connector_traits_done (bool val); /// Generate the "public virtual" entries in the stub header. @@ -427,7 +427,7 @@ public: /** * This is a no-op, simply put here to keep compilers happy. */ - virtual ~TAO_IDL_Inheritance_Hierarchy_Worker (void); + virtual ~TAO_IDL_Inheritance_Hierarchy_Worker (); /// Define the method invoked during the inheritance traversal /** diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h index 683af1090b0..29271083e30 100644 --- a/TAO/TAO_IDL/be_include/be_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h @@ -33,7 +33,7 @@ public: be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_interface_fwd (void); + virtual ~be_interface_fwd (); /// Mutator overrides for be_type members. If we have been /// defined, we want the full definition to be set as well. @@ -41,7 +41,7 @@ public: virtual void seen_in_operation (bool val); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_mirror_port.h b/TAO/TAO_IDL/be_include/be_mirror_port.h index 1fb3e445b58..aa2737c7e29 100644 --- a/TAO/TAO_IDL/be_include/be_mirror_port.h +++ b/TAO/TAO_IDL/be_include/be_mirror_port.h @@ -31,9 +31,9 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~be_mirror_port (void); + virtual ~be_mirror_port (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h index 620ffdb5e45..9fe8eb3118b 100644 --- a/TAO/TAO_IDL/be_include/be_module.h +++ b/TAO/TAO_IDL/be_include/be_module.h @@ -28,7 +28,7 @@ public: be_module (UTL_ScopedName *n, AST_Module *previous = 0); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h index 341e7eccb4a..1a39721737a 100644 --- a/TAO/TAO_IDL/be_include/be_native.h +++ b/TAO/TAO_IDL/be_include/be_native.h @@ -30,16 +30,16 @@ class be_native : public virtual AST_Native, public: be_native (UTL_ScopedName *n); - virtual ~be_native (void) {} + virtual ~be_native () {} /// Generate the typecode description. - virtual int gen_typecode (void); + virtual int gen_typecode (); /// Return typecode size. - virtual long tc_size (void); + virtual long tc_size (); /// Cleanup. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_null_return_emitter.h b/TAO/TAO_IDL/be_include/be_null_return_emitter.h index 9bfc930ea6f..56fd4e89cff 100644 --- a/TAO/TAO_IDL/be_include/be_null_return_emitter.h +++ b/TAO/TAO_IDL/be_include/be_null_return_emitter.h @@ -23,7 +23,7 @@ class be_null_return_emitter { public: be_null_return_emitter (be_visitor_context *ctx); - ~be_null_return_emitter (void); + ~be_null_return_emitter (); int emit (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 8e08f3350df..3ecd2965573 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -35,10 +35,10 @@ public: bool local, bool abstract); - ~be_operation (void); + ~be_operation (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); @@ -49,13 +49,13 @@ public: /// Insert an exception at the head of the list. int be_insert_exception (AST_Exception *ex); - bool is_sendc_ami (void) const; + bool is_sendc_ami () const; void is_sendc_ami (bool val); - bool is_excep_ami (void) const; + bool is_excep_ami () const; void is_excep_ami (bool val); - bool is_attr_op (void) const; + bool is_attr_op () const; void is_attr_op (bool val); protected: diff --git a/TAO/TAO_IDL/be_include/be_param_holder.h b/TAO/TAO_IDL/be_include/be_param_holder.h index 64a39d8f9ff..2eecadb9e4a 100644 --- a/TAO/TAO_IDL/be_include/be_param_holder.h +++ b/TAO/TAO_IDL/be_include/be_param_holder.h @@ -26,10 +26,10 @@ public: be_param_holder (UTL_ScopedName *parameter_name, FE_Utils::T_Param_Info *info); - virtual ~be_param_holder (void); + virtual ~be_param_holder (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_porttype.h b/TAO/TAO_IDL/be_include/be_porttype.h index c6a9b607a04..4a0464e3083 100644 --- a/TAO/TAO_IDL/be_include/be_porttype.h +++ b/TAO/TAO_IDL/be_include/be_porttype.h @@ -31,9 +31,9 @@ class be_porttype : public virtual AST_PortType, public: be_porttype (UTL_ScopedName *n); - virtual ~be_porttype (void); + virtual ~be_porttype (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index 13dc307c4f5..026095fd4e6 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -37,11 +37,11 @@ public: virtual int accept (be_visitor* visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Overridden method. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); // Compute and return the value. @@ -50,7 +50,7 @@ protected: * prefix, but the default compute_repoID() uses the #pragma's to * obtain prefixes. */ - virtual void compute_repoID (void); + virtual void compute_repoID (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h index 085659a1a5c..0f73ab08577 100644 --- a/TAO/TAO_IDL/be_include/be_provides.h +++ b/TAO/TAO_IDL/be_include/be_provides.h @@ -17,16 +17,16 @@ public: be_provides (UTL_ScopedName *n, AST_Type *provides_type); - virtual ~be_provides (void); + virtual ~be_provides (); // Non-virtual override of frontend method. - be_type *provides_type (void) const; + be_type *provides_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_PROVIDES_H diff --git a/TAO/TAO_IDL/be_include/be_publishes.h b/TAO/TAO_IDL/be_include/be_publishes.h index 56082dbb30b..7a68c3fe304 100644 --- a/TAO/TAO_IDL/be_include/be_publishes.h +++ b/TAO/TAO_IDL/be_include/be_publishes.h @@ -16,16 +16,16 @@ public: be_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - virtual ~be_publishes (void); + virtual ~be_publishes (); // Non-virtual override of frontend method. - be_eventtype *publishes_type (void) const; + be_eventtype *publishes_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_PUBLISHES_H diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h index 67e6e22076f..44a6ac9118c 100644 --- a/TAO/TAO_IDL/be_include/be_root.h +++ b/TAO/TAO_IDL/be_include/be_root.h @@ -28,10 +28,10 @@ class be_root : public virtual AST_Root, public: be_root (UTL_ScopedName *n); - virtual ~be_root (void); + virtual ~be_root (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h index db945b89d05..6eab19ad9e0 100644 --- a/TAO/TAO_IDL/be_include/be_scope.h +++ b/TAO/TAO_IDL/be_include/be_scope.h @@ -33,13 +33,13 @@ class be_scope : public virtual UTL_Scope { public: /// Default constructor. - be_scope (void); + be_scope (); /// Constructor that sets the node type. be_scope (AST_Decl::NodeType nt); /// Destructor. - virtual ~be_scope (void); + virtual ~be_scope (); /// To access the protected base class method fe_add_field. AST_Field *be_add_field (AST_Field *f); @@ -51,13 +51,13 @@ public: virtual void comma (unsigned short set); /// Get the comma producing state. - int comma (void) const; + int comma () const; /// Return the be_decl node corresponding to this scope node. - virtual be_decl *decl (void); + virtual be_decl *decl (); /// Recursively clean up scope members. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index d7ccb6bd417..6d2deb80317 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -54,33 +54,33 @@ public: bool abstract); // Non-virtual override of frontend method. - be_type *base_type (void) const; + be_type *base_type () const; /// Create a name for ourselves. If we are typedefed, then we get the name of /// the typedef node, else we generate a name for ourselves. virtual int create_name (be_typedef *node); /// Return the managed type. - virtual MANAGED_TYPE managed_type (void); + virtual MANAGED_TYPE managed_type (); // Scope management functions. virtual AST_Sequence *fe_add_sequence (AST_Sequence *); /// Overridden method on the be_scope class. - virtual be_decl *decl (void); + virtual be_decl *decl (); /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); /// Report the instance name for instantiation. - const char *instance_name (void); + const char *instance_name (); /// Common code for generating the name and parameters of our /// template sequence base class. @@ -89,16 +89,16 @@ public: AST_Decl *elem_scope); /// Accessors for the member. - be_field *field_node (void) const; + be_field *field_node () const; void field_node (be_field *node); /// Helper to create_name, also used by the traits visitor. - virtual char *gen_name (void); + virtual char *gen_name (); protected: /// Computes the fully scoped typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); private: const char *smart_fwd_helper_name (AST_Decl *elem_scope, diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h index 828482b47cc..0535b0596a4 100644 --- a/TAO/TAO_IDL/be_include/be_string.h +++ b/TAO/TAO_IDL/be_include/be_string.h @@ -39,11 +39,11 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Overridden method to compute typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index fafbbc102d9..cb3014abab6 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -44,7 +44,7 @@ public: bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_structure_fwd.h b/TAO/TAO_IDL/be_include/be_structure_fwd.h index 1660b62f4da..25a5ed2f5a5 100644 --- a/TAO/TAO_IDL/be_include/be_structure_fwd.h +++ b/TAO/TAO_IDL/be_include/be_structure_fwd.h @@ -32,10 +32,10 @@ public: be_structure_fwd (AST_Structure *dummy, UTL_ScopedName *n); - virtual ~be_structure_fwd (void); + virtual ~be_structure_fwd (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_template_module.h b/TAO/TAO_IDL/be_include/be_template_module.h index 266fa5e8054..7ca8bb91071 100644 --- a/TAO/TAO_IDL/be_include/be_template_module.h +++ b/TAO/TAO_IDL/be_include/be_template_module.h @@ -32,9 +32,9 @@ public: UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - virtual ~be_template_module (void); + virtual ~be_template_module (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h index 688eeb9f6b4..2d5c917761f 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_inst.h +++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h @@ -14,10 +14,10 @@ public: AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - virtual ~be_template_module_inst (void); + virtual ~be_template_module_inst (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h index 0c7ca861f38..202d2a86b74 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_ref.h +++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h @@ -15,10 +15,10 @@ public: AST_Template_Module *ref, UTL_StrList *param_refs); - virtual ~be_template_module_ref (void); + virtual ~be_template_module_ref (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index 66fedcba55d..e70c6e2c9fc 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -28,14 +28,14 @@ public: be_type (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~be_type (void); + virtual ~be_type (); /** * Return the typecode name. When both, the prefix and the suffix * are non null, it computes and returns a tc name. Else, it also * stores the result in a member variable. */ - UTL_ScopedName *tc_name (void); + UTL_ScopedName *tc_name (); /// Type name of a node used when generating declarations for smart /// proxies. @@ -44,7 +44,7 @@ public: const char *prefix = 0); /// Compute the value of the member. - void gen_fwd_helper_name (void); + void gen_fwd_helper_name (); /// No-op, overridden in derived classes. virtual void gen_ostream_operator (TAO_OutStream *os, @@ -57,7 +57,7 @@ public: bool accessor = false); /// Accessor to the member. - const char *fwd_helper_name (void) const; + const char *fwd_helper_name () const; void fwd_helper_name (const char *name); /// Generate _var and _out typedefs for structs and unions. @@ -67,11 +67,11 @@ public: void gen_stub_decls (TAO_OutStream *os); /// Accessors for the member. - bool seen_in_sequence (void) const; + bool seen_in_sequence () const; virtual void seen_in_sequence (bool val); /// Accessors for the member. - bool seen_in_operation (void) const; + bool seen_in_operation () const; virtual void seen_in_operation (bool val); /** @@ -80,17 +80,17 @@ public: * recursive simply using "base_type->node_type()" will not work, so * the most "unaliased" type is needed. */ - virtual AST_Decl::NodeType base_node_type (void) const; + virtual AST_Decl::NodeType base_node_type () const; /// Clean up allocated members. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); protected: /// Computes the fully scoped typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); /// Typecode name. UTL_ScopedName *tc_name_; diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index d05f7707a36..b1f3bfb5708 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -31,16 +31,16 @@ public: /// Overrides for be_type members. If we have been /// defined, we want the underlying type to be set as well. virtual void seen_in_sequence (bool val); - virtual bool seen_in_operation (void) const; + virtual bool seen_in_operation () const; virtual void seen_in_operation (bool val); /// Return the most primitive base type by traversing the chain of typedefed /// base types. - be_type *primitive_base_type (void); + be_type *primitive_base_type (); /// Return the most "unaliased" type node for the base type (see /// be_type.h). - virtual AST_Decl::NodeType base_node_type (void) const; + virtual AST_Decl::NodeType base_node_type () const; /// Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, @@ -49,7 +49,7 @@ public: bool accessor = false); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index 92083e831d4..2ffb8c2a4e0 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -35,28 +35,28 @@ public: virtual void redefine (AST_Structure *from); /// Do we have at least one member with multiple case labels? - virtual bool has_duplicate_case_labels (void); + virtual bool has_duplicate_case_labels (); /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); /// Decides whether a default switch case label in the generated copy /// constructor, assignment operator, etc. is needed. - bool gen_empty_default_label (void); + bool gen_empty_default_label (); /// Just a way to get at fe_add_union_branch() from the backend. AST_UnionBranch *be_add_union_branch (AST_UnionBranch *b); /// Returns total number of labels, useful when the union has /// multiple case labels. - ACE_UINT64 nlabels (void); + ACE_UINT64 nlabels (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h index 9c61769b2bd..e00a9419804 100644 --- a/TAO/TAO_IDL/be_include/be_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_union_branch.h @@ -43,7 +43,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_union_fwd.h b/TAO/TAO_IDL/be_include/be_union_fwd.h index b9e9c73f542..76b5673dcc0 100644 --- a/TAO/TAO_IDL/be_include/be_union_fwd.h +++ b/TAO/TAO_IDL/be_include/be_union_fwd.h @@ -31,10 +31,10 @@ public: be_union_fwd (AST_Union *dummy, UTL_ScopedName *n); - virtual ~be_union_fwd (void); + virtual ~be_union_fwd (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h index 413a821b302..0d9416f464c 100644 --- a/TAO/TAO_IDL/be_include/be_union_label.h +++ b/TAO/TAO_IDL/be_include/be_union_label.h @@ -15,7 +15,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_uses.h b/TAO/TAO_IDL/be_include/be_uses.h index 80cf76f975a..873b0c57f36 100644 --- a/TAO/TAO_IDL/be_include/be_uses.h +++ b/TAO/TAO_IDL/be_include/be_uses.h @@ -17,16 +17,16 @@ public: AST_Type *uses_type, bool is_multiple); - virtual ~be_uses (void); + virtual ~be_uses (); // Non-virtual override of frontend method. - be_type *uses_type (void) const; + be_type *uses_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); void original_uses (be_uses *original_uses); // Sets the original uses from which this one was created, diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h index ab65c5cafcd..159ae016118 100644 --- a/TAO/TAO_IDL/be_include/be_util.h +++ b/TAO/TAO_IDL/be_include/be_util.h @@ -48,15 +48,15 @@ public: /// Checks made after parsing args. static TAO_IDL_BE_Export void - arg_post_proc (void); + arg_post_proc (); /// Display usage of BE-specific options. static TAO_IDL_BE_Export void - usage (void); + usage (); /// Create an AST node generator. static TAO_IDL_BE_Export AST_Generator * - generator_init (void); + generator_init (); /// Called from various places. static const char * @@ -67,7 +67,7 @@ public: /// Called from various places. static bool - overwrite_ciao_exec_files (void); + overwrite_ciao_exec_files (); // Called by each node upon construction. static void set_arg_seen_bit (be_type *); diff --git a/TAO/TAO_IDL/be_include/be_valuebox.h b/TAO/TAO_IDL/be_include/be_valuebox.h index 6a1e4292f48..9ae4448823d 100644 --- a/TAO/TAO_IDL/be_include/be_valuebox.h +++ b/TAO/TAO_IDL/be_include/be_valuebox.h @@ -30,7 +30,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif /* TAO_BE_VALUEBOX_H */ diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index 5dc0e9e5e47..38c8a990ba7 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -41,12 +41,12 @@ public: bool truncatable, bool custom); - ~be_valuetype (void); + ~be_valuetype (); virtual void redefine (AST_Interface *from); /// Should generate optimized form? - bool opt_accessor (void); + bool opt_accessor (); /// Generate the helper functions definition. virtual int gen_helper_header (char *local_name = 0, @@ -66,17 +66,17 @@ public: /// Generate the declarations used by the template _var, _out /// classes for valuetypes, and by sequence template classes. - void gen_var_out_seq_decls (void); + void gen_var_out_seq_decls (); /// Retrieve the fully scoped skel class name. - const char *full_obv_skel_name (void); + const char *full_obv_skel_name (); - const char *field_pd_prefix (void); + const char *field_pd_prefix (); - const char *field_pd_postfix (void); + const char *field_pd_postfix (); // For building the name for private data fields. - be_valuetype *statefull_inherit (void); + be_valuetype *statefull_inherit (); /// Load the insert queue with all the interfaces we support, and /// call the generic version of traverse_inheritance_graph(). @@ -95,16 +95,16 @@ public: ); /// Do we support at least one abstract interface? - bool supports_abstract (void) const; + bool supports_abstract () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); /// Compute the fully scoped skel class name. - void compute_fullobvskelname (void); + void compute_fullobvskelname (); /// Compute the count of private/public/all data members. ACE_CDR::ULong data_members_count ( @@ -118,7 +118,7 @@ public: TAO_OutStream *os); /// Accessor to the member. - const char *fwd_helper_name (void) const; + const char *fwd_helper_name () const; // There are three possible situations. // (1) If there is no initializers but at least one operation. @@ -141,24 +141,24 @@ public: }; /// Determine what kind of factory needed. - FactoryStyle determine_factory_style (void); + FactoryStyle determine_factory_style (); /// Recurse down the inheritance tree to determine /// if valuetype has at least one operation/attribute. - bool have_operation (void); + bool have_operation (); /// Check if VT supports an interface with at least 1 operation. static bool have_supported_op (be_interface *node); /// Use the above enum and methods to determine this after the /// node's scope is visited but before code generation. - virtual bool will_have_factory (void); + virtual bool will_have_factory (); /// Decides whether to generate the initializing contstructor or not. - bool has_member (void); + bool has_member (); /// Accessors for the member - bool is_amh_excep_holder (void) const; + bool is_amh_excep_holder () const; void is_amh_excep_holder (bool val); private: diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h index b72174d3a4e..4c0063ce7e9 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h @@ -31,13 +31,13 @@ public: be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_valuetype_fwd (void); + virtual ~be_valuetype_fwd (); // Visiting. virtual int accept (be_visitor* visitor); // Cleanup - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h index e6ec9470ee7..ca89ed5f9c8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor.h +++ b/TAO/TAO_IDL/be_include/be_visitor.h @@ -85,7 +85,7 @@ class TAO_OutStream; class be_visitor { public: - virtual ~be_visitor (void); + virtual ~be_visitor (); virtual int visit_decl (be_decl *d); virtual int visit_scope (be_scope *node); @@ -142,7 +142,7 @@ public: protected: // Not abstract but we want to force subclassing anyway. - be_visitor (void); + be_visitor (); }; #endif // TAO_BE_VISITOR_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h index 0bee5dc3f84..14f2b23ff33 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h @@ -37,7 +37,7 @@ private: public: be_visitor_amh_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_amh_pre_proc (void); + virtual ~be_visitor_amh_pre_proc (); virtual int visit_root (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h index d1706c12e24..a2f9f2ff70a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h @@ -41,7 +41,7 @@ private: public: be_visitor_ami_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_ami_pre_proc (void); + virtual ~be_visitor_ami_pre_proc (); virtual int visit_root (be_root *node); @@ -94,7 +94,7 @@ private: long &n_parents); /// Generate an *A.idl file for AMI4CCM. - int generate_ami4ccm_idl (void); + int generate_ami4ccm_idl (); }; #endif // TAO_BE_VISITOR_AMI_PRE_PROC_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h index deec0954961..395dae51fd6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h @@ -29,7 +29,7 @@ class be_visitor_any_extracted_type_decl : public be_visitor_decl { public: be_visitor_any_extracted_type_decl (be_visitor_context *ctx); - virtual ~be_visitor_any_extracted_type_decl (void); + virtual ~be_visitor_any_extracted_type_decl (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h index a9cb4413182..761859541eb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h @@ -24,7 +24,7 @@ public: be_visitor_arg_traits (const char *S, be_visitor_context *ctx); - virtual ~be_visitor_arg_traits (void); + virtual ~be_visitor_arg_traits (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -58,7 +58,7 @@ private: void generated (be_decl *node, bool val); - const char *insert_policy (void); + const char *insert_policy (); private: char *S_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h index 50bdba259e6..e1ae99ec493 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h @@ -35,7 +35,7 @@ public: be_visitor_args_arglist (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_arglist (void); + virtual ~be_visitor_args_arglist (); /// visit the argument node virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h index 0985975fce0..2f320a41943 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h @@ -36,7 +36,7 @@ public: be_visitor_args (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args (void); + virtual ~be_visitor_args (); //= helper /// helper that produces either a nested name for @@ -45,7 +45,7 @@ public: const char *suffix = 0); /// return the direction of the argument node - virtual AST_Argument::Direction direction (void); + virtual AST_Argument::Direction direction (); /// must be overridden by derived classes virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h index 49a1a650456..023e96be6c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h @@ -32,7 +32,7 @@ public: be_visitor_args_invoke_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_invoke_cs (void); + virtual ~be_visitor_args_invoke_cs (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -93,7 +93,7 @@ public: virtual int visit_home (be_home *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h index c7cd4332015..05e7225bd3b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_marshal_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_marshal_ss (void); + virtual ~be_visitor_args_marshal_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -94,7 +94,7 @@ public: virtual int visit_home (be_home *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h index 6a91ca39d3d..42b8d547675 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_upcall_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_upcall_ss (void); + virtual ~be_visitor_args_upcall_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -91,7 +91,7 @@ public: virtual int visit_eventtype_fwd (be_eventtype_fwd *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h index 6fee17d07a4..0fc6fd6c3a0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_vardecl_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_vardecl_ss (void); + virtual ~be_visitor_args_vardecl_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h index 5fd66b6c4ea..b6463d0753f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h @@ -34,7 +34,7 @@ public: be_visitor_array_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_array_any_op_ch (void); + ~be_visitor_array_any_op_ch (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h index 85040aae980..776a873402e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h @@ -34,7 +34,7 @@ public: be_visitor_array_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_array_any_op_cs (void); + ~be_visitor_array_any_op_cs (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h index 42fa8a82bc4..b44e9e6a4a2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h @@ -31,7 +31,7 @@ public: be_visitor_array (be_visitor_context *ctx); /// destructor - ~be_visitor_array (void); + ~be_visitor_array (); /// visit the array node virtual int visit_array (be_array *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h index 88742879048..4f0d219a1e6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h @@ -31,7 +31,7 @@ public: be_visitor_array_ch (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_ch (void); + virtual ~be_visitor_array_ch (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h index b4b1afeacc6..67ff101da07 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h @@ -31,7 +31,7 @@ public: be_visitor_array_ci (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_ci (void); + virtual ~be_visitor_array_ci (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h index 81be7e8326b..43f734b8916 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h @@ -31,7 +31,7 @@ public: be_visitor_array_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_cs (void); + virtual ~be_visitor_array_cs (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h index 78e3f4614e0..fbcfc930785 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h @@ -34,7 +34,7 @@ public: be_visitor_array_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_array_cdr_op_ch (void); + ~be_visitor_array_cdr_op_ch (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h index 73ea075826d..e7d71720731 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h @@ -38,7 +38,7 @@ public: be_visitor_array_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_array_cdr_op_cs (void); + ~be_visitor_array_cdr_op_cs (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h index 2366290a19b..a3d6a8c23e0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h @@ -28,7 +28,7 @@ class be_visitor_attr_assign : public be_visitor_decl { public: be_visitor_attr_assign (be_visitor_context *ctx); - virtual ~be_visitor_attr_assign (void); + virtual ~be_visitor_attr_assign (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h index 19400767577..25b6bbdfdfb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h @@ -30,7 +30,7 @@ class be_visitor_attr_init : public be_visitor_decl { public: be_visitor_attr_init (be_visitor_context *ctx); - virtual ~be_visitor_attr_init (void); + virtual ~be_visitor_attr_init (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h index 32bc38e5b80..b29dad5b384 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h @@ -28,7 +28,7 @@ class be_visitor_attr_return : public be_visitor_decl { public: be_visitor_attr_return (be_visitor_context *ctx); - virtual ~be_visitor_attr_return (void); + virtual ~be_visitor_attr_return (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h index 097d0f51695..e3acaf6a237 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h @@ -28,7 +28,7 @@ class be_visitor_attr_setarg_type : public be_visitor_decl { public: be_visitor_attr_setarg_type (be_visitor_context *ctx); - virtual ~be_visitor_attr_setarg_type (void); + virtual ~be_visitor_attr_setarg_type (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h index d4345eb8312..61269d1923e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h @@ -33,7 +33,7 @@ public: be_visitor_attribute (be_visitor_context *ctx); /// destructor - ~be_visitor_attribute (void); + ~be_visitor_attribute (); /// visit attribute. We provide code for this method in the derived class virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h index cdc80407df6..faf5717dc9f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h @@ -21,7 +21,7 @@ class be_visitor_attribute_ccm_init { public: be_visitor_attribute_ccm_init (be_visitor_context *ctx); - ~be_visitor_attribute_ccm_init (void); + ~be_visitor_attribute_ccm_init (); virtual int visit_attribute (be_attribute *node); @@ -41,10 +41,10 @@ public: virtual int visit_valuetype (be_valuetype *node); private: - void emit_init_block (void); + void emit_init_block (); void emit_error (const char *); - void open_if_block (void); - void close_if_block (void); + void open_if_block (); + void close_if_block (); private: be_attribute *attr_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h index 3f8c1451e37..dbf36935d64 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h @@ -23,7 +23,7 @@ class be_visitor_attribute_set_from_extracted { public: be_visitor_attribute_set_from_extracted (be_visitor_context *ctx); - virtual ~be_visitor_attribute_set_from_extracted (void); + virtual ~be_visitor_attribute_set_from_extracted (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h index e90a16bae17..16574898820 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h @@ -36,7 +36,7 @@ class be_visitor_ccm_pre_proc : public be_visitor_component_scope public: be_visitor_ccm_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_ccm_pre_proc (void); + virtual ~be_visitor_ccm_pre_proc (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -83,8 +83,8 @@ protected: // Utility functions to create and destroy the various things // needed by operations generated from CCM-related declarations. - int lookup_cookie (void); - int lookup_exceptions (void); + int lookup_cookie (); + int lookup_exceptions (); int lookup_one_exception (const char *name, be_exception *&result); @@ -130,7 +130,7 @@ protected: private: /// Generate a sendc_* receptacle for AMI4CCM. - int generate_ami4ccm_uses (void); + int generate_ami4ccm_uses (); }; #endif // TAO_BE_VISITOR_CCM_PRE_PROC_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h index fc6a2ae7d11..5e3975cb5ac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h @@ -28,7 +28,7 @@ class be_visitor_component : public be_visitor_interface public: be_visitor_component (be_visitor_context *ctx); - ~be_visitor_component (void); + ~be_visitor_component (); /// This is the only type of declaration a component may contain. virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h index 78fb8a14329..829b63ccccb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h @@ -27,16 +27,16 @@ class be_visitor_component_ami_rh_ex_base // public: be_visitor_component_ami_rh_ex_base (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_ex_base (void); + ~be_visitor_component_ami_rh_ex_base (); virtual int post_process (be_decl *node); protected: - void init (void); + void init (); void gen_excep_op (const char *prefix, be_decl *node, bool for_defn); - virtual void gen_op_body (void); + virtual void gen_op_body (); int gen_attr_op (be_attribute *node, bool for_defn); protected: diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h index 37efdb86745..2ac3bf00095 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h @@ -31,7 +31,7 @@ class be_visitor_component_ami_rh_exh { public: be_visitor_component_ami_rh_exh (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_exh (void); + ~be_visitor_component_ami_rh_exh (); virtual int visit_uses (be_uses *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h index 739153e57e0..73abcca2ec0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h @@ -26,7 +26,7 @@ class be_visitor_component_ami_rh_exs { public: be_visitor_component_ami_rh_exs (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_exs (void); + ~be_visitor_component_ami_rh_exs (); virtual int visit_uses (be_uses *node); virtual int visit_operation (be_operation *node); @@ -34,7 +34,7 @@ public: virtual int visit_argument (be_argument *node); private: - virtual void gen_op_body (void); + virtual void gen_op_body (); private: const char *your_code_here_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h index 5dd4a88f38a..77b70d453b1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_component_ex_idl : public be_visitor_decl public: be_visitor_component_ex_idl (be_visitor_context *ctx); - ~be_visitor_component_ex_idl (void); + ~be_visitor_component_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h index 2021bc1e6ff..61c3b1f1485 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h @@ -24,7 +24,7 @@ class be_visitor_component_exh public: be_visitor_component_exh (be_visitor_context *ctx); - ~be_visitor_component_exh (void); + ~be_visitor_component_exh (); virtual int visit_component (be_component *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h index fe7c1a0fb13..41a29abe673 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h @@ -24,7 +24,7 @@ class be_visitor_component_exs public: be_visitor_component_exs (be_visitor_context *ctx); - ~be_visitor_component_exs (void); + ~be_visitor_component_exs (); virtual int visit_component (be_component *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h index 45afd4bc706..f81b2d6028c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h @@ -25,7 +25,7 @@ class be_visitor_component_svh : public be_visitor_component public: be_visitor_component_svh (be_visitor_context *ctx); - ~be_visitor_component_svh (void); + ~be_visitor_component_svh (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h index 0777596da3f..931064ae3f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h @@ -26,7 +26,7 @@ class be_visitor_component_svs : public be_visitor_component public: be_visitor_component_svs (be_visitor_context *ctx); - ~be_visitor_component_svs (void); + ~be_visitor_component_svs (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h index c0ddc17c692..fb020ceb515 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h @@ -25,7 +25,7 @@ class be_visitor_component_svth : public be_visitor_component public: be_visitor_component_svth (be_visitor_context *ctx); - ~be_visitor_component_svth (void); + ~be_visitor_component_svth (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h index 0ece376fd87..778463cbb16 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h @@ -26,7 +26,7 @@ class be_visitor_component_svts : public be_visitor_component public: be_visitor_component_svts (be_visitor_context *ctx); - ~be_visitor_component_svts (void); + ~be_visitor_component_svts (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h index e4231f9943b..a534f6d12d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h @@ -23,7 +23,7 @@ class be_visitor_context_ex_idl public: be_visitor_context_ex_idl (be_visitor_context *ctx); - ~be_visitor_context_ex_idl (void); + ~be_visitor_context_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h index b3156428bb8..0b6f076c0e9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h @@ -27,7 +27,7 @@ class be_visitor_context_svth : public be_visitor_component_scope public: be_visitor_context_svth (be_visitor_context *ctx); - ~be_visitor_context_svth (void); + ~be_visitor_context_svth (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h index 6feac150d01..853502b3bb2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h @@ -27,7 +27,7 @@ class be_visitor_context_svts : public be_visitor_component_scope public: be_visitor_context_svts (be_visitor_context *ctx); - ~be_visitor_context_svts (void); + ~be_visitor_context_svts (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h index c10c1d73d01..e23af8df907 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h @@ -22,7 +22,7 @@ class be_visitor_executor_ex_idl public: be_visitor_executor_ex_idl (be_visitor_context *ctx); - ~be_visitor_executor_ex_idl (void); + ~be_visitor_executor_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -39,7 +39,7 @@ public: virtual int visit_consumes (be_consumes *node); private: - void gen_supported (void); + void gen_supported (); void gen_exception_list (UTL_ExceptList *exceptions, const char *prefix = "", bool closed = true); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h index 84ee7523a66..1cd0a6e29d6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h @@ -23,7 +23,7 @@ class be_visitor_executor_exh public: be_visitor_executor_exh (be_visitor_context *ctx); - ~be_visitor_executor_exh (void); + ~be_visitor_executor_exh (); virtual int visit_attribute (be_attribute *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h index a0298e2e982..114f5683ca8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h @@ -23,7 +23,7 @@ class be_visitor_executor_exs public: be_visitor_executor_exs (be_visitor_context *ctx); - ~be_visitor_executor_exs (void); + ~be_visitor_executor_exs (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h index 03bb5bd5045..4f0f18e75fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h @@ -24,13 +24,13 @@ class be_visitor_executor_exs_attr_init { public: be_visitor_executor_exs_attr_init (be_visitor_context *ctx); - ~be_visitor_executor_exs_attr_init (void); + ~be_visitor_executor_exs_attr_init (); virtual int visit_attribute (be_attribute *node); virtual int pre_process (be_decl *); - bool attr_generated (void) const; + bool attr_generated () const; private: bool semicolon_generated_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h index da954b17b92..0db0f40a4db 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h @@ -24,7 +24,7 @@ class be_visitor_executor_private_exh public: be_visitor_executor_private_exh (be_visitor_context *ctx); - ~be_visitor_executor_private_exh (void); + ~be_visitor_executor_private_exh (); virtual int visit_provides (be_provides *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h index 8a436a2f141..35ff340d2ea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h @@ -22,7 +22,7 @@ class be_visitor_facet_exh public: be_visitor_facet_exh (be_visitor_context *ctx); - ~be_visitor_facet_exh (void); + ~be_visitor_facet_exh (); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h index 54c1a9aaf2f..19afab63fd4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h @@ -23,7 +23,7 @@ class be_visitor_facet_exs public: be_visitor_facet_exs (be_visitor_context *ctx); - ~be_visitor_facet_exs (void); + ~be_visitor_facet_exs (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h index f30c73b57ef..b9f017e416f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h @@ -27,7 +27,7 @@ class be_visitor_servant_svh : public be_visitor_component_scope public: be_visitor_servant_svh (be_visitor_context *ctx); - ~be_visitor_servant_svh (void); + ~be_visitor_servant_svh (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -40,7 +40,7 @@ public: private: /// Base class overrides and CIAO-specific code. - void gen_non_type_specific (void); + void gen_non_type_specific (); }; #endif /* _BE_COMPONENT_SERVANT_SVH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h index 659ef708fb6..f9cac557f89 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h @@ -24,7 +24,7 @@ class be_visitor_servant_svs public: be_visitor_servant_svs (be_visitor_context *ctx); - ~be_visitor_servant_svs (void); + ~be_visitor_servant_svs (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -37,15 +37,15 @@ public: virtual int visit_consumes (be_consumes *node); private: - void gen_provides_top (void); - void gen_uses_top (void); - void gen_publishes_top (void); - void gen_emits_top (void); + void gen_provides_top (); + void gen_uses_top (); + void gen_publishes_top (); + void gen_emits_top (); /// This method gets generated (unless we are /// generating the LwCCM profile) whether the /// comonent has any emitters or not. - void gen_get_all_emitters (void); + void gen_get_all_emitters (); private: be_interface *op_scope_; @@ -59,7 +59,7 @@ class be_visitor_obv_factory_reg public: be_visitor_obv_factory_reg (be_visitor_context *ctx); - ~be_visitor_obv_factory_reg (void); + ~be_visitor_obv_factory_reg (); virtual int visit_publishes (be_publishes *node); virtual int visit_emits (be_emits *node); @@ -76,7 +76,7 @@ class be_visitor_attr_set : public be_visitor_component_scope public: be_visitor_attr_set (be_visitor_context *ctx); - ~be_visitor_attr_set (void); + ~be_visitor_attr_set (); virtual int visit_attribute (be_attribute *node); @@ -94,7 +94,7 @@ class be_visitor_facet_executor_block public: be_visitor_facet_executor_block (be_visitor_context *ctx); - ~be_visitor_facet_executor_block (void); + ~be_visitor_facet_executor_block (); virtual int visit_provides (be_provides *node); }; @@ -107,7 +107,7 @@ class be_visitor_connect_block public: be_visitor_connect_block (be_visitor_context *ctx); - ~be_visitor_connect_block (void); + ~be_visitor_connect_block (); virtual int visit_uses (be_uses *node); }; @@ -120,7 +120,7 @@ class be_visitor_disconnect_block public: be_visitor_disconnect_block (be_visitor_context *ctx); - ~be_visitor_disconnect_block (void); + ~be_visitor_disconnect_block (); virtual int visit_uses (be_uses *node); }; @@ -134,7 +134,7 @@ public: be_visitor_receptacle_desc (be_visitor_context *ctx, be_component *node); - ~be_visitor_receptacle_desc (void); + ~be_visitor_receptacle_desc (); virtual int visit_uses (be_uses *node); @@ -151,7 +151,7 @@ class be_visitor_subscribe_block public: be_visitor_subscribe_block (be_visitor_context *ctx); - ~be_visitor_subscribe_block (void); + ~be_visitor_subscribe_block (); virtual int visit_publishes (be_publishes *node); }; @@ -164,7 +164,7 @@ class be_visitor_unsubscribe_block public: be_visitor_unsubscribe_block (be_visitor_context *ctx); - ~be_visitor_unsubscribe_block (void); + ~be_visitor_unsubscribe_block (); virtual int visit_publishes (be_publishes *node); }; @@ -177,7 +177,7 @@ class be_visitor_event_source_desc public: be_visitor_event_source_desc (be_visitor_context *ctx); - ~be_visitor_event_source_desc (void); + ~be_visitor_event_source_desc (); virtual int visit_publishes (be_publishes *node); @@ -193,7 +193,7 @@ class be_visitor_connect_consumer_block public: be_visitor_connect_consumer_block (be_visitor_context *ctx); - ~be_visitor_connect_consumer_block (void); + ~be_visitor_connect_consumer_block (); virtual int visit_emits (be_emits *node); }; @@ -206,7 +206,7 @@ class be_visitor_disconnect_consumer_block public: be_visitor_disconnect_consumer_block (be_visitor_context *ctx); - ~be_visitor_disconnect_consumer_block (void); + ~be_visitor_disconnect_consumer_block (); virtual int visit_emits (be_emits *node); }; @@ -219,7 +219,7 @@ class be_visitor_emitter_desc public: be_visitor_emitter_desc (be_visitor_context *ctx); - ~be_visitor_emitter_desc (void); + ~be_visitor_emitter_desc (); virtual int visit_emits (be_emits *node); @@ -235,7 +235,7 @@ class be_visitor_populate_port_tables public: be_visitor_populate_port_tables (be_visitor_context *ctx); - ~be_visitor_populate_port_tables (void); + ~be_visitor_populate_port_tables (); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h index afc73f9840b..7aa27cfb24a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_any_op_ch (void); + ~be_visitor_component_fwd_any_op_ch (); /// visit component_fwd virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h index 85d1bb87ed8..69b53aaefe0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_cdr_op_ch (void); + ~be_visitor_component_fwd_cdr_op_ch (); /// visit forward declared component. virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h index f5c9d15989c..1d7ef30f688 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_component_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_ch (void); + ~be_visitor_component_fwd_ch (); /// visit interface_fwd. virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h index 476efb13582..a41c1e25a8f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h @@ -30,7 +30,7 @@ class be_visitor_component_scope : public be_visitor_scope protected: be_visitor_component_scope (be_visitor_context *ctx); - virtual ~be_visitor_component_scope (void); + virtual ~be_visitor_component_scope (); public: virtual int visit_extended_port (be_extended_port *node); @@ -52,10 +52,10 @@ public: void node (be_component *c); protected: - void gen_svnt_entrypoint_decl (void); - void gen_svnt_entrypoint_defn (void); - void gen_exec_entrypoint_decl (void); - void gen_exec_entrypoint_defn (void); + void gen_svnt_entrypoint_decl (); + void gen_svnt_entrypoint_defn (); + void gen_exec_entrypoint_decl (); + void gen_exec_entrypoint_defn (); protected: be_component *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h index 7602b12b8d1..1e2ed19a3b2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h @@ -31,12 +31,12 @@ class be_visitor_connector_ami_exh public: be_visitor_connector_ami_exh (be_visitor_context *ctx); - ~be_visitor_connector_ami_exh (void); + ~be_visitor_connector_ami_exh (); virtual int visit_connector (be_connector *node); private: - void gen_entrypoint (void); + void gen_entrypoint (); }; #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h index f7da2c466ae..c83d58cdca7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h @@ -32,12 +32,12 @@ class be_visitor_connector_ami_exs public: be_visitor_connector_ami_exs (be_visitor_context *ctx); - ~be_visitor_connector_ami_exs (void); + ~be_visitor_connector_ami_exs (); virtual int visit_connector (be_connector *node); private: - void gen_entrypoint (void); + void gen_entrypoint (); }; #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h index a59c934d354..f26f839bbb8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h @@ -31,7 +31,7 @@ class be_visitor_connector_dds_ex_base public: be_visitor_connector_dds_ex_base (be_visitor_context *ctx); - ~be_visitor_connector_dds_ex_base (void); + ~be_visitor_connector_dds_ex_base (); protected: bool begin (be_connector *node); @@ -53,7 +53,7 @@ protected: private: void process_template_args (AST_Connector *node); - void match_template_args (void); + void match_template_args (); }; #endif /* _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h index 292a965fb15..b1ea70cbc72 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h @@ -31,7 +31,7 @@ class be_visitor_connector_dds_exh public: be_visitor_connector_dds_exh (be_visitor_context *ctx); - ~be_visitor_connector_dds_exh (void); + ~be_visitor_connector_dds_exh (); virtual int visit_connector (be_connector *node); @@ -47,7 +47,7 @@ private: /// Generate application-specific instantiations of /// middleware templates containing traits constructs. void gen_dds_traits (AST_Decl *datatype); - void gen_connector_traits (void); + void gen_connector_traits (); /// Common code triggered by provides and uses ports. void gen_interface_connector_trait (be_interface *iface, diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h index 6b96a075509..78d220fa63d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h @@ -29,7 +29,7 @@ class be_visitor_connector_dds_exs public: be_visitor_connector_dds_exs (be_visitor_context *ctx); - ~be_visitor_connector_dds_exs (void); + ~be_visitor_connector_dds_exs (); virtual int visit_connector (be_connector *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h index 7790f43bd33..fa00e192e4b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h @@ -29,7 +29,7 @@ class be_visitor_executor_ami_exh public: be_visitor_executor_ami_exh (be_visitor_context *ctx); - ~be_visitor_executor_ami_exh (void); + ~be_visitor_executor_ami_exh (); virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h index 481e06f9eda..f831e4d8169 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h @@ -29,7 +29,7 @@ class be_visitor_executor_ami_exs public: be_visitor_executor_ami_exs (be_visitor_context *ctx); - ~be_visitor_executor_ami_exs (void); + ~be_visitor_executor_ami_exs (); virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h index 94b8e8a0dd0..67445f55335 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h @@ -28,7 +28,7 @@ class be_visitor_facet_ami_exh public: be_visitor_facet_ami_exh (be_visitor_context *ctx); - ~be_visitor_facet_ami_exh (void); + ~be_visitor_facet_ami_exh (); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); @@ -49,8 +49,8 @@ protected: bool sync_; private: - int gen_reply_handler_class (void); - int gen_facet_executor_class (void); + int gen_reply_handler_class (); + int gen_facet_executor_class (); }; //============================================================== diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h index cf98aa0efcd..d102e3ed6ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h @@ -28,7 +28,7 @@ class be_visitor_facet_ami_exs public: be_visitor_facet_ami_exs (be_visitor_context *ctx); - ~be_visitor_facet_ami_exs (void); + ~be_visitor_facet_ami_exs (); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); @@ -39,9 +39,9 @@ public: virtual int post_process (be_decl *node); private: - void init (void); - int gen_reply_handler_class (void); - int gen_facet_executor_class (void); + void init (); + int gen_reply_handler_class (); + int gen_facet_executor_class (); int gen_reply_hander_op (be_operation *node); int gen_facet_executor_op (be_operation *node); int gen_facet_executor_sync_op (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h index f5575874d3a..49dab12db86 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h @@ -28,7 +28,7 @@ public: be_visitor_constant_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_constant_ch (void); + ~be_visitor_constant_ch (); /// visit constant. virtual int visit_constant (be_constant *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h index 342286a8510..4979beab82e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h @@ -28,7 +28,7 @@ public: be_visitor_constant_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_constant_cs (void); + ~be_visitor_constant_cs (); /// visit constant virtual int visit_constant (be_constant *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 0951b14fbda..4fe7d901355 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -40,13 +40,13 @@ class be_visitor_context : public ast_visitor_context { public: /// default constructor - be_visitor_context (void); + be_visitor_context (); /// default constructor be_visitor_context (const be_visitor_context &ctx); /// destructor - ~be_visitor_context (void); + ~be_visitor_context (); /// assignment operator be_visitor_context &operator= (const be_visitor_context &ctx); @@ -54,67 +54,67 @@ public: // =helpers /// reset the context - void reset (void); + void reset (); /// set the output stream void stream (TAO_OutStream *os); /// get the stream - TAO_OutStream *stream (void); + TAO_OutStream *stream (); /// set the scope void scope (be_scope *scope); /// get the scope in which code will be generated - be_scope *scope (void); + be_scope *scope (); /// current node being visited void node (be_decl *node); /// node being visited - be_decl *node (void); + be_decl *node (); /// code generation state void state (TAO_CodeGen::CG_STATE); /// return the code generation state - TAO_CodeGen::CG_STATE state (void); + TAO_CodeGen::CG_STATE state (); /// code generation state void sub_state (TAO_CodeGen::CG_SUB_STATE); /// return the code generation state - TAO_CodeGen::CG_SUB_STATE sub_state (void); + TAO_CodeGen::CG_SUB_STATE sub_state (); /// set the alias node (if any) void alias (be_typedef *node); /// return the aliased node (if any) - be_typedef *alias (void); + be_typedef *alias (); /// set the typedef node (if any) void tdef (be_typedef *node); /// return the typedef node (if any) - be_typedef *tdef (void); + be_typedef *tdef (); /// set the attribute node if any void attribute (be_attribute *attr); /// get the attribute node - be_attribute *attribute (void); + be_attribute *attribute (); /// is it the special ctor for exceptions? void exception (bool); /// is it the special ctor for exceptions? - bool exception (void); + bool exception (); /// scope supoorts generation of comma after each element void comma (bool); /// are we supposed to generate a comma? - bool comma (void); + bool comma (); /** * In some cases we need to generate the objects of one interface as @@ -123,17 +123,17 @@ public: * *generating* code, as opposed to the interfaces where the methods * or structures are defined. */ - be_interface *interface (void) const; + be_interface *interface () const; void interface (be_interface *); /// Accessor for the member. - ACE_CString &port_prefix (void); + ACE_CString &port_prefix (); /// return the export macro currently in force - const char *export_macro (void) const; + const char *export_macro () const; /// if anyop export macro is empty, check stub. - const char *non_null_export_macro (void) const; + const char *non_null_export_macro () const; private: /// code generation state diff --git a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h index ca41373b041..03184b0fb39 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h @@ -29,7 +29,7 @@ class be_visitor_dds_ts_idl : public be_visitor_scope public: be_visitor_dds_ts_idl (be_visitor_context *ctx); - ~be_visitor_dds_ts_idl (void); + ~be_visitor_dds_ts_idl (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -46,8 +46,8 @@ private: void gen_datareader (be_type *node); /// Manage streams and files. - int init_file (void); - void fini_file (void); + int init_file (); + void fini_file (); private: TAO_OutStream *os_ptr_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h index 266e0376fae..cde8ecb37ef 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h @@ -29,9 +29,9 @@ class be_visitor_decl : public be_visitor public: be_visitor_decl (be_visitor_context *ctx); - ~be_visitor_decl (void); + ~be_visitor_decl (); - be_visitor_context *ctx (void); + be_visitor_context *ctx (); protected: /// Any context information required by the visitor. diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h index 610382298d1..a5d46ffa8a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_enum_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_any_op_ch (void); + ~be_visitor_enum_any_op_ch (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h index 7f813cbfb5b..4fd3d8f6e4b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_enum_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_any_op_cs (void); + ~be_visitor_enum_any_op_cs (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h index bc2240a1b91..07e4f1b9609 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_enum_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_cdr_op_ch (void); + ~be_visitor_enum_cdr_op_ch (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h index adcba1de635..c7a39686789 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_enum_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_cdr_op_cs (void); + ~be_visitor_enum_cdr_op_cs (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h index e353754e3d1..c1514b5f712 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h @@ -28,7 +28,7 @@ public: be_visitor_enum_ch (be_visitor_context *ctx); /// deenumor - ~be_visitor_enum_ch (void); + ~be_visitor_enum_ch (); /// visit enum. virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h index d77ed23332b..dcb06a90627 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h @@ -28,7 +28,7 @@ public: be_visitor_enum_cs (be_visitor_context *ctx); /// deenumor - ~be_visitor_enum_cs (void); + ~be_visitor_enum_cs (); /// visit enum and generate the typecode virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h index 262455138f7..e49da61f6f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h @@ -27,7 +27,7 @@ class be_visitor_exception_any_op_ch : public be_visitor_scope public: be_visitor_exception_any_op_ch (be_visitor_context *ctx); - ~be_visitor_exception_any_op_ch (void); + ~be_visitor_exception_any_op_ch (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h index d188a3115e5..4a252adef3d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h @@ -27,7 +27,7 @@ class be_visitor_exception_any_op_cs : public be_visitor_scope public: be_visitor_exception_any_op_cs (be_visitor_context *ctx); - ~be_visitor_exception_any_op_cs (void); + ~be_visitor_exception_any_op_cs (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h index d8b357042af..462beb7214b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h @@ -28,7 +28,7 @@ class be_visitor_exception_cdr_op_ch : public be_visitor_exception public: be_visitor_exception_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_exception_cdr_op_ch (void); + ~be_visitor_exception_cdr_op_ch (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h index b579bf99e2d..ed86886f347 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h @@ -28,7 +28,7 @@ class be_visitor_exception_cdr_op_cs : public be_visitor_exception public: be_visitor_exception_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_exception_cdr_op_cs (void); + ~be_visitor_exception_cdr_op_cs (); virtual int visit_exception (be_exception *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h index ea9600d63d0..e7f10cd0346 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h @@ -24,7 +24,7 @@ class be_visitor_exception_ctor : public be_visitor_scope { public: be_visitor_exception_ctor (be_visitor_context *ctx); - ~be_visitor_exception_ctor (void); + ~be_visitor_exception_ctor (); virtual int post_process (be_decl *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h index 53c633473d6..17e7f4914a4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h @@ -24,7 +24,7 @@ class be_visitor_exception_ctor_assign : public be_visitor_scope { public: be_visitor_exception_ctor_assign (be_visitor_context *ctx); - ~be_visitor_exception_ctor_assign (void); + ~be_visitor_exception_ctor_assign (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h index ee30eaa1aba..22c13ddfa7b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h @@ -25,7 +25,7 @@ class be_visitor_exception : public be_visitor_scope { public: be_visitor_exception (be_visitor_context *ctx); - ~be_visitor_exception (void); + ~be_visitor_exception (); virtual int visit_exception (be_exception *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h index 5bda48fbaec..063bb0a90ee 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h @@ -25,7 +25,7 @@ class be_visitor_exception_ch : public be_visitor_exception { public: be_visitor_exception_ch (be_visitor_context *ctx); - ~be_visitor_exception_ch (void); + ~be_visitor_exception_ch (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h index b73dfa93fff..a07e9017cd3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h @@ -25,7 +25,7 @@ class be_visitor_exception_ci : public be_visitor_exception { public: be_visitor_exception_ci (be_visitor_context *ctx); - ~be_visitor_exception_ci (void); + ~be_visitor_exception_ci (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h index 3bd79bb082f..97a5b221517 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h @@ -25,7 +25,7 @@ class be_visitor_exception_cs : public be_visitor_exception { public: be_visitor_exception_cs (be_visitor_context *ctx); - ~be_visitor_exception_cs (void); + ~be_visitor_exception_cs (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h index edcfb760650..04fb0dc86fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h @@ -25,7 +25,7 @@ class be_visitor_field_cdr_op_ch : public be_visitor_decl { public: be_visitor_field_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_field_cdr_op_ch (void); + ~be_visitor_field_cdr_op_ch (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h index 37a6ffd93eb..ee844d8c9dd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h @@ -24,7 +24,7 @@ class be_visitor_field_cdr_op_cs : public be_visitor_decl { public: be_visitor_field_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_field_cdr_op_cs (void); + ~be_visitor_field_cdr_op_cs (); /// visit the field node virtual int visit_field (be_field *node); @@ -52,7 +52,7 @@ public: virtual int visit_union_fwd (be_union_fwd *node); private: - int emit_valuetype_common (void); + int emit_valuetype_common (); }; /** diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h index 3078353f8a9..2145b282203 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h @@ -24,7 +24,7 @@ class be_visitor_field_ch : public be_visitor_decl { public: be_visitor_field_ch (be_visitor_context *ctx); - ~be_visitor_field_ch (void); + ~be_visitor_field_ch (); virtual int visit_field (be_field *node); virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h index a32d5d3b165..dd22e9f1682 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h @@ -25,7 +25,7 @@ class be_visitor_field_ci : public be_visitor_decl { public: be_visitor_field_ci (be_visitor_context *ctx); - ~be_visitor_field_ci (void); + ~be_visitor_field_ci (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h index 4c3768040dd..533b0a28dcd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h @@ -25,7 +25,7 @@ class be_visitor_field_cs : public be_visitor_decl { public: be_visitor_field_cs (be_visitor_context *ctx); - ~be_visitor_field_cs (void); + ~be_visitor_field_cs (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h index 67793591bf4..cf49e324489 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h @@ -27,7 +27,7 @@ class be_visitor_home_ex_idl : public be_visitor_scope public: be_visitor_home_ex_idl (be_visitor_context *ctx); - ~be_visitor_home_ex_idl (void); + ~be_visitor_home_ex_idl (); virtual int visit_home (be_home *node); @@ -42,24 +42,24 @@ public: virtual int visit_string (be_string *node); private: - void gen_implicit (void); - void gen_explicit (void); - void gen_derived (void); + void gen_implicit (); + void gen_explicit (); + void gen_derived (); - void gen_supported (void); + void gen_supported (); void gen_exception_list (UTL_ExceptList *exceptions, const char *prefix = "", bool init_op = false); - void gen_home_executor (void); + void gen_home_executor (); /// The CCM preproc visitor changed the scoped name and the /// defined_in() for the home's members to the implied /// *Explicit interface, which isn't a problem unless /// they include exceptions raised by a contained operation. /// factory or finder. So we restore the members just in case. - void restore_scope (void); + void restore_scope (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h index e5d1f190b25..4ac2060e25f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h @@ -27,7 +27,7 @@ class be_visitor_home_exh : public be_visitor_scope public: be_visitor_home_exh (be_visitor_context *ctx); - ~be_visitor_home_exh (void); + ~be_visitor_home_exh (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -41,9 +41,9 @@ public: TAO_OutStream *); private: - int gen_exec_class (void); + int gen_exec_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h index 5dd74ec96e7..a5bc812e282 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h @@ -27,7 +27,7 @@ class be_visitor_home_exs : public be_visitor_scope public: be_visitor_home_exs (be_visitor_context *ctx); - ~be_visitor_home_exs (void); + ~be_visitor_home_exs (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -35,9 +35,9 @@ public: virtual int visit_factory (be_factory *node); private: - int gen_exec_class (void); + int gen_exec_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h index 2bedc2de3bc..4feaa55bdc1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h @@ -26,7 +26,7 @@ class be_visitor_home_svh : public be_visitor_scope public: be_visitor_home_svh (be_visitor_context *ctx); - ~be_visitor_home_svh (void); + ~be_visitor_home_svh (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -35,9 +35,9 @@ public: virtual int visit_finder (be_finder *node); private: - int gen_servant_class (void); + int gen_servant_class (); - void gen_entrypoint (void); + void gen_entrypoint (); /// Helper method passed to traverse_inheritance_graph(), /// collects supported operations and attributes. diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h index 8709485991d..8da752963f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h @@ -26,7 +26,7 @@ class be_visitor_home_svs : public be_visitor_scope public: be_visitor_home_svs (be_visitor_context *ctx); - ~be_visitor_home_svs (void); + ~be_visitor_home_svs (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -36,9 +36,9 @@ public: virtual int visit_finder (be_finder *node); private: - int gen_servant_class (void); + int gen_servant_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; @@ -69,7 +69,7 @@ class be_visitor_home_attr_set : public be_visitor_decl public: be_visitor_home_attr_set (be_visitor_context *ctx); - ~be_visitor_home_attr_set (void); + ~be_visitor_home_attr_set (); virtual int visit_home (be_home *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h index 3571db50638..6fbaa310ad3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h @@ -30,7 +30,7 @@ public: be_visitor_amh_interface_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_amh_interface_ch (void); + ~be_visitor_amh_interface_ch (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h index 49a7b0b011a..f0b65056463 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h @@ -15,11 +15,11 @@ class be_visitor_amh_rh_interface_sh : public be_visitor_interface_sh { public: - be_visitor_amh_rh_interface_sh (void); + be_visitor_amh_rh_interface_sh (); be_visitor_amh_rh_interface_sh (be_visitor_context *ctx); - ~be_visitor_amh_rh_interface_sh (void); + ~be_visitor_amh_rh_interface_sh (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h index efb6bfe1e69..bdb2fe50e54 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h @@ -22,7 +22,7 @@ public: int visit_operation (be_operation *node); - ~be_visitor_amh_rh_interface_ss (void); + ~be_visitor_amh_rh_interface_ss (); }; #endif /* AMH_RH_INTERFACE_SS_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h index 733c8f1de0d..9af9fd2202c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h @@ -15,7 +15,7 @@ class be_visitor_amh_interface_sh : public be_visitor_interface_sh { public: be_visitor_amh_interface_sh (be_visitor_context *ctx); - ~be_visitor_amh_interface_sh (void); + ~be_visitor_amh_interface_sh (); int visit_interface (be_interface *node); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h index 238db0bb5b6..c0b9beac332 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h @@ -23,7 +23,7 @@ public: int visit_operation (be_operation *node); int visit_attribute (be_attribute *node); - ~be_visitor_amh_interface_ss (void); + ~be_visitor_amh_interface_ss (); protected: virtual void this_method (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h index db2bb9bde6e..a7a2d9fe2c5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_conn_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_conn_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_conn_ex_idl (void); + ~be_visitor_ami4ccm_conn_ex_idl (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h index c3a7693c802..636e9e73e88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_rh_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_rh_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_rh_ex_idl (void); + ~be_visitor_ami4ccm_rh_ex_idl (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h index ccc9102d7a2..b26192722ba 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_sendc_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_sendc_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_sendc_ex_idl (void); + ~be_visitor_ami4ccm_sendc_ex_idl (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h index cf1eee4b14a..14423fd2e60 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h @@ -26,7 +26,7 @@ class be_visitor_interface_any_op_ch : public be_visitor_interface public: be_visitor_interface_any_op_ch (be_visitor_context *ctx); - ~be_visitor_interface_any_op_ch (void); + ~be_visitor_interface_any_op_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h index 7409ce3a65d..47ba221489f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h @@ -26,7 +26,7 @@ class be_visitor_interface_any_op_cs : public be_visitor_interface public: be_visitor_interface_any_op_cs (be_visitor_context *ctx); - ~be_visitor_interface_any_op_cs (void); + ~be_visitor_interface_any_op_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h index 00a49c87100..478b6d191f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h @@ -28,7 +28,7 @@ class be_visitor_interface_cdr_op_ch : public be_visitor_interface public: be_visitor_interface_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_interface_cdr_op_ch (void); + ~be_visitor_interface_cdr_op_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h index e95dd50c04a..79f212abee7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h @@ -28,7 +28,7 @@ class be_visitor_interface_cdr_op_cs : public be_visitor_interface public: be_visitor_interface_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_interface_cdr_op_cs (void); + ~be_visitor_interface_cdr_op_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h index 6f8ab960b6b..1b10d9ab9d4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h @@ -27,7 +27,7 @@ public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx); - virtual ~be_visitor_interface_direct_proxy_impl_sh (void); + virtual ~be_visitor_interface_direct_proxy_impl_sh (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h index 1d298c1a2e5..cf818e8a44b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h @@ -26,7 +26,7 @@ public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx); - virtual ~be_visitor_interface_direct_proxy_impl_ss (void); + virtual ~be_visitor_interface_direct_proxy_impl_ss (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h index 679951ebead..b3f0d0ae183 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h @@ -27,7 +27,7 @@ class be_visitor_facet_svth : public be_visitor_interface public: be_visitor_facet_svth (be_visitor_context *ctx); - ~be_visitor_facet_svth (void); + ~be_visitor_facet_svth (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h index 7e8f26614d6..4fe718c369c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h @@ -27,7 +27,7 @@ class be_visitor_facet_svts : public be_visitor_interface public: be_visitor_facet_svts (be_visitor_context *ctx); - ~be_visitor_facet_svts (void); + ~be_visitor_facet_svts (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h index 86e324fd121..00587d6fd9a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h @@ -45,7 +45,7 @@ class be_visitor_interface : public be_visitor_scope { public: be_visitor_interface (be_visitor_context *ctx); - ~be_visitor_interface (void); + ~be_visitor_interface (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h index 8a6b8323cea..a6d0bf77c9d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h @@ -27,7 +27,7 @@ class be_visitor_interface_ch : public be_visitor_interface { public: be_visitor_interface_ch (be_visitor_context *ctx); - ~be_visitor_interface_ch (void); + ~be_visitor_interface_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h index 41b274c36ce..375a538c424 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h @@ -24,7 +24,7 @@ class be_visitor_interface_ci : public be_visitor_interface { public: be_visitor_interface_ci (be_visitor_context *ctx); - ~be_visitor_interface_ci (void); + ~be_visitor_interface_ci (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h index b3830240020..c78de386e5e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h @@ -24,7 +24,7 @@ class be_visitor_interface_cs : public be_visitor_interface { public: be_visitor_interface_cs (be_visitor_context *ctx); - ~be_visitor_interface_cs (void); + ~be_visitor_interface_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h index 6f6983ae890..b72b4f957d2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h @@ -28,7 +28,7 @@ class be_visitor_interface_ex_idl : public be_visitor_interface public: be_visitor_interface_ex_idl (be_visitor_context *ctx); - ~be_visitor_interface_ex_idl (void); + ~be_visitor_interface_ex_idl (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h index d88faa13f2e..8b861ab6198 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h @@ -29,7 +29,7 @@ public: be_visitor_interface_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_ih (void); + ~be_visitor_interface_ih (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h index d4a54bd4945..85d6e612542 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h @@ -28,7 +28,7 @@ public: be_visitor_interface_is (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_is (void); + ~be_visitor_interface_is (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h index 9cded98fca5..2ef902215e7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h @@ -24,7 +24,7 @@ class be_visitor_interface_sh : public be_visitor_interface { public: be_visitor_interface_sh (be_visitor_context *ctx); - ~be_visitor_interface_sh (void); + ~be_visitor_interface_sh (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h index a859d496e89..d5caf5496ff 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h @@ -27,7 +27,7 @@ class be_visitor_interface_ss : public be_visitor_interface { public: be_visitor_interface_ss (be_visitor_context *ctx); - ~be_visitor_interface_ss (void); + ~be_visitor_interface_ss (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h index 28e95dc4ca6..b62e1ebd3d4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h @@ -28,7 +28,7 @@ class be_visitor_interface_svth : public be_visitor_interface public: be_visitor_interface_svth (be_visitor_context *ctx); - ~be_visitor_interface_svth (void); + ~be_visitor_interface_svth (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h index d4dd4ea012c..16a5d734390 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h @@ -28,7 +28,7 @@ class be_visitor_interface_svts : public be_visitor_interface public: be_visitor_interface_svts (be_visitor_context *ctx); - ~be_visitor_interface_svts (void); + ~be_visitor_interface_svts (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h index f5f553ba0d4..dd15ff9eb80 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h @@ -28,7 +28,7 @@ public: be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_interface_smart_proxy_ch (void); + virtual ~be_visitor_interface_smart_proxy_ch (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h index 61ee835793d..d407b35f477 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h @@ -27,7 +27,7 @@ public: be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_interface_smart_proxy_cs (void); + virtual ~be_visitor_interface_smart_proxy_cs (); /// visit interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h index a9e1162a554..159874fa2c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h @@ -28,7 +28,7 @@ public: be_visitor_interface_tie_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_tie_sh (void); + ~be_visitor_interface_tie_sh (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h index 40c11251da1..f5055a655d6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h @@ -29,7 +29,7 @@ public: be_visitor_interface_tie_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_tie_ss (void); + ~be_visitor_interface_tie_ss (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h index a0f374c208e..65986f49535 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_any_op_ch (void); + ~be_visitor_interface_fwd_any_op_ch (); /// visit interface_fwd virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h index eda0f278a6a..950f3d6914e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_cdr_op_ch (void); + ~be_visitor_interface_fwd_cdr_op_ch (); /// visit forward declared interface virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h index f40ecff308d..33aff8865c0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_interface_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_ch (void); + ~be_visitor_interface_fwd_ch (); /// visit interface_fwd. virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h index 12835445a5a..45b2ea985fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h @@ -28,7 +28,7 @@ class be_visitor_member_type_decl : public be_visitor_decl { public: be_visitor_member_type_decl (be_visitor_context *ctx); - virtual ~be_visitor_member_type_decl (void); + virtual ~be_visitor_member_type_decl (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h index 1ed876190fc..e18ae92a0f8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h @@ -32,7 +32,7 @@ public: be_visitor_module_any_op (be_visitor_context *ctx); /// destructor - ~be_visitor_module_any_op (void); + ~be_visitor_module_any_op (); /// visit module virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h index 31913a72908..c78e389a3b2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h @@ -32,7 +32,7 @@ public: be_visitor_module_cdr_op (be_visitor_context *ctx); /// destructor - ~be_visitor_module_cdr_op (void); + ~be_visitor_module_cdr_op (); /// visit module virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h index edaebc17183..64c12a08c6d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h @@ -28,7 +28,7 @@ class be_visitor_module : public be_visitor_scope public: be_visitor_module (be_visitor_context *ctx); - ~be_visitor_module (void); + ~be_visitor_module (); virtual int visit_constant (be_constant *node); virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h index 74e4ed0243f..8fca169d567 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h @@ -29,7 +29,7 @@ public: be_visitor_module_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_module_ch (void); + ~be_visitor_module_ch (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h index e6ce39f1690..afa981dab01 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h @@ -30,7 +30,7 @@ public: be_visitor_module_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_module_ih (void); + ~be_visitor_module_ih (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h index d6fa27007f7..1598f322820 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h @@ -29,7 +29,7 @@ public: be_visitor_module_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_module_sh (void); + ~be_visitor_module_sh (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h index 9dd04c79fd0..3e2e37c3562 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h @@ -28,7 +28,7 @@ public: be_visitor_native_ch (be_visitor_context *ctx); /// deenumor - ~be_visitor_native_ch (void); + ~be_visitor_native_ch (); /// visit native. virtual int visit_native (be_native *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h index cdc71d47ccc..bc8322ceea4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h +++ b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h @@ -30,7 +30,7 @@ class be_visitor_null_return_value : public be_visitor_decl { public: be_visitor_null_return_value (be_visitor_context *ctx); - virtual ~be_visitor_null_return_value (void); + virtual ~be_visitor_null_return_value (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h index 8c6cd8d2999..a3bb7bd730d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h @@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation public: be_visitor_amh_rh_operation_sh (be_visitor_context *ctx); - ~be_visitor_amh_rh_operation_sh (void); + ~be_visitor_amh_rh_operation_sh (); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h index 1beb3814d9d..059e5ca2f3b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h @@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_ss : public be_visitor_operation public: be_visitor_amh_rh_operation_ss (be_visitor_context *ctx); - ~be_visitor_amh_rh_operation_ss (void); + ~be_visitor_amh_rh_operation_ss (); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h index 31a72611e45..966574ab1f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h @@ -21,7 +21,7 @@ class be_visitor_amh_operation_sh : public be_visitor_operation { public: be_visitor_amh_operation_sh (be_visitor_context *ctx); - ~be_visitor_amh_operation_sh (void); + ~be_visitor_amh_operation_sh (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h index 82024d5b74f..fa8dc6b614d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h @@ -22,7 +22,7 @@ class be_visitor_amh_operation_ss : public be_visitor_operation public: be_visitor_amh_operation_ss (be_visitor_context *ctx); - ~be_visitor_amh_operation_ss (void); + ~be_visitor_amh_operation_ss (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h index bc30ee7fce3..64a1b557ce5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ami_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ami_cs (void); + ~be_visitor_operation_ami_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h index 9f598031e3e..b222f25eec9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_ami_handler_reply_stub_operation_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ami_handler_reply_stub_operation_cs (void); + ~be_visitor_operation_ami_handler_reply_stub_operation_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h index ef1721f9765..a95c034822a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h @@ -30,7 +30,7 @@ class be_visitor_operation_arglist : public be_visitor_operation public: be_visitor_operation_arglist (be_visitor_context *ctx); - ~be_visitor_operation_arglist (void); + ~be_visitor_operation_arglist (); virtual int visit_operation (be_operation *node); virtual int visit_factory (be_factory *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h index ea31a1aaf4e..6ddf98cfad4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h @@ -33,7 +33,7 @@ public: be_visitor_operation_argument (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument (void); + ~be_visitor_operation_argument (); /// stuff to o/p after each element of the scope is handled virtual int post_process (be_decl *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h index 4828c66a4b1..46c5f0334d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h @@ -35,7 +35,7 @@ public: be_visitor_operation_argument_invoke (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument_invoke (void); + ~be_visitor_operation_argument_invoke (); /// stuff to o/p before each element of the scope is handled virtual int pre_process (be_decl *bd); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h index 7e26cff6ce6..b0441621613 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h @@ -31,7 +31,7 @@ public: be_visitor_operation_argument_marshal (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument_marshal (void); + ~be_visitor_operation_argument_marshal (); /// stuff to o/p before each element of the scope is handled virtual int pre_process (be_decl *bd); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h index ce17f859cc0..8a4a37e743b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h @@ -28,7 +28,7 @@ public: be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_direct_proxy_impl_ss (void); + ~be_visitor_operation_direct_proxy_impl_ss (); /// visit operation node. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h index c2f52642839..c2ef44f481f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_exceptlist_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_exceptlist_cs (void); + ~be_visitor_operation_exceptlist_cs (); /// visit the operation int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h index 5052fd237f3..09a5a3eeb52 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h @@ -36,7 +36,7 @@ public: be_visitor_operation_exceptlist_ss (be_visitor_context * ctx); /// destructor - ~be_visitor_operation_exceptlist_ss (void); + ~be_visitor_operation_exceptlist_ss (); /// visit the operation int visit_operation (be_operation * node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h index a69ca530064..b41e2adfe36 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h @@ -32,7 +32,7 @@ public: be_visitor_operation (be_visitor_context *ctx); /// destructor - ~be_visitor_operation (void); + ~be_visitor_operation (); // =helper diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h index 3fd32942e60..79620cd71b6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ch (void); + ~be_visitor_operation_ch (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h index 67fb65ef842..843fc3c11b4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h @@ -31,7 +31,7 @@ public: be_visitor_operation_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_cs (void); + ~be_visitor_operation_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h index 1a6e95c51bb..8d89781c20d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h @@ -30,7 +30,7 @@ class be_visitor_operation_exs : public be_visitor_scope public: be_visitor_operation_exs (be_visitor_context *ctx); - ~be_visitor_operation_exs (void); + ~be_visitor_operation_exs (); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h index 752a4fd774a..11b4cd84301 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ih (void); + ~be_visitor_operation_ih (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h index 870fcd1bb81..b03de3f23b4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h @@ -31,7 +31,7 @@ public: be_visitor_operation_is (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_is (void); + ~be_visitor_operation_is (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h index 7841f3a9066..2a081ad3c90 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h @@ -31,7 +31,7 @@ public: be_visitor_operation_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_sh (void); + ~be_visitor_operation_sh (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h index e12a2a59669..80b971a25d0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h @@ -32,7 +32,7 @@ public: be_visitor_operation_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ss (void); + ~be_visitor_operation_ss (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h index 391bcfdf7d2..f739aaa5cc5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h @@ -31,7 +31,7 @@ class be_visitor_operation_svs : public be_visitor_scope public: be_visitor_operation_svs (be_visitor_context *ctx); - ~be_visitor_operation_svs (void); + ~be_visitor_operation_svs (); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h index fd0555d206d..4c64e341371 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h @@ -28,7 +28,7 @@ public: be_visitor_operation_proxy_impl_xh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_proxy_impl_xh (void); + ~be_visitor_operation_proxy_impl_xh (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h index 92138e2f332..e63c7c48cea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h @@ -32,7 +32,7 @@ public: be_visitor_operation_rettype (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_rettype (void); + ~be_visitor_operation_rettype (); /// visit an array node int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h index 9462881b33c..25f367e66cb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_rettype_return_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_rettype_return_cs (void); + ~be_visitor_operation_rettype_return_cs (); /// visit an array node int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h index 7111c0d3a56..5967764955f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h @@ -33,7 +33,7 @@ public: be_visitor_operation_smart_proxy_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_smart_proxy_ch (void); + ~be_visitor_operation_smart_proxy_ch (); /// visit operation node. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h index ae9032ad443..040bd528088 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h @@ -30,7 +30,7 @@ public: be_visitor_operation_smart_proxy_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_smart_proxy_cs (void); + ~be_visitor_operation_smart_proxy_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h index a843454511b..d850c05d9eb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h @@ -32,7 +32,7 @@ public: be_visitor_operation_tie_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_tie_sh (void); + ~be_visitor_operation_tie_sh (); /// set the right context and make a visitor virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h index ad8831d311e..21c8b5e315d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h @@ -31,7 +31,7 @@ public: be_visitor_operation_tie_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_tie_ss (void); + ~be_visitor_operation_tie_ss (); /// set the right context and make a visitor virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h index 10d6e7306ae..b35c5df1a10 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h @@ -23,7 +23,7 @@ public: be_visitor_operation_upcall_command_ss (be_visitor_context * ctx); /// destructor - ~be_visitor_operation_upcall_command_ss (void); + ~be_visitor_operation_upcall_command_ss (); /// Same as visit_operation() but override full_skel_name and /// upcall_command_name. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h index 31647f6923a..1012aec6909 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h @@ -28,7 +28,7 @@ class be_visitor_root_any_op : public be_visitor_root public: be_visitor_root_any_op (be_visitor_context *ctx); - ~be_visitor_root_any_op (void); + ~be_visitor_root_any_op (); virtual int visit_root (be_root *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h index 7dc9c68f544..646d97abc3f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h @@ -28,7 +28,7 @@ class be_visitor_root_cdr_op : public be_visitor_root public: be_visitor_root_cdr_op (be_visitor_context *ctx); - ~be_visitor_root_cdr_op (void); + ~be_visitor_root_cdr_op (); virtual int visit_root (be_root *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h index cee348218ef..3322d73e1e3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h @@ -27,7 +27,7 @@ class be_visitor_root : public be_visitor_module public: be_visitor_root (be_visitor_context *ctx); - ~be_visitor_root (void); + ~be_visitor_root (); /// This is the only method that differs from that of the /// be_visitor_module bass class. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h index 501646291bc..3cf7f0ee1de 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h @@ -28,21 +28,21 @@ class be_visitor_root_ch : public be_visitor_root public: be_visitor_root_ch (be_visitor_context *ctx); - ~be_visitor_root_ch (void); + ~be_visitor_root_ch (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Encapsulating various bits of code generation peculiar /// to the client header file, done either before or after /// the main scope traversal. int gen_arg_traits (be_root *node); - void gen_fwd_decls (void); - void gen_ref_counting_overrides (void); - void gen_static_corba_overrides (void); + void gen_fwd_decls (); + void gen_ref_counting_overrides (); + void gen_static_corba_overrides (); int gen_obv_decls (be_root *node); int gen_object_traits (be_root *node); int gen_template_exports (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h index d27a02b264c..7522d4f48a2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h @@ -28,13 +28,13 @@ class be_visitor_root_ci : public be_visitor_root public: be_visitor_root_ci (be_visitor_context *ctx); - ~be_visitor_root_ci (void); + ~be_visitor_root_ci (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Generate OBV definitions in the client inline /// file, done after the main scope traversal. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h index e3934f27152..0861de99d08 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h @@ -28,13 +28,13 @@ class be_visitor_root_cnh : public be_visitor_root public: be_visitor_root_cnh (be_visitor_context *ctx); - ~be_visitor_root_cnh (void); + ~be_visitor_root_cnh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_CNH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h index aba97d8ca8d..0624821cd89 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h @@ -28,12 +28,12 @@ class be_visitor_root_cns : public be_visitor_root public: be_visitor_root_cns (be_visitor_context *ctx); - ~be_visitor_root_cns (void); + ~be_visitor_root_cns (); virtual int visit_root (be_root *node); /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_CNS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h index 7b1d425ab19..46d255a924e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h @@ -28,13 +28,13 @@ class be_visitor_root_cs : public be_visitor_root public: be_visitor_root_cs (be_visitor_context *ctx); - ~be_visitor_root_cs (void); + ~be_visitor_root_cs (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Encapsulating various bits of code generation peculiar /// to the client source file, done either before or after diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h index 9f48060c23b..854795b07df 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h @@ -28,13 +28,13 @@ class be_visitor_root_ex_idl : public be_visitor_root public: be_visitor_root_ex_idl (be_visitor_context *ctx); - ~be_visitor_root_ex_idl (void); + ~be_visitor_root_ex_idl (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EX_IDL_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h index f265526a375..c2fb5fcf70e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h @@ -28,13 +28,13 @@ class be_visitor_root_exh : public be_visitor_root public: be_visitor_root_exh (be_visitor_context *ctx); - ~be_visitor_root_exh (void); + ~be_visitor_root_exh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EXH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h index 10a24929673..4172a031627 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h @@ -28,13 +28,13 @@ class be_visitor_root_exs : public be_visitor_root public: be_visitor_root_exs (be_visitor_context *ctx); - ~be_visitor_root_exs (void); + ~be_visitor_root_exs (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h index 7af2ca6939f..d8a37fa55bb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h @@ -26,13 +26,13 @@ class be_visitor_root_ih : public be_visitor_root public: be_visitor_root_ih (be_visitor_context *ctx); - ~be_visitor_root_ih (void); + ~be_visitor_root_ih (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_IH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h index 1228c06cea4..c41805268fc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h @@ -26,13 +26,13 @@ class be_visitor_root_is : public be_visitor_root public: be_visitor_root_is (be_visitor_context *ctx); - ~be_visitor_root_is (void); + ~be_visitor_root_is (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_IS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h index eb69d3f11cb..db27baf64c1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h @@ -27,13 +27,13 @@ class be_visitor_root_sh : public be_visitor_root public: be_visitor_root_sh (be_visitor_context *ctx); - ~be_visitor_root_sh (void); + ~be_visitor_root_sh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Generate arg template trait specializations in /// the skeleton header file, done before the main diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h index f8ba08c106e..28d4c19288f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h @@ -27,13 +27,13 @@ class be_visitor_root_ss : public be_visitor_root public: be_visitor_root_ss (be_visitor_context *ctx); - ~be_visitor_root_ss (void); + ~be_visitor_root_ss (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h index 2884d9459e9..7b22bac8e50 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h @@ -28,7 +28,7 @@ class be_visitor_root_sth : public be_visitor_root public: be_visitor_root_sth (be_visitor_context *ctx); - ~be_visitor_root_sth (void); + ~be_visitor_root_sth (); virtual int visit_root (be_root *node); @@ -40,7 +40,7 @@ public: private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_STH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h index 8d1a21e2e96..1e56d0acec9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h @@ -28,13 +28,13 @@ class be_visitor_root_svh : public be_visitor_root public: be_visitor_root_svh (be_visitor_context *ctx); - ~be_visitor_root_svh (void); + ~be_visitor_root_svh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h index 6d8202b0c5d..d9baf73eded 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h @@ -28,13 +28,13 @@ class be_visitor_root_svs : public be_visitor_root public: be_visitor_root_svs (be_visitor_context *ctx); - ~be_visitor_root_svs (void); + ~be_visitor_root_svs (); virtual int visit_root (be_root *node); private: /// Set the right context and make a visitor. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h index 59abaf33ff5..9d557cb3c22 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h @@ -28,13 +28,13 @@ class be_visitor_root_svth : public be_visitor_root public: be_visitor_root_svth (be_visitor_context *ctx); - ~be_visitor_root_svth (void); + ~be_visitor_root_svth (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVTH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h index 4b669c2118e..9dd2151e95e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h @@ -28,13 +28,13 @@ class be_visitor_root_svts : public be_visitor_root public: be_visitor_root_svts (be_visitor_context *ctx); - ~be_visitor_root_svts (void); + ~be_visitor_root_svts (); virtual int visit_root (be_root *node); private: /// Set the right context and make a visitor. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVTS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h index 7c3b819b27b..2d6bce24001 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h @@ -31,7 +31,7 @@ public: be_visitor_scope (be_visitor_context *ctx); /// destructor - ~be_visitor_scope (void); + ~be_visitor_scope (); /// visit scope int visit_scope (be_scope *node); @@ -44,7 +44,7 @@ public: virtual int pre_process (be_decl *); /// return the element number that is being processed - virtual int elem_number (void); + virtual int elem_number (); /// get the successor to elem virtual int next_elem (be_decl *elem, be_decl *&); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h index 4cc76d38678..c1df47e39d3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_any_op_ch (void); + ~be_visitor_sequence_any_op_ch (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h index b96fa97cadb..916eaea173b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_any_op_cs (void); + ~be_visitor_sequence_any_op_cs (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h index 10249ffc920..e43be03ecb5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h @@ -31,7 +31,7 @@ public: be_visitor_sequence_buffer_type (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_buffer_type (void); + ~be_visitor_sequence_buffer_type (); // = Visitor methods. virtual int visit_predefined_type (be_predefined_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h index adec609812e..7d6ee5e5b29 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cdr_op_ch (void); + ~be_visitor_sequence_cdr_op_ch (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h index 261e6a92479..530d6f85398 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h @@ -34,7 +34,7 @@ public: be_visitor_sequence_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cdr_op_cs (void); + ~be_visitor_sequence_cdr_op_cs (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h index 3b6df9024ec..47313216b25 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h @@ -36,7 +36,7 @@ public: be_visitor_sequence_base (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_base (void); + ~be_visitor_sequence_base (); // = Visitor methods. virtual int visit_predefined_type (be_predefined_type *node); @@ -80,7 +80,7 @@ public: be_sequence *node ); ///Dtor - ~be_visitor_sequence_base_template_args (void); + ~be_visitor_sequence_base_template_args (); //= Visit methods virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h index 7c110967ce2..e4b106f3858 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h @@ -31,7 +31,7 @@ public: be_visitor_sequence_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_ch (void); + ~be_visitor_sequence_ch (); /// visit sequence node. virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h index c4b85929655..d6a6ba09009 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cs (void); + ~be_visitor_sequence_cs (); /// visit sequence node virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h index ee0e57fdd13..c7d3270ab32 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_structure_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_any_op_ch (void); + ~be_visitor_structure_any_op_ch (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h index 8a007981986..72d670410f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_structure_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_any_op_cs (void); + ~be_visitor_structure_any_op_cs (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h index 3b93c14968b..a5d002c62e4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_structure_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cdr_op_ch (void); + ~be_visitor_structure_cdr_op_ch (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h index 5b84cf62295..f307404d16a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_structure_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cdr_op_cs (void); + ~be_visitor_structure_cdr_op_cs (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h index 70054836d98..afc9cffa36e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h @@ -29,7 +29,7 @@ public: be_visitor_structure (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure (void); + ~be_visitor_structure (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h index 69f68c18def..bd08ad67e00 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h @@ -29,7 +29,7 @@ public: be_visitor_structure_ch (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure_ch (void); + ~be_visitor_structure_ch (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h index d3a9cd4e9b2..b31296115ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h @@ -29,7 +29,7 @@ public: be_visitor_structure_ci (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure_ci (void); + ~be_visitor_structure_ci (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h index 27238db835d..bc37fa3e55b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h @@ -29,7 +29,7 @@ public: be_visitor_structure_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cs (void); + ~be_visitor_structure_cs (); /// visit structure. virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h index c01c8b17417..8325735282f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h @@ -25,7 +25,7 @@ class be_visitor_structure_fwd_ch : public be_visitor_decl public: be_visitor_structure_fwd_ch (be_visitor_context *ctx); - ~be_visitor_structure_fwd_ch (void); + ~be_visitor_structure_fwd_ch (); virtual int visit_structure_fwd (be_structure_fwd *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h index 6283dcf7382..a77fdd98b12 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h +++ b/TAO/TAO_IDL/be_include/be_visitor_template_export.h @@ -34,7 +34,7 @@ class be_visitor_template_export : public be_visitor_scope public: be_visitor_template_export (be_visitor_context *ctx); - virtual ~be_visitor_template_export (void); + virtual ~be_visitor_template_export (); virtual int visit_root (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h index a5d1b3f4094..accc2411db1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h @@ -25,7 +25,7 @@ class be_visitor_traits : public be_visitor_scope public: be_visitor_traits (be_visitor_context *ctx); - virtual ~be_visitor_traits (void); + virtual ~be_visitor_traits (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h index a50ef718edf..6f6ae5b285b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h @@ -26,7 +26,7 @@ class be_visitor_typecode_decl : public be_visitor_decl public: be_visitor_typecode_decl (be_visitor_context *ctx); - ~be_visitor_typecode_decl (void); + ~be_visitor_typecode_decl (); /// visit a generic be_type node. virtual int visit_type (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index b2f551067ad..242f3b0c74e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -35,7 +35,7 @@ class be_visitor_typecode_defn : public be_visitor_scope { public: be_visitor_typecode_defn (be_visitor_context *ctx); - ~be_visitor_typecode_defn (void); + ~be_visitor_typecode_defn (); virtual int visit_array (be_array *node); virtual int visit_interface (be_interface *node); @@ -95,8 +95,8 @@ protected: * Utility methods to generate enclosing namespaces for * typecodes of bounded (w)strings, sequences and arrays. */ - void gen_begin_NS_for_anon (void); - void gen_end_NS_for_anon (void); + void gen_begin_NS_for_anon (); + void gen_end_NS_for_anon (); protected: diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h index d56e828a938..b56dc448931 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h @@ -33,7 +33,7 @@ public: be_visitor_typedef_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_any_op_ch (void); + ~be_visitor_typedef_any_op_ch (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h index b9893f50635..aa4b7381f82 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h @@ -33,7 +33,7 @@ public: be_visitor_typedef_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_any_op_cs (void); + ~be_visitor_typedef_any_op_cs (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h index 08db072de62..087b3da6db2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cdr_op_ch (void); + ~be_visitor_typedef_cdr_op_ch (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h index 1c782481af2..10fc1214464 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cdr_op_cs (void); + ~be_visitor_typedef_cdr_op_cs (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h index 2de5434f6c0..d287c2a4061 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h @@ -30,7 +30,7 @@ public: be_visitor_typedef (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef (void); + ~be_visitor_typedef (); /// must be overridden virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h index ad27eb3dd52..8e88c8a599c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_ch (void); + ~be_visitor_typedef_ch (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h index 849f1ba2cbe..4580a68e7a0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_ci (void); + ~be_visitor_typedef_ci (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h index ae814c4ff69..83afa8278fd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cs (void); + ~be_visitor_typedef_cs (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h index ff66c35eb52..3426539cbde 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h @@ -30,7 +30,7 @@ class be_visitor_union_any_op_ch : public be_visitor_union public: be_visitor_union_any_op_ch (be_visitor_context *ctx); - ~be_visitor_union_any_op_ch (void); + ~be_visitor_union_any_op_ch (); virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h index 7c8bd1f0757..c8983f61874 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h @@ -30,7 +30,7 @@ class be_visitor_union_any_op_cs : public be_visitor_union public: be_visitor_union_any_op_cs (be_visitor_context *ctx); - ~be_visitor_union_any_op_cs (void); + ~be_visitor_union_any_op_cs (); virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h index f3a4c952259..1ce2eca9e79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_union_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cdr_op_ch (void); + ~be_visitor_union_cdr_op_ch (); /// visit union virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h index 9ce9d00c75e..ecfbe0ef1a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_union_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cdr_op_cs (void); + ~be_visitor_union_cdr_op_cs (); /// visit union virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h index 26a1c20e3ac..4264f931d36 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_ch (void); + ~be_visitor_union_discriminant_ch (); /// visit an enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h index 4397b39bfa5..eeb7f291462 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_ci (void); + ~be_visitor_union_discriminant_ci (); /// visit an enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h index 3391c92ed24..037f3e95ada 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_cs (void); + ~be_visitor_union_discriminant_cs (); /// visit an enum. Required to generate the typecode for an enum definition /// appearing side the union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h index c854e6e2e73..390655bc5f3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h @@ -29,7 +29,7 @@ public: be_visitor_union (be_visitor_context *ctx); /// destructor - ~be_visitor_union (void); + ~be_visitor_union (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h index 13cb7108fb3..a70a7905448 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h @@ -29,7 +29,7 @@ public: be_visitor_union_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_ch (void); + ~be_visitor_union_ch (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h index 2ec0e177681..c94dda604c1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h @@ -29,7 +29,7 @@ public: be_visitor_union_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_union_ci (void); + ~be_visitor_union_ci (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h index 1ef3e1056dc..e7de0e48a79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h @@ -29,7 +29,7 @@ public: be_visitor_union_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cs (void); + ~be_visitor_union_cs (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h index cedb2782d5a..af566f93483 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h @@ -28,7 +28,7 @@ public: be_visitor_union_branch_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_branch_cdr_op_ch (void); + ~be_visitor_union_branch_cdr_op_ch (); /// visit the union_branch node virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h index 20aa8847d06..6834916b463 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h @@ -28,7 +28,7 @@ public: be_visitor_union_branch_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_branch_cdr_op_cs (void); + ~be_visitor_union_branch_cdr_op_cs (); /// visit the union_branch node virtual int visit_union_branch (be_union_branch *node); @@ -50,7 +50,7 @@ public: virtual int visit_union (be_union *node); /// extra code generation for an explicit default case - virtual int explicit_default (void); + virtual int explicit_default (); private: int emit_valuetype_common (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h index 85845146063..b2a2272f31d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_private_ch : public be_visitor_decl { public: be_visitor_union_branch_private_ch (be_visitor_context *ctx); - ~be_visitor_union_branch_private_ch (void); + ~be_visitor_union_branch_private_ch (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h index 79d3801b9f2..4159df97ac9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_public_assign_cs { public: be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_assign_cs (void); + ~be_visitor_union_branch_public_assign_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h index 9cbd194ff40..c8d55b282e0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h @@ -29,7 +29,7 @@ class be_visitor_union_branch_public_ch : public be_visitor_decl { public: be_visitor_union_branch_public_ch (be_visitor_context *ctx); - ~be_visitor_union_branch_public_ch (void); + ~be_visitor_union_branch_public_ch (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h index 496c5c2e748..4667b8f4801 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h @@ -27,7 +27,7 @@ class be_visitor_union_branch_public_ci : public be_visitor_decl { public: be_visitor_union_branch_public_ci (be_visitor_context *ctx); - ~be_visitor_union_branch_public_ci (void); + ~be_visitor_union_branch_public_ci (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h index c30d1d0955a..2490a42ea32 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h @@ -25,7 +25,7 @@ class be_visitor_union_branch_public_constructor_cs : public be_visitor_decl { public: be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_constructor_cs (void); + ~be_visitor_union_branch_public_constructor_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h index 99fa4686efa..805d29f620c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_public_cs : public be_visitor_decl { public: be_visitor_union_branch_public_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_cs (void); + ~be_visitor_union_branch_public_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h index 64cea01a6f5..763de71c464 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h @@ -27,7 +27,7 @@ class be_visitor_union_branch_public_reset_cs : public be_visitor_decl { public: be_visitor_union_branch_public_reset_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_reset_cs (void); + ~be_visitor_union_branch_public_reset_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h index 2d68892a6d2..96c3e7a7f5c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h @@ -25,7 +25,7 @@ class be_visitor_union_fwd_ch : public be_visitor_decl public: be_visitor_union_fwd_ch (be_visitor_context *ctx); - ~be_visitor_union_fwd_ch (void); + ~be_visitor_union_fwd_ch (); virtual int visit_union_fwd (be_union_fwd *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h index 23bf51ed796..080cc5ae17b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuebox_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_any_op_ch (void); + ~be_visitor_valuebox_any_op_ch (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h index f218e2a22ad..cd90d608340 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuebox_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_any_op_cs (void); + ~be_visitor_valuebox_any_op_cs (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h index aec6458437e..8b0036312bb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cdr_op_ch (void); + ~be_visitor_valuebox_cdr_op_ch (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h index c3b5a917306..37bf0fadb88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cdr_op_cs (void); + ~be_visitor_valuebox_cdr_op_cs (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h index 38b0b3b0b31..34fefe71189 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h @@ -36,7 +36,7 @@ public: be_visitor_valuebox_field_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_field_ch (void); + ~be_visitor_valuebox_field_ch (); /// visit the union_branch node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h index d4670541979..809f453fbd7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_field_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_field_ci (void); + ~be_visitor_valuebox_field_ci (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h index fab13fc5d84..896e8b55351 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_union_member_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_union_member_ci (void); + ~be_visitor_valuebox_union_member_ci (); /// visit the field node virtual int visit_union_member (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h index b3709563f2f..1b2323c35fa 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h @@ -28,7 +28,7 @@ public: be_visitor_valuebox (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox (void); + ~be_visitor_valuebox (); /// visit attribute. We provide code for this method in the derived class virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h index 118a9668d65..a51de1e2bf3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_ch (void); + ~be_visitor_valuebox_ch (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -66,14 +66,14 @@ private: const char * type_suffix, bool is_any); - void emit_default_constructor (void); + void emit_default_constructor (); void emit_constructor_one_arg (be_decl *node, const char * type_suffix, const char * const_prefix, const char * ref_modifier); - void emit_copy_constructor (void); + void emit_copy_constructor (); void emit_assignment (be_decl *node, const char * type_suffix, diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h index 49dfaa4068d..9648cd6d43f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_ci (void); + ~be_visitor_valuebox_ci (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -66,7 +66,7 @@ private: const char * type_suffix, bool is_any); - void emit_default_constructor (void); + void emit_default_constructor (); void emit_default_constructor_alloc (be_decl *node); @@ -75,7 +75,7 @@ private: void emit_constructor_one_arg_alloc (be_decl *node); - void emit_copy_constructor (void); + void emit_copy_constructor (); void emit_copy_constructor_alloc (be_decl *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h index e796c1609f9..04f7d3c99f7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cs (void); + ~be_visitor_valuebox_cs (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -64,7 +64,7 @@ public: private: /// Generate virtual destructor. - void emit_destructor (void); + void emit_destructor (); int emit_for_predef_enum (char const * marshal_arg); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h index f5cc50396c7..8e3bb6945de 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_any_op_ch (void); + ~be_visitor_valuetype_any_op_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h index 93f11d5405e..59592143bf3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_any_op_cs (void); + ~be_visitor_valuetype_any_op_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h index d2e366c65ab..72e09aa5740 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h @@ -30,7 +30,7 @@ public: be_visitor_obv_operation_arglist (be_visitor_context *ctx); /// destructor - ~be_visitor_obv_operation_arglist (void); + ~be_visitor_obv_operation_arglist (); /// special arglist generation for amh_exceptionholders bool is_amh_exception_holder (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h index c4348820b8b..524ff9818ce 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_cdr_op_ch (void); + ~be_visitor_valuetype_cdr_op_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h index dfa3e35af76..8edf6514674 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_cdr_op_cs (void); + ~be_visitor_valuetype_cdr_op_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h index ad2c3f30bb8..a3f1302dac6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_field_cdr_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cdr_ch (void); + ~be_visitor_valuetype_field_cdr_ch (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h index 1af6277b317..c85bb564e38 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_field_cdr_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cdr_cs (void); + ~be_visitor_valuetype_field_cdr_cs (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h index 1d84862b461..cfe51a9af28 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_field_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_ch (void); + ~be_visitor_valuetype_field_ch (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h index 6a8153cac77..461bd00d1b8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_field_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_ci (void); + ~be_visitor_valuetype_field_ci (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h index 856acd77c00..4680215ca15 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_field_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cs (void); + ~be_visitor_valuetype_field_cs (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h index 4908c95737e..4363664d7db 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_marshal_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_marshal_ch (void); + ~be_visitor_valuetype_marshal_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h index c6024fa7087..8e23ed10fbe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_marshal_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_marshal_cs (void); + ~be_visitor_valuetype_marshal_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h index b25cce5d72f..60bbde6b4e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h @@ -31,7 +31,7 @@ public: be_visitor_obv_module (be_visitor_context *ctx); /// destructor - ~be_visitor_obv_module (void); + ~be_visitor_obv_module (); virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index 6e5e5677ac8..fe09e70ad43 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -32,7 +32,7 @@ public: be_visitor_valuetype (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype (void); + ~be_visitor_valuetype (); public: /// visit the scope of the valuetype node diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h index 8affb65795e..290ea60d68d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h @@ -32,7 +32,7 @@ public: be_visitor_valuetype_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ch (void); + ~be_visitor_valuetype_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); @@ -40,8 +40,8 @@ public: virtual int visit_operation (be_operation *node); virtual int visit_field (be_field *node); - void begin_public (void); - void begin_private (void); + void begin_public (); + void begin_private (); /// Helper method passed to the template method to generate code for /// the operations of the parents of supported interfaces. diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h index a0c02219945..47f4bd861b6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ci (void); + ~be_visitor_valuetype_ci (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h index df723ab6b93..44e785a5013 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h @@ -26,7 +26,7 @@ class be_visitor_valuetype_cs : public be_visitor_valuetype public: be_visitor_valuetype_cs (be_visitor_context *ctx); - ~be_visitor_valuetype_cs (void); + ~be_visitor_valuetype_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h index fae38511a86..9157b6c534c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h @@ -30,12 +30,12 @@ public: be_visitor_valuetype_init (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init (void); + ~be_visitor_valuetype_init (); public: - void begin_public (void); - void begin_private (void); + void begin_public (); + void begin_private (); }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h index b9fc5cd7511..2aea1d11f76 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_init_arglist_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_arglist_ch (void); + ~be_visitor_valuetype_init_arglist_ch (); /// visit factory construct virtual int visit_factory (be_factory *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h index 2d0ad7cff51..74c73677e06 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_ch (void); + ~be_visitor_valuetype_init_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h index 93860a85d62..29c2cff6601 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_ci (void); + ~be_visitor_valuetype_init_ci (); }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h index fdc1e72a47b..674284dda70 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_cs (void); + ~be_visitor_valuetype_init_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h index 19b66bd1533..5fa1dd5cce6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h @@ -34,7 +34,7 @@ public: be_visitor_valuetype_obv_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_ch (void); + ~be_visitor_valuetype_obv_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h index fcd6bb5dbc7..232a30cb445 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h @@ -34,7 +34,7 @@ public: be_visitor_valuetype_obv_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_ci (void); + ~be_visitor_valuetype_obv_ci (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h index 29e984c2758..f05ac4cd831 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_obv_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_cs (void); + ~be_visitor_valuetype_obv_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h index a51a01244fc..fb1d2e30603 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_sh (void); + ~be_visitor_valuetype_sh (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h index 0c844fae670..b28f0f8f191 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ss (void); + ~be_visitor_valuetype_ss (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h index 4df1ecf1d02..1bb2b44360f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_any_op_ch (void); + ~be_visitor_valuetype_fwd_any_op_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h index 8835cc726de..0a3761bf5f2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h @@ -33,7 +33,7 @@ public: be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_cdr_op_ch (void); + ~be_visitor_valuetype_fwd_cdr_op_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h index b19b47a1eb2..1b86d70af06 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_ch (void); + ~be_visitor_valuetype_fwd_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h index 0bcf140d4e8..4050b455279 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h @@ -28,7 +28,7 @@ class be_visitor_xplicit_pre_proc : public be_visitor_ccm_pre_proc public: be_visitor_xplicit_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_xplicit_pre_proc (void); + virtual ~be_visitor_xplicit_pre_proc (); virtual int visit_home (be_home *node); @@ -61,7 +61,7 @@ public: virtual int visit_predefined_type (be_predefined_type *node); // Member accessor - be_interface *xplicit (void) const; + be_interface *xplicit () const; private: void check_and_store (AST_Decl *node); diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 0df91e8788a..3e02a5c4ac1 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -1211,7 +1211,7 @@ DRV_pre_proc (const char *myfile) // is often not enough. We determine // the required space and arg nr // dynamically here. - ACE_Process_Options cpp_options (1, // Inherit environment. + ACE_Process_Options cpp_options (true, // Inherit environment. DRV_cpp_calc_total_argsize (), 16 * 1024, 512, diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp index 330dadec876..0279f5a5e0a 100644 --- a/TAO/TAO_IDL/fe/fe_utils.cpp +++ b/TAO/TAO_IDL/fe/fe_utils.cpp @@ -267,7 +267,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, idl_global->scopes ().push (c); AST_Structure *connection = - idl_global->gen ()->create_structure (&sn, 0, 0); + idl_global->gen ()->create_structure (&sn, false, false); struct_id.destroy (); @@ -329,8 +329,8 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, idl_global->gen ()->create_sequence (bound_expr, connection, nullptr, - 0, - 0); + false, + false); ACE_CString seq_string (struct_name); seq_string += 's'; @@ -340,8 +340,8 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, AST_Typedef *connections = idl_global->gen ()->create_typedef (sequence, &seq_name, - 0, - 0); + false, + false); seq_id.destroy (); (void) c->fe_add_typedef (connections); diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 3bebb62ba5e..f87f408f96f 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -4486,8 +4486,8 @@ yyreduce: if (s != nullptr) { f = idl_global->gen ()->create_interface_fwd (&n, - 0, - 0); + false, + false); (void) s->fe_add_interface_fwd (f); } @@ -4516,8 +4516,8 @@ yyreduce: if (s != nullptr) { f = idl_global->gen ()->create_interface_fwd (&n, - 1, - 0); + true, + false); (void) s->fe_add_interface_fwd (f); } @@ -4546,8 +4546,8 @@ yyreduce: if (s != nullptr) { f = idl_global->gen ()->create_interface_fwd (&n, - 0, - 1); + false, + true); (void) s->fe_add_interface_fwd (f); } @@ -7253,8 +7253,8 @@ yyreduce: &sn, array_dims->length (), array_dims, - 0, - 0 + false, + false ); array->base_type_annotations (*base_type_annotations); sn.destroy (); @@ -10772,7 +10772,7 @@ yyerrlab: yyerrorlab: /* Pacify compilers when the user code never invokes YYERROR and the label yyerrorlab therefore never appears in user code. */ - if (0) + if (false) YYERROR; /* Do not reclaim the symbols of the rule whose action triggered diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index fbe1e9b75cc..354e713e626 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -203,6 +203,6 @@ typedef union YYSTYPE YYSTYPE; extern YYSTYPE tao_yylval; -int tao_yyparse (void); +int tao_yyparse (); #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */ diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index cb9debd488f..c919be1d965 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -1524,7 +1524,7 @@ YY_DECL #line 1528 "fe/idl.yy.cpp" - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/true ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -4195,7 +4195,7 @@ idl_valid_version (char *s) // Nothing preceding decimal point. if (*s == '.') { - return 0; + return false; } char *minor = ACE_OS::strchr (s, '.'); @@ -4204,13 +4204,13 @@ idl_valid_version (char *s) if (minor == nullptr) { // No decimal point. - return 0; + return false; } if (*(minor + 1) == '\0') { // Nothing following decimal point. - return 0; + return false; } char *tmp = minor + 1; @@ -4219,7 +4219,7 @@ idl_valid_version (char *s) { if (!isdigit (tmp[i])) { - return 0; + return false; } } @@ -4229,7 +4229,7 @@ idl_valid_version (char *s) { if (!isdigit (s[i])) { - return 0; + return false; } } @@ -4237,10 +4237,10 @@ idl_valid_version (char *s) if (ACE_OS::atoi (minor + 1) > ACE_UINT16_MAX || ACE_OS::atoi (s) > ACE_UINT16_MAX) { - return 0; + return false; } - return 1; + return true; } static AST_Decl * diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 1666dd12548..6f90a060c00 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -87,10 +87,10 @@ public: AST_Type *ft, UTL_ScopedName *n); - virtual ~AST_Argument (void); + virtual ~AST_Argument (); // Data Accessors. - Direction direction (void); + Direction direction (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -99,7 +99,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 6fac7521260..7ea8b6521ed 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -87,26 +87,26 @@ public: bool local, bool abstract); - virtual ~AST_Array (void); + virtual ~AST_Array (); // Data Accessors. - ACE_CDR::ULong n_dims (void); + ACE_CDR::ULong n_dims (); - AST_Expression **dims (void); + AST_Expression **dims (); void set_dims (AST_Expression **, ACE_CDR::ULong); - AST_Type *base_type (void) const; + AST_Type *base_type () const; void set_base_type (AST_Type *nbt); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Cleanup. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -125,7 +125,7 @@ public: ///} protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. private: diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index e1d813fd9cf..b8be84250cc 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -81,13 +81,13 @@ public: bool local, bool abstract); - virtual ~AST_Attribute (void); + virtual ~AST_Attribute (); // Data Accessors. - bool readonly (void) const; - UTL_ExceptList *get_get_exceptions (void) const; - UTL_ExceptList *get_set_exceptions (void) const; + bool readonly () const; + UTL_ExceptList *get_get_exceptions () const; + UTL_ExceptList *get_set_exceptions () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -96,7 +96,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Methods to add exceptions directly, used when copying node. UTL_ExceptList *be_add_get_exceptions (UTL_ExceptList *t); @@ -119,7 +119,7 @@ private: // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual UTL_NameList *fe_add_get_exceptions (UTL_NameList *e); virtual UTL_NameList *fe_add_set_exceptions (UTL_NameList *e); }; diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index fe962cab9ac..7d45a7b455b 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -24,7 +24,7 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~AST_Component (void); + virtual ~AST_Component (); // This also calls the base class version. virtual void redefine (AST_Interface *from); @@ -39,11 +39,11 @@ public: // Accessors. - AST_Component *base_component (void) const; + AST_Component *base_component () const; - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; // Override for component of UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *e, @@ -51,7 +51,7 @@ public: AST_Decl *&final_parent_decl); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Allows adding an uses to a later point // The port i is inserted after port ix, if diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h index 528b1da6753..61b721beff6 100644 --- a/TAO/TAO_IDL/include/ast_component_fwd.h +++ b/TAO/TAO_IDL/include/ast_component_fwd.h @@ -12,10 +12,10 @@ public: AST_ComponentFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_ComponentFwd (void); + virtual ~AST_ComponentFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 79caca0859a..3d15bc1ba7b 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -77,10 +77,10 @@ public: AST_ConcreteType (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~AST_ConcreteType (void); + virtual ~AST_ConcreteType (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); virtual bool annotatable () const { return true; } }; diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h index 54d08ce7e26..d1748e5853e 100644 --- a/TAO/TAO_IDL/include/ast_connector.h +++ b/TAO/TAO_IDL/include/ast_connector.h @@ -9,17 +9,17 @@ class TAO_IDL_FE_Export AST_Connector : public virtual AST_Component { public: - AST_Connector (void); + AST_Connector (); AST_Connector (UTL_ScopedName *n, AST_Connector *base_connector); - virtual ~AST_Connector (void); + virtual ~AST_Connector (); - AST_Connector *base_connector (void) const; + AST_Connector *base_connector () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index f0961ab11be..b974e63a842 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -92,23 +92,23 @@ public: AST_Expression *ev, UTL_ScopedName *n); - virtual ~AST_Constant (void); + virtual ~AST_Constant (); // Data Accessors. - AST_Expression *constant_value (void); - AST_Expression::ExprType et (void); + AST_Expression *constant_value (); + AST_Expression::ExprType et (); // Accessors for the private member. - bool ifr_added (void); + bool ifr_added (); void ifr_added (bool val); - const char *exprtype_to_string (void); + const char *exprtype_to_string (); // Returns the appropriate type. static const char *exprtype_to_string (AST_Expression::ExprType et); // For use with ORBs without the CORBA namespace. - UTL_ScopedName *enum_full_name (void); + UTL_ScopedName *enum_full_name (); // If our type is enum, we have to generate the scoped name. // AST Dumping. @@ -118,7 +118,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h index 22c84fc62e3..9060876b5c3 100644 --- a/TAO/TAO_IDL/include/ast_consumes.h +++ b/TAO/TAO_IDL/include/ast_consumes.h @@ -12,10 +12,10 @@ public: AST_Consumes (UTL_ScopedName *n, AST_Type *consumes_type); - virtual ~AST_Consumes (void); + virtual ~AST_Consumes (); // Data Accessor. - AST_Type *consumes_type (void) const; + AST_Type *consumes_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index a617dc4023b..c018be50aba 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -93,17 +93,17 @@ protected: COMMON_Base (bool local = false, bool abstract = false); - virtual ~COMMON_Base (void); + virtual ~COMMON_Base (); public: // A no-op, overridden in the child classes. - virtual void destroy (void); + virtual void destroy (); // Accessor needs to get overridden for a few types. - virtual bool is_local (void); + virtual bool is_local (); void is_local (bool val); - bool is_abstract (void) const; + bool is_abstract () const; void is_abstract (bool val); protected: @@ -195,10 +195,10 @@ public: UTL_ScopedName *name, AST_Decl *other); - virtual ~AST_Decl (void); + virtual ~AST_Decl (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // If this decl has been found, some types need to be // moved onto their true definitions etc. Defaults to @@ -206,28 +206,28 @@ public: virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only); // Is this decl a forward declared type (default false) - virtual bool is_fwd (void); + virtual bool is_fwd (); // Data Accessors. - bool imported (void); + bool imported (); void set_imported (bool is_it); - bool in_main_file (void); + bool in_main_file (); void set_in_main_file (bool is_it); - UTL_Scope *defined_in (void); + UTL_Scope *defined_in (); void set_defined_in (UTL_Scope *); - NodeType node_type (void); + NodeType node_type (); - long line (void); + long line (); void set_line (long l); - ACE_CString & file_name (void); + ACE_CString & file_name (); void set_file_name (ACE_CString s); - UTL_ScopedName *name (void); + UTL_ScopedName *name (); UTL_ScopedName *compute_name (const char *prefix, const char *suffix); @@ -236,36 +236,36 @@ public: void set_name (UTL_ScopedName *n); - Identifier *local_name (void); + Identifier *local_name (); void local_name (Identifier *id); Identifier *compute_local_name (const char *prefix, const char *sufix); // Apply prefix and suffix to the local name and return. - virtual const char *full_name (void); + virtual const char *full_name (); // Return the stringified full name. - virtual const char *flat_name (void); + virtual const char *flat_name (); // Return the flattened full scoped name. - const char *repoID (void); + const char *repoID (); void repoID (char *value); // Accessors for the repository ID. - const char *prefix (void); + const char *prefix (); void prefix (const char *value); // Accessors for the repository ID prefix. - const char *version (void); + const char *version (); void version (char *value); // Accessors for the version_ member. - bool anonymous (void) const; + bool anonymous () const; void anonymous (bool val); // Accessors for the anonymous_ member. - bool typeid_set (void) const; + bool typeid_set () const; void typeid_set (bool val); // Accessors for the typeid_set_ member. @@ -280,12 +280,12 @@ public: // prefix to the all the reserved keywords. But when we invoke the // operation remotely, we should be sending only the name with out // "_cxx_" prefix. - Identifier *original_local_name (void); + Identifier *original_local_name (); void original_local_name (Identifier *); // To be overridden by the subclasses interface, struct, union, and // the corresponding forward declaration classes. - virtual bool is_defined (void); + virtual bool is_defined (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -301,18 +301,18 @@ public: // Return TRUE if "this" is a child of "s". bool is_child (AST_Decl *s); - bool is_nested (void); + bool is_nested (); // Determines if we are inside of a nested scope or not. - UTL_ScopedName *last_referenced_as (void) const; + UTL_ScopedName *last_referenced_as () const; void last_referenced_as (UTL_ScopedName *n); // Accessors for the prefix_scope_ member. - UTL_Scope *prefix_scope (void); + UTL_Scope *prefix_scope (); void prefix_scope (UTL_Scope *s); // Useful for GIOP to know if a wstring is being marshaled. - virtual int contains_wstring (void); + virtual int contains_wstring (); void contains_wstring (int val); // Additional checks when we think we have caught an IDL @@ -321,7 +321,7 @@ public: bool masking_checks (AST_Decl *mod); // Accessors for the member. - bool in_tmpl_mod_not_aliased (void) const; + bool in_tmpl_mod_not_aliased () const; void in_tmpl_mod_not_aliased (bool val); /// Set and get annotations for this IDL element @@ -405,13 +405,13 @@ protected: void dump_i (ACE_OSTREAM_TYPE &o, const char *s) const ; - void compute_repoID (void); + void compute_repoID (); // Computes the repoID. - void compute_full_name (void); + void compute_full_name (); // Computes the stringified scoped name. - void compute_flat_name (void); + void compute_flat_name (); // Compute the flattened fully scoped name. const char *node_type_to_string (NodeType nt); diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h index c19e620dafb..423a5f8a76a 100644 --- a/TAO/TAO_IDL/include/ast_emits.h +++ b/TAO/TAO_IDL/include/ast_emits.h @@ -12,10 +12,10 @@ public: AST_Emits (UTL_ScopedName *n, AST_Type *emits_type); - virtual ~AST_Emits (void); + virtual ~AST_Emits (); // Data Accessor. - AST_Type *emits_type (void) const; + AST_Type *emits_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index dc580f08ab2..32b18f78a4c 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -80,7 +80,7 @@ public: bool local, bool abstract); - virtual ~AST_Enum (void); + virtual ~AST_Enum (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -89,16 +89,16 @@ public: AST_EnumVal *lookup_by_value (const AST_Expression *v); // Get value to be assigned to next enumerator. - unsigned long next_enum_val (void); + unsigned long next_enum_val (); // Return the count of members - virtual int member_count (void); + virtual int member_count (); // Convert a numeric value to the enum's string name for it. UTL_ScopedName *value_to_name (const unsigned long v); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -108,7 +108,7 @@ public: virtual bool annotatable () const { return true; } private: - friend int tao_yyparse (void); + friend int tao_yyparse (); unsigned long pd_enum_counter; // Value for next enumerator. @@ -116,7 +116,7 @@ private: int member_count_; // Number of members. - int compute_member_count (void); + int compute_member_count (); // Count the number of members. virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index fcfa695315d..f1667000d0b 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -78,7 +78,7 @@ public: AST_EnumVal (ACE_CDR::ULong v, UTL_ScopedName *n); - virtual ~AST_EnumVal (void); + virtual ~AST_EnumVal (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h index 10fb255cde7..f7243863e8c 100644 --- a/TAO/TAO_IDL/include/ast_eventtype.h +++ b/TAO/TAO_IDL/include/ast_eventtype.h @@ -20,10 +20,10 @@ public: bool truncatable, bool custom); - virtual ~AST_EventType (void); + virtual ~AST_EventType (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h index 0913ae4e2e0..c859663a582 100644 --- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h +++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h @@ -12,10 +12,10 @@ public: AST_EventTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_EventTypeFwd (void); + virtual ~AST_EventTypeFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index ebcb56fd145..76556795479 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -83,7 +83,7 @@ public: bool local, bool abstract); - virtual ~AST_Exception (void); + virtual ~AST_Exception (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Check if we or the parameter node is in recursion. @@ -95,7 +95,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index ec2dfc4eb22..9a975bf9502 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -161,7 +161,7 @@ public: // Structure to describe value of constant expression and its type. struct AST_ExprValue { - AST_ExprValue (void); + AST_ExprValue (); union { @@ -232,30 +232,30 @@ public: AST_Expression (const ACE_CDR::Fixed &f); // Destructor. - virtual ~AST_Expression (void); + virtual ~AST_Expression (); // Data Accessors. - UTL_Scope *defined_in (void); + UTL_Scope *defined_in (); void set_defined_in (UTL_Scope *d); - long line (void); + long line (); void set_line (long l); - UTL_String *file_name (void); + UTL_String *file_name (); void set_file_name (UTL_String *f); - ExprComb ec (void); + ExprComb ec (); - AST_ExprValue *ev (void); + AST_ExprValue *ev (); void set_ev (AST_ExprValue *new_ev); - AST_Expression *v1 (void); + AST_Expression *v1 (); void set_v1 (AST_Expression *e); - AST_Expression *v2 (void); + AST_Expression *v2 (); void set_v2 (AST_Expression *e); - UTL_ScopedName *n (void); + UTL_ScopedName *n (); void set_n (UTL_ScopedName *new_n); // AST Dumping. @@ -265,7 +265,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Other operations. @@ -286,10 +286,10 @@ public: long compare (AST_Expression *vc); // Accessor for the member. - AST_Decl *get_tdef (void) const; + AST_Decl *get_tdef () const; // Accessor for the member. - AST_Param_Holder *param_holder (void) const; + AST_Param_Holder *param_holder () const; static const char *exprtype_to_string (ExprType t); @@ -345,7 +345,7 @@ private: // Non-zero if we were created from a reference template param. // Fill out the lineno, filename and definition scope details. - void fill_definition_details (void); + void fill_definition_details (); // Internal evaluation. virtual AST_ExprValue *eval_internal (EvalKind ek); diff --git a/TAO/TAO_IDL/include/ast_extended_port.h b/TAO/TAO_IDL/include/ast_extended_port.h index 8e467d4977f..dd0fb686581 100644 --- a/TAO/TAO_IDL/include/ast_extended_port.h +++ b/TAO/TAO_IDL/include/ast_extended_port.h @@ -13,12 +13,12 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~AST_Extended_Port (void); + virtual ~AST_Extended_Port (); - AST_PortType *port_type (void) const; + AST_PortType *port_type () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index c2c9e0f00af..480182b2467 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -79,7 +79,7 @@ class AST_Decl; // type the full definition was also seen. extern void AST_record_fwd_decl (AST_Type *i); -extern TAO_IDL_FE_Export void AST_check_fwd_decls (void); +extern TAO_IDL_FE_Export void AST_check_fwd_decls (); extern bool AST_illegal_recursive_type (AST_Decl *t); extern bool AST_illegal_interface_recursion (AST_Decl *t); diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h index c84ef84ca9e..d83aeacfd84 100644 --- a/TAO/TAO_IDL/include/ast_factory.h +++ b/TAO/TAO_IDL/include/ast_factory.h @@ -81,18 +81,18 @@ class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl, public: AST_Factory (UTL_ScopedName *n); - virtual ~AST_Factory (void); + virtual ~AST_Factory (); - UTL_ExceptList *exceptions (void); + UTL_ExceptList *exceptions (); // Return exception list. - int n_exceptions (void); + int n_exceptions (); // Return exception count. - virtual int argument_count (void); + virtual int argument_count (); // Return the count of members. - virtual int has_native (void); + virtual int has_native (); // Any of the arguments or the return value is a <native> type. // This is important because in that case no code should be // generated for the stubs. @@ -101,7 +101,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -129,12 +129,12 @@ protected: private: // Operations. - int compute_argument_attr (void); + int compute_argument_attr (); // Count the number of arguments. // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual AST_Argument *fe_add_argument (AST_Argument *a); virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e); }; diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index 68d8fe39754..2949a69b97e 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -109,10 +109,10 @@ public: UTL_ScopedName *name, AST_Field *other); - virtual ~AST_Field (void); + virtual ~AST_Field (); // Data Accessors. - AST_Type *field_type (void) const; + AST_Type *field_type () const; /// Get and Set Visibility ///{ @@ -121,12 +121,12 @@ public: ///} // Are we or do we contain a wstring? - virtual int contains_wstring (void); + virtual int contains_wstring (); // Determine this bit of state after we have // be added to our aggregate type and before // we are destroyed. - void set_recursive_flag (void); + void set_recursive_flag (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -135,7 +135,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h index 25d6dabd511..f66e44d910f 100644 --- a/TAO/TAO_IDL/include/ast_finder.h +++ b/TAO/TAO_IDL/include/ast_finder.h @@ -12,13 +12,13 @@ public: AST_Finder (UTL_ScopedName *n); - virtual ~AST_Finder (void); + virtual ~AST_Finder (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index d4fd9fbac16..36c34f517d4 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -103,9 +103,9 @@ class AST_Annotation_Member; class TAO_IDL_FE_Export AST_Generator { public: - AST_Generator (void) {} + AST_Generator () {} - virtual ~AST_Generator (void) {} + virtual ~AST_Generator () {} // Operations. diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index 728b3af6a55..045c1357e8b 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -20,7 +20,7 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~AST_Home (void); + virtual ~AST_Home (); // Extend lookup to the base home. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, @@ -37,20 +37,20 @@ public: // Accessors. - AST_Home *base_home (void) const; + AST_Home *base_home () const; - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; - AST_Component *managed_component (void) const; + AST_Component *managed_component () const; - AST_Type *primary_key (void) const; + AST_Type *primary_key () const; void transfer_scope_elements (AST_Interface *dst); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -63,7 +63,7 @@ public: private: // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); friend class ast_visitor_tmpl_module_inst; virtual AST_Factory *fe_add_factory (AST_Factory *f); diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index ebb57be4b30..a5fe7b023f5 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -85,7 +85,7 @@ public: bool local, bool abstract); - virtual ~AST_Interface (void); + virtual ~AST_Interface (); // This serves for interfaces, value types, components, and eventtypes. static void fwd_redefinition_helper (AST_Interface *&i, @@ -94,16 +94,16 @@ public: // Overridden for valuetypes, components, and eventtypes. virtual void redefine (AST_Interface *from); - AST_Type **inherits (void) const; + AST_Type **inherits () const; - long n_inherits (void) const; + long n_inherits () const; - AST_Interface **inherits_flat (void) const; + AST_Interface **inherits_flat () const; - long n_inherits_flat (void) const; + long n_inherits_flat () const; - ACE_Unbounded_Queue<AST_Type *> &get_insert_queue (void); - ACE_Unbounded_Queue<AST_Type *> &get_del_queue (void); + ACE_Unbounded_Queue<AST_Type *> &get_insert_queue (); + ACE_Unbounded_Queue<AST_Type *> &get_del_queue (); AST_Operation *be_add_operation (AST_Operation *); @@ -113,18 +113,18 @@ public: // Is this interface defined? This predicate returns FALSE when an // interface was forward declared but not defined yet, and TRUE in // all other cases. - bool is_defined (void); + bool is_defined (); // Check if we have redefined any of our parents' operations or attributes, // and check if there is such a clash among the parents - bool redef_clash (void); + bool redef_clash (); // Accessors for the member. - bool home_equiv (void) const; + bool home_equiv () const; void home_equiv (bool val); // Accessors for the member. - AST_InterfaceFwd *fwd_decl (void) const; + AST_InterfaceFwd *fwd_decl () const; void fwd_decl (AST_InterfaceFwd *node); // Look through inherited interfaces. @@ -135,29 +135,29 @@ public: bool full_def_only = false); /// Do we have both abstract and concrete parents? - int has_mixed_parentage (void); + int has_mixed_parentage (); /// Compute whether or not we have both abstract and concrete parents, /// and make a list of the abstract parents, if any. - void analyze_parentage (void); + void analyze_parentage (); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only, AST_Decl *&final_parent_decl); /// Accessors for the members. - AST_Interface *ami_handler (void) const; + AST_Interface *ami_handler () const; void ami_handler (AST_Interface *handler); - AST_Interface *ami4ccm_uses (void) const; + AST_Interface *ami4ccm_uses () const; void ami4ccm_uses (AST_Interface *implied); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index f0427fedd5c..101b39fd6d6 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -77,9 +77,9 @@ public: AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_InterfaceFwd (void); + virtual ~AST_InterfaceFwd (); - AST_Interface *full_definition (void); + AST_Interface *full_definition (); /** * Sets the full definition. If there is an existing dummy definition, it @@ -87,7 +87,7 @@ public: */ void set_full_definition (AST_Interface *nfd); - virtual bool is_defined (void); + virtual bool is_defined (); void set_as_defined (); /** @@ -98,14 +98,14 @@ public: */ void disown_full_definition (); - virtual bool is_local (void); - virtual bool is_valuetype (void); - virtual bool is_abstract_valuetype (void); + virtual bool is_local (); + virtual bool is_valuetype (); + virtual bool is_abstract_valuetype (); - bool full_def_seen (void); + bool full_def_seen (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -114,7 +114,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); // We don't actually want the forward declaration, // but want to return the full definition member, diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h index dee54323979..3195c88da4a 100644 --- a/TAO/TAO_IDL/include/ast_mirror_port.h +++ b/TAO/TAO_IDL/include/ast_mirror_port.h @@ -12,10 +12,10 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~AST_Mirror_Port (void); + virtual ~AST_Mirror_Port (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 07da023f2f3..d697dcb785e 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -87,17 +87,17 @@ public: AST_Module (UTL_ScopedName *n, AST_Module *prev = 0); // Destructor. - virtual ~AST_Module (void); + virtual ~AST_Module (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Involved in OBV_ namespace generation. - void set_has_nested_valuetype (void); - bool has_nested_valuetype (void); + void set_has_nested_valuetype (); + bool has_nested_valuetype (); // Allows adding an interface at a later point. // The interface i is inserted after interface ix, if @@ -131,11 +131,11 @@ public: virtual int ast_accept (ast_visitor *visitor); // Accessors for the member. - AST_Template_Module_Inst *from_inst (void) const; + AST_Template_Module_Inst *from_inst () const; void from_inst (AST_Template_Module_Inst *node); // Accessors for the member. - AST_Template_Module_Ref *from_ref (void) const; + AST_Template_Module_Ref *from_ref () const; void from_ref (AST_Template_Module_Ref *node); // Override that looks in previous openings. @@ -234,7 +234,7 @@ public: // (called by AST_Root::destroy on the CORBA module containing // the basic types, since it isn't destroyed between processing // multiple IDL files. - void reset_last_in_same_parent_scope (void); + void reset_last_in_same_parent_scope (); virtual bool annotatable () const { return true; } diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 389f61f593f..2a56f19a152 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -15,10 +15,10 @@ class TAO_IDL_FE_Export AST_Native : public virtual AST_Exception public: AST_Native (UTL_ScopedName *n); - virtual ~AST_Native (void); + virtual ~AST_Native (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 3c8d277cb60..008fcc4616f 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -90,28 +90,28 @@ public: bool local, bool abstract); - virtual ~AST_Operation (void); + virtual ~AST_Operation (); // Data Accessors. - AST_Type *return_type (void); + AST_Type *return_type (); - Flags flags (void); + Flags flags (); - UTL_StrList *context (void); + UTL_StrList *context (); - UTL_ExceptList *exceptions (void); + UTL_ExceptList *exceptions (); // Public operations. - bool void_return_type (void); + bool void_return_type (); /// Returns 1 if the operation has a void return type. /// Return the number of arguments - virtual int argument_count (void); + virtual int argument_count (); /// Return the flag indicating a request sends argument data - virtual bool has_in_arguments (void); + virtual bool has_in_arguments (); /// Count the number of arguments of a certain type. /** @@ -125,7 +125,7 @@ public: */ int count_arguments_with_direction (int direction_mask); - virtual int has_native (void); + virtual int has_native (); // Any of the arguments or the return value is a <native> type. // This is important because in that case no code should be // generated for the stubs. @@ -134,7 +134,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -172,12 +172,12 @@ protected: // Operations. - int compute_argument_attr (void); + int compute_argument_attr (); // Count the number of arguments. // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual AST_Argument *fe_add_argument (AST_Argument *a); virtual UTL_StrList *fe_add_context (UTL_StrList *c); virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e); diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h index abd5ad403b1..17f4d66f41b 100644 --- a/TAO/TAO_IDL/include/ast_param_holder.h +++ b/TAO/TAO_IDL/include/ast_param_holder.h @@ -13,15 +13,15 @@ public: AST_Param_Holder (UTL_ScopedName *parameter_name, FE_Utils::T_Param_Info *info); - virtual ~AST_Param_Holder (void); + virtual ~AST_Param_Holder (); - FE_Utils::T_Param_Info const *info (void) const; + FE_Utils::T_Param_Info const *info () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h index aa98a84ee2a..20b0e92ea26 100644 --- a/TAO/TAO_IDL/include/ast_porttype.h +++ b/TAO/TAO_IDL/include/ast_porttype.h @@ -18,10 +18,10 @@ class TAO_IDL_FE_Export AST_PortType public: AST_PortType (UTL_ScopedName *n); - virtual ~AST_PortType (void); + virtual ~AST_PortType (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 7e621aa8088..3969936f4ce 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -100,10 +100,10 @@ public: AST_PredefinedType (PredefinedType t, UTL_ScopedName *n); - virtual ~AST_PredefinedType (void); + virtual ~AST_PredefinedType (); // Data Accessors. - PredefinedType pt (void); + PredefinedType pt (); // AST Dumping virtual void dump (ACE_OSTREAM_TYPE &o); @@ -112,12 +112,12 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. private: diff --git a/TAO/TAO_IDL/include/ast_provides.h b/TAO/TAO_IDL/include/ast_provides.h index bb01a45d6b1..3d5b3f5c52b 100644 --- a/TAO/TAO_IDL/include/ast_provides.h +++ b/TAO/TAO_IDL/include/ast_provides.h @@ -10,10 +10,10 @@ public: AST_Provides (UTL_ScopedName *n, AST_Type *provides_type); - virtual ~AST_Provides (void); + virtual ~AST_Provides (); // Data Accessor. - AST_Type *provides_type (void) const; + AST_Type *provides_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -22,7 +22,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h index b1ac2051e36..96295e30067 100644 --- a/TAO/TAO_IDL/include/ast_publishes.h +++ b/TAO/TAO_IDL/include/ast_publishes.h @@ -12,10 +12,10 @@ public: AST_Publishes (UTL_ScopedName *n, AST_Type *publishes_type); - virtual ~AST_Publishes (void); + virtual ~AST_Publishes (); // Data Accessor. - AST_Type *publishes_type (void) const; + AST_Type *publishes_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index e3750e20934..8c3b50d01f1 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -75,9 +75,9 @@ class TAO_IDL_FE_Export AST_Root : public virtual AST_Module public: AST_Root (UTL_ScopedName *n); - virtual ~AST_Root (void); + virtual ~AST_Root (); - virtual unsigned long nmembers (void); + virtual unsigned long nmembers (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -89,13 +89,13 @@ public: virtual void destroy (); // Final cleanup. - void fini (void); + void fini (); static AST_Decl::NodeType const NT; private: friend class FE_Declarator; - friend int tao_yyparse (void); + friend int tao_yyparse (); // Add protocol. diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index e165bd03ed6..d1f1d94abda 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -81,30 +81,30 @@ public: bool local, bool abstract); - virtual ~AST_Sequence (void); + virtual ~AST_Sequence (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. // Data Accessors. - AST_Expression *max_size (void); + AST_Expression *max_size (); - AST_Type *base_type (void) const; + AST_Type *base_type () const; - virtual bool unbounded (void) const; + virtual bool unbounded () const; // Is this sequence bounded or not. // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Is the element type a forward declared struct or union // that hasn't yet been fully defined? - virtual bool is_defined (void); + virtual bool is_defined (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index 75ea44326e1..71ad8c1e935 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -82,11 +82,11 @@ public: AST_Expression *max_size, long wide = 1); - virtual ~AST_String (void); + virtual ~AST_String (); // Data Accessors. - AST_Expression *max_size (void); - long width (void); + AST_Expression *max_size (); + long width (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -95,7 +95,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 48d4341e6a4..15eb9c2dd65 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -94,7 +94,7 @@ public: bool local, bool abstract); - virtual ~AST_Structure (void); + virtual ~AST_Structure (); // This serves for both structs and unions. static void fwd_redefinition_helper (AST_Structure *&i, @@ -103,50 +103,50 @@ public: // Overridden for unions. virtual void redefine (AST_Structure *from); - virtual int member_count (void); + virtual int member_count (); // Return the count of members. - virtual ACE_CDR::ULong nfields (void) const; + virtual ACE_CDR::ULong nfields () const; // Return the count of actual fields. virtual int field (AST_Field **&result, ACE_CDR::ULong slot) const; // Get an individual field node. - virtual bool is_local (void); + virtual bool is_local (); // Overwrite the is_local method. virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. - virtual int contains_wstring (void); + virtual int contains_wstring (); // Do we contain a wstring at some nesting level? // Is this struct or union defined? This predicate returns FALSE when a // forward declaration is not defined yet, and TRUE in // all other cases. - virtual bool is_defined (void); + virtual bool is_defined (); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Accessors for the member. - AST_StructureFwd *fwd_decl (void) const; + AST_StructureFwd *fwd_decl () const; void fwd_decl (AST_StructureFwd *node); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); // Accessor for the member. - ACE_Unbounded_Queue<AST_Field *> &fields (void); + ACE_Unbounded_Queue<AST_Field *> &fields (); static AST_Decl::NodeType const NT; @@ -161,7 +161,7 @@ public: ///} protected: - friend int tao_yyparse (void); + friend int tao_yyparse (); // Scope Management Protocol. virtual AST_Union *fe_add_union (AST_Union *u); @@ -172,7 +172,7 @@ protected: virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. ACE_Unbounded_Queue<AST_Field *> fields_; @@ -181,7 +181,7 @@ protected: // the struct. private: - int compute_member_count (void); + int compute_member_count (); // Count the number of members. int member_count_; diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index 0e610192ea7..f459c558505 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -13,16 +13,16 @@ public: AST_StructureFwd (AST_Structure *full_defn, UTL_ScopedName *n); - virtual ~AST_StructureFwd (void); + virtual ~AST_StructureFwd (); - AST_Structure *full_definition (void); + AST_Structure *full_definition (); void set_full_definition (AST_Structure *nfd); - virtual bool is_defined (void); - void set_as_defined (void); + virtual bool is_defined (); + void set_as_defined (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -31,7 +31,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); // We don't actually want the forward declaration, // but want to return the full definition member, diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h index 2908afed679..5f1e5d4e8f2 100644 --- a/TAO/TAO_IDL/include/ast_template_module.h +++ b/TAO/TAO_IDL/include/ast_template_module.h @@ -15,10 +15,10 @@ public: AST_Template_Module (UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - virtual ~AST_Template_Module (void); + virtual ~AST_Template_Module (); FE_Utils::T_PARAMLIST_INFO * - template_params (void) const; + template_params () const; // Checks for errors in the template args of an instantiation. bool match_arg_names (FE_Utils::T_ARGLIST *args); @@ -30,7 +30,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h index 5adb0e898f2..d56fc150dc1 100644 --- a/TAO/TAO_IDL/include/ast_template_module_inst.h +++ b/TAO/TAO_IDL/include/ast_template_module_inst.h @@ -15,18 +15,18 @@ public: AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - virtual ~AST_Template_Module_Inst (void); + virtual ~AST_Template_Module_Inst (); - AST_Template_Module *ref (void) const; + AST_Template_Module *ref () const; FE_Utils::T_ARGLIST const * - template_args (void) const; + template_args () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h index 30a5b0ee81b..7273bc0e381 100644 --- a/TAO/TAO_IDL/include/ast_template_module_ref.h +++ b/TAO/TAO_IDL/include/ast_template_module_ref.h @@ -15,17 +15,17 @@ public: AST_Template_Module *ref, UTL_StrList *param_refs); - virtual ~AST_Template_Module_Ref (void); + virtual ~AST_Template_Module_Ref (); - AST_Template_Module *ref (void) const; + AST_Template_Module *ref () const; - UTL_StrList *param_refs (void) const; + UTL_StrList *param_refs () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -39,7 +39,7 @@ public: virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only); /// Accessors for the member. - bool processed (void) const; + bool processed () const; void processed (bool val); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 9b10b6a2821..5cda580cf1c 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -90,7 +90,7 @@ public: AST_Type (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~AST_Type (void); + virtual ~AST_Type (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Determine if we are involved in some kind of limited recursion. @@ -101,21 +101,21 @@ public: virtual void size_type (SIZE_TYPE); // Set the size type. - virtual SIZE_TYPE size_type (void); + virtual SIZE_TYPE size_type (); // Return our size type. // Accessors/mutators for the private members. - bool has_constructor (void); + bool has_constructor (); // Accessor for protected member. void has_constructor (bool value); // Mutator for protected member. - bool ifr_added (void); + bool ifr_added (); void ifr_added (bool val); - bool ifr_fwd_added (void); + bool ifr_fwd_added (); void ifr_fwd_added (bool val); const char *nested_type_name (AST_Decl *d, @@ -123,10 +123,10 @@ public: const char *prefix = 0); // Type name of a node used when generating declarations. - AST_Type *unaliased_type (void); + AST_Type *unaliased_type (); // Utility function to make sure we are using the unaliased type. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. @@ -135,10 +135,10 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Determine our size type and set it if it is unknown. const char *nested_name (const char *local_name, diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index cd3d776165c..b1181cb18e8 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -81,24 +81,24 @@ public: bool local, bool abstract); - virtual ~AST_Typedef (void); + virtual ~AST_Typedef (); - AST_Type *primitive_base_type (void) const; + AST_Type *primitive_base_type () const; // Return the most primitive base type by traversing the chain of typedefed // base types. // Data Accessors. - AST_Type *base_type (void) const; + AST_Type *base_type () const; - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool is_local (void); + virtual bool is_local (); // Override the base class method. - bool owns_base_type (void) const; + bool owns_base_type () const; void owns_base_type (bool val); // Sometimes this has to be accessed or managed from outside. @@ -109,7 +109,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; @@ -121,7 +121,7 @@ public: virtual AST_Annotation_Appls &annotations (); protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. /** diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 4815d0736d8..dafa8e704de 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -84,7 +84,7 @@ public: bool local, bool abstract); - virtual ~AST_Union (void); + virtual ~AST_Union (); // This also calls the base class version. virtual void redefine (AST_Structure *from); @@ -94,9 +94,9 @@ public: // Data Accessors. - AST_ConcreteType *disc_type (void); + AST_ConcreteType *disc_type (); - AST_Expression::ExprType udisc_type (void); + AST_Expression::ExprType udisc_type (); struct DefaultValue { @@ -123,7 +123,7 @@ public: int default_value (DefaultValue &); // Get the default value. - virtual int default_index (void); + virtual int default_index (); // Return the default index used. // AST Dumping. @@ -143,7 +143,7 @@ public: ///} protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b); @@ -165,7 +165,7 @@ private: AST_UnionBranch *lookup_branch (AST_UnionBranch *branch); // Look up the branch with the "default" label. - AST_UnionBranch *lookup_default (void); + AST_UnionBranch *lookup_default (); // Look up a branch given a branch with a label. This is used to // check for duplicate labels. @@ -175,7 +175,7 @@ private: // check for duplicate enum labels. AST_UnionBranch *lookup_enum (AST_UnionBranch *b); - friend int tao_yyparse (void); + friend int tao_yyparse (); friend class ast_visitor_tmpl_module_inst; // Scope Management Protocol. @@ -188,10 +188,10 @@ private: virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); - virtual int compute_default_value (void); + virtual int compute_default_value (); // Compute the default value (if any). - int compute_default_index (void); + int compute_default_index (); // Count the default index. DefaultValue default_value_; diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index e1427765f7c..988b06811da 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -84,13 +84,13 @@ public: AST_Type *ft, UTL_ScopedName *n); - virtual ~AST_UnionBranch (void); + virtual ~AST_UnionBranch (); - UTL_LabelList *labels (void) const; + UTL_LabelList *labels () const; AST_UnionLabel *label (unsigned long index = 0); - unsigned long label_list_length (void); + unsigned long label_list_length (); // Called if our labels are enum values - adds them to the // enclosing scope's name_referenced list. @@ -110,7 +110,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h index 65dc9013a93..14a6121d7e3 100644 --- a/TAO/TAO_IDL/include/ast_union_fwd.h +++ b/TAO/TAO_IDL/include/ast_union_fwd.h @@ -14,10 +14,10 @@ public: AST_UnionFwd (AST_Union *dummy, UTL_ScopedName *n); - virtual ~AST_UnionFwd (void); + virtual ~AST_UnionFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 87f66e08704..28c5e0275f2 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -87,11 +87,11 @@ public: AST_UnionLabel (UnionLabel lk, AST_Expression *lv); - virtual ~AST_UnionLabel (void); + virtual ~AST_UnionLabel (); - UnionLabel label_kind (void); + UnionLabel label_kind (); - AST_Expression *label_val (void); + AST_Expression *label_val (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -100,7 +100,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data. diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h index f34d66d4ec5..9da57a5327f 100644 --- a/TAO/TAO_IDL/include/ast_uses.h +++ b/TAO/TAO_IDL/include/ast_uses.h @@ -11,11 +11,11 @@ public: AST_Type *uses_type, bool is_multiple); - virtual ~AST_Uses (void); + virtual ~AST_Uses (); // Data Accessors. - AST_Type *uses_type (void) const; - bool is_multiple (void) const; + AST_Type *uses_type () const; + bool is_multiple () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 40e5cc87c50..4ea5ec52eb5 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -10,10 +10,10 @@ public: AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type); - virtual ~AST_ValueBox (void); + virtual ~AST_ValueBox (); // Data Accessors. - AST_Type *boxed_type (void) const; + AST_Type *boxed_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -22,7 +22,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 4f5583e41b3..9309da49809 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -21,7 +21,7 @@ public: bool truncatable, bool custom); - virtual ~AST_ValueType (void); + virtual ~AST_ValueType (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. @@ -29,18 +29,18 @@ public: // This also calls the base class version. virtual void redefine (AST_Interface *from); - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; - AST_Type *inherits_concrete (void) const; + AST_Type *inherits_concrete () const; - AST_Type *supports_concrete (void) const; + AST_Type *supports_concrete () const; - bool truncatable (void) const; - bool custom (void) const; + bool truncatable () const; + bool custom () const; - virtual bool will_have_factory (void); + virtual bool will_have_factory (); // Called from y.tab.cpp to set the factory decl seen bit. // Look up a scoped name in the supported interface list. @@ -55,10 +55,10 @@ public: // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -84,7 +84,7 @@ protected: bool derived_from_primary_key_base (const AST_ValueType *node, const AST_ValueType *pk_base) const; - AST_ValueType *lookup_primary_key_base (void) const; + AST_ValueType *lookup_primary_key_base () const; }; #endif // _AST_INTERFACE_AST_VALUETYPE_HH diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h index 736271cc50c..6e9e9ce38b4 100644 --- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h +++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h @@ -12,10 +12,10 @@ public: AST_ValueTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_ValueTypeFwd (void); + virtual ~AST_ValueTypeFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index 3a45c23a461..70c4fc73f7e 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -85,7 +85,7 @@ class AST_Annotation_Decl; class TAO_IDL_FE_Export ast_visitor { public: - virtual ~ast_visitor (void); + virtual ~ast_visitor (); virtual int visit_decl (AST_Decl *d) = 0; virtual int visit_scope (UTL_Scope *node) = 0; @@ -143,7 +143,7 @@ public: protected: // For abstract class. - ast_visitor (void); + ast_visitor (); }; #endif /* TAO_IDL_FE_DLL_AST_VISITOR_H */ diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h index 2c8ddd419db..7890633316a 100644 --- a/TAO/TAO_IDL/include/ast_visitor_context.h +++ b/TAO/TAO_IDL/include/ast_visitor_context.h @@ -23,18 +23,18 @@ class TAO_IDL_FE_Export ast_visitor_context { public: - ast_visitor_context (void); + ast_visitor_context (); ast_visitor_context (const ast_visitor_context &ctx); - ~ast_visitor_context (void); + ~ast_visitor_context (); // Accessors/mutators for template-related storage. - FE_Utils::T_PARAMLIST_INFO *template_params (void) const; + FE_Utils::T_PARAMLIST_INFO *template_params () const; void template_params (FE_Utils::T_PARAMLIST_INFO *args); - FE_Utils::T_ARGLIST const *template_args (void) const; + FE_Utils::T_ARGLIST const *template_args () const; void template_args (FE_Utils::T_ARGLIST const *args); protected: diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h index 2ad0fdceea1..6c7c5ef2981 100644 --- a/TAO/TAO_IDL/include/ast_visitor_reifying.h +++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h @@ -42,9 +42,9 @@ class ast_visitor_reifying : public ast_visitor public: ast_visitor_reifying (ast_visitor_context *ctx); - virtual ~ast_visitor_reifying (void); + virtual ~ast_visitor_reifying (); - AST_Decl *reified_node (void) const; + AST_Decl *reified_node () const; virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h index c9270d73a14..1a0dafdd241 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h @@ -38,7 +38,7 @@ public: ast_visitor_tmpl_module_inst (ast_visitor_context *ctx, bool ref_only = false); - virtual ~ast_visitor_tmpl_module_inst (void); + virtual ~ast_visitor_tmpl_module_inst (); virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h index 4b45f2a5abf..9ac63d648f9 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h @@ -29,7 +29,7 @@ class ast_visitor_tmpl_module_ref public: ast_visitor_tmpl_module_ref (ast_visitor_context *ctx); - virtual ~ast_visitor_tmpl_module_ref (void); + virtual ~ast_visitor_tmpl_module_ref (); virtual int visit_template_module_ref (AST_Template_Module_Ref *node); }; diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h index 757d14db7e1..03a543b161f 100644 --- a/TAO/TAO_IDL/include/drv_extern.h +++ b/TAO/TAO_IDL/include/drv_extern.h @@ -67,17 +67,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // External functions for the IDL compiler driver program. extern void DRV_parse_args (long, char **); -extern void DRV_usage (void); +extern void DRV_usage (); extern void DRV_pre_proc (char const * myfile); -extern void DRV_store_env_include_paths (void); -extern void DRV_cpp_init (void); +extern void DRV_store_env_include_paths (); +extern void DRV_cpp_init (); extern ACE_CString& DRV_add_include_path (ACE_CString&, const char* p, const char* suffix, bool is_system); -extern void DRV_cpp_post_init (void); +extern void DRV_cpp_post_init (); extern void DRV_cpp_putarg (char const * str); extern void DRV_cpp_new_location (char const * new_loc); -extern void DRV_get_orb_idl_includes (void); +extern void DRV_get_orb_idl_includes (); // Not used by all backends. extern void DRV_push_file (char const * s); diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h index 4e14c6426d4..55280e7ade4 100644 --- a/TAO/TAO_IDL/include/fe_component_header.h +++ b/TAO/TAO_IDL/include/fe_component_header.h @@ -20,14 +20,14 @@ public: UTL_ScopedName *base_component, UTL_NameList *supports, bool compile_now); - virtual ~FE_ComponentHeader (void); + virtual ~FE_ComponentHeader (); // Data Accessors. - AST_Component *base_component (void) const; - AST_Type **supports (void) const; - long n_supports (void) const; - AST_Interface **supports_flat (void) const; - long n_supports_flat (void) const; + AST_Component *base_component () const; + AST_Type **supports () const; + long n_supports () const; + AST_Interface **supports_flat () const; + long n_supports_flat () const; protected: void compile_inheritance (UTL_ScopedName *base_component); diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h index d55d8c3a735..98f5ce06a95 100644 --- a/TAO/TAO_IDL/include/fe_declarator.h +++ b/TAO/TAO_IDL/include/fe_declarator.h @@ -86,19 +86,19 @@ public: FE_Declarator (UTL_ScopedName *n, DeclaratorType dt, AST_Decl *cp); - virtual ~FE_Declarator (void) {} + virtual ~FE_Declarator () {} // Data Accessors. - AST_Decl *complex_part (void); - UTL_ScopedName *name (void); - DeclaratorType decl_type (void); + AST_Decl *complex_part (); + UTL_ScopedName *name (); + DeclaratorType decl_type (); // Other Operations. // Compose an FE_Declarator into an AST_Type once all the needed information // is available. AST_Type *compose (AST_Decl* tc); - virtual void destroy (void); + virtual void destroy (); private: // Data. diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h index 47f95a109c5..206f1ed679e 100644 --- a/TAO/TAO_IDL/include/fe_extern.h +++ b/TAO/TAO_IDL/include/fe_extern.h @@ -71,15 +71,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Declares all global functions for the FE -TAO_IDL_FE_Export void FE_init (void); -TAO_IDL_FE_Export void FE_populate (void); +TAO_IDL_FE_Export void FE_init (); +TAO_IDL_FE_Export void FE_populate (); TAO_IDL_FE_Export void FE_extract_env_include_paths (ACE_Unbounded_Queue<ACE_CString> &list); -TAO_IDL_FE_Export void FE_store_env_include_paths (void); -TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (void); -TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (void); +TAO_IDL_FE_Export void FE_store_env_include_paths (); +TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (); +TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (); TAO_IDL_FE_Export int -FE_yyparse (void); +FE_yyparse (); TAO_IDL_FE_Export void FE_yydebug (bool); @@ -97,10 +97,10 @@ class UTL_Error; class UTL_Indenter; TAO_IDL_FE_Export UTL_Error * -FE_new_UTL_Error (void); +FE_new_UTL_Error (); TAO_IDL_FE_Export UTL_Indenter * -FE_new_UTL_Indenter (void); +FE_new_UTL_Indenter (); /** * Exception thrown when exiting prematurely in the front end. diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h index 7583a75a398..ae13bc609cc 100644 --- a/TAO/TAO_IDL/include/fe_home_header.h +++ b/TAO/TAO_IDL/include/fe_home_header.h @@ -23,12 +23,12 @@ public: UTL_ScopedName *managed_component, UTL_ScopedName *primary_key); - virtual ~FE_HomeHeader (void); + virtual ~FE_HomeHeader (); // Data Accessors. - AST_Home *base_home (void) const; - AST_Component *managed_component (void) const; - AST_Type *primary_key (void) const; + AST_Home *base_home () const; + AST_Component *managed_component () const; + AST_Type *primary_key () const; protected: AST_Home *base_home_; diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index 243e5dda333..55394c44e90 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -84,22 +84,22 @@ public: bool is_abstract, bool compile_now); - virtual ~FE_InterfaceHeader (void); + virtual ~FE_InterfaceHeader (); // Data Accessors. - UTL_ScopedName *name (void) const; - AST_Type **inherits (void) const; - long n_inherits (void) const; - AST_Interface **inherits_flat (void) const; - long n_inherits_flat (void) const; + UTL_ScopedName *name () const; + AST_Type **inherits () const; + long n_inherits () const; + AST_Interface **inherits_flat () const; + long n_inherits_flat () const; - bool is_local (void) const; + bool is_local () const; // See if we are a local interface. - bool is_abstract (void) const; + bool is_abstract () const; // See if we are an abstract interface. - virtual void destroy (void); + virtual void destroy (); // Destroy anything allocated for this class. // Operations. @@ -121,9 +121,9 @@ protected: bool already_seen (AST_Type *ip); bool already_seen_flat (AST_Interface *ip); - void install_in_header (void); + void install_in_header (); - void destroy_flat_arrays (void); + void destroy_flat_arrays (); // Data. protected: diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 0a25d4310c1..0dc51b91176 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -18,16 +18,16 @@ public: UTL_NameList *supports, bool truncatable, bool is_eventtype = false); - virtual ~FE_OBVHeader (void); + virtual ~FE_OBVHeader (); // Data Accessors. - AST_Type **supports (void) const; - long n_supports (void) const; - AST_Type *inherits_concrete (void) const; - AST_Type *supports_concrete (void) const; - bool truncatable (void) const; + AST_Type **supports () const; + long n_supports () const; + AST_Type *inherits_concrete () const; + AST_Type *supports_concrete () const; + bool truncatable () const; - virtual void destroy (void); + virtual void destroy (); // Destroy anything allocated for this class. protected: diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h index 6cf66a62418..fddc6e5202d 100644 --- a/TAO/TAO_IDL/include/fe_utils.h +++ b/TAO/TAO_IDL/include/fe_utils.h @@ -27,7 +27,7 @@ struct TAO_IDL_FE_Export FE_Utils ACE_CString name_; ACE_CString seq_param_ref_; - T_Param_Info (void); + T_Param_Info (); }; typedef ACE_Unbounded_Queue<T_Param_Info> T_PARAMLIST_INFO; @@ -36,7 +36,7 @@ struct TAO_IDL_FE_Export FE_Utils struct T_ARGLIST : ACE_Unbounded_Queue<AST_Decl *> { - void destroy (void); + void destroy (); }; /// Convert from a predefined type to an expression type. @@ -68,7 +68,7 @@ struct TAO_IDL_FE_Export FE_Utils /// For the executor IDL file, when a pragma ciao ami receptacle /// name is multiplex. static void - create_implied_ami_uses_stuff (void); + create_implied_ami_uses_stuff (); /// Case insensitive for Windows, otherwise not. static int @@ -97,7 +97,7 @@ struct TAO_IDL_FE_Export FE_Utils /// Validate the included idl files, somefiles might have been /// ignored by the preprocessor. static void - validate_included_idl_files (void); + validate_included_idl_files (); /// Check if included file is in TAO specific include dirs. static bool diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index d00dffdcbd8..485486a60dd 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -311,77 +311,77 @@ public: UNKNOWN_ANNOTATIONS_IGNORE }; - IDL_GlobalData (void); - ~IDL_GlobalData (void); + IDL_GlobalData (); + ~IDL_GlobalData (); // Operations - UTL_ScopeStack &scopes (void); // Scopes stack + UTL_ScopeStack &scopes (); // Scopes stack - AST_Root *root (void); // Root of AST + AST_Root *root (); // Root of AST void set_root (AST_Root *); // Set it - AST_Generator *gen (void); // Generator + AST_Generator *gen (); // Generator void set_gen (AST_Generator *); // Set it - AST_ValueType *primary_key_base (void); // PrimaryKeyBase + AST_ValueType *primary_key_base (); // PrimaryKeyBase void primary_key_base (AST_ValueType *); // Set it - UTL_Error *err (void); // Error reporter + UTL_Error *err (); // Error reporter void set_err (UTL_Error *); // Set it - int err_count (void); // How many errors? + int err_count (); // How many errors? void set_err_count (int); // Set it - long lineno (void); // Where in file? + long lineno (); // Where in file? void set_lineno (long); // Set it - UTL_String *filename (void); // What file? + UTL_String *filename (); // What file? void set_filename (UTL_String *); // Set it - UTL_String *main_filename (void); // What's the main + UTL_String *main_filename (); // What's the main // file name? void set_main_filename (UTL_String *); // Set it - UTL_String *real_filename (void); // What's the real + UTL_String *real_filename (); // What's the real // file name? void set_real_filename (UTL_String *); // Set it - UTL_String *stripped_filename (void); // Stripped filename + UTL_String *stripped_filename (); // Stripped filename void set_stripped_filename (UTL_String *); // Set it - bool imported (void); // Are we imported? - bool import (void); // Is import on? + bool imported (); // Are we imported? + bool import (); // Is import on? void set_import (bool); // Set it - bool in_main_file (void); // Are we? + bool in_main_file (); // Are we? void set_in_main_file (bool); // Set it - const char *prog_name (void); // Invoked as.. + const char *prog_name (); // Invoked as.. void set_prog_name (const char *); // Set it - const char *cpp_location (void); // Where's CPP? + const char *cpp_location (); // Where's CPP? void set_cpp_location (const char *);// Set it - long compile_flags (void); // What flags are on? + long compile_flags (); // What flags are on? void set_compile_flags (long); // Turn some on or off - char *local_escapes (void); // Get local escapes + char *local_escapes (); // Get local escapes void set_local_escapes (const char *);// Set it - UTL_Indenter *indent (void); // Get indenter + UTL_Indenter *indent (); // Get indenter void set_indent (UTL_Indenter *); // Set it void store_include_file_name (UTL_String *); - UTL_String **include_file_names (void); // Array of file names + UTL_String **include_file_names (); // Array of file names void set_include_file_names (UTL_String **); // Set it - unsigned long n_include_file_names (void); // How many + unsigned long n_include_file_names (); // How many void set_n_include_file_names (unsigned long n); - void reset_flag_seen (void); + void reset_flag_seen (); // = Types & methods supporting DDS DCPS sequence definitions (from #pragma) typedef ACE_Unbounded_Queue<char *> DCPS_Sequence_Types_List; @@ -418,7 +418,7 @@ public: void dcps_support_zero_copy_read (bool value); // BE calls to check the status of zero-copy read support - bool dcps_support_zero_copy_read (void) const; + bool dcps_support_zero_copy_read () const; // FE calls when #pragma DCPS_DATA_SEQUENCE_TYPE is processed void set_dcps_sequence_type (const char* seq_type); @@ -430,7 +430,7 @@ public: void dcps_gen_zero_copy_read (bool value); // BE calls to check the status of zero-copy read support - bool dcps_gen_zero_copy_read (void) const; + bool dcps_gen_zero_copy_read () const; // = Access methods to deal with other IDL files included in the main // IDL file. These IDL files are exactly the same strings that are @@ -441,20 +441,20 @@ public: void add_to_included_idl_files (const char *file_name); // Get all the files. - char** included_idl_files (void); + char** included_idl_files (); // The number of currently availabe include files. - size_t n_included_idl_files (void); + size_t n_included_idl_files (); // Set the number of included_idl_files. Use this carefully. This // method is used when we validate all the #included idl files, // against the ones that we get after preprocessing. void n_included_idl_files (size_t n); - ParseState parse_state (void); // What state we're in + ParseState parse_state (); // What state we're in void set_parse_state (ParseState s); // Set it - UTL_String *idl_src_file (void); + UTL_String *idl_src_file (); // Returns the IDL source file being compiled. void idl_src_file (UTL_String *); @@ -465,7 +465,7 @@ public: // files. By default, IDL compiler looks for TEMP env variable and // if it is not set, "/tmp/" is assigned. - const char *temp_dir (void) const; + const char *temp_dir () const; // Get the directory where the IDL compiler can keep all its temp // files. By default, IDL compiler looks for TEMP env variable and // if it is not set, "/tmp/" is assigned. @@ -473,49 +473,49 @@ public: void tao_root (const char *s); // Set the path of TAO_ROOT. - const char *tao_root (void) const; + const char *tao_root () const; // Get the path for TAO_ROOT. void gperf_path (const char *s); // Set the path for the perfect hashing program (GPERF). - const char *gperf_path (void) const; + const char *gperf_path () const; // Get the path for the perfect hashing program (GPERF). void ident_string (const char *s); // Set the value of the #ident string. - const char *ident_string (void) const; + const char *ident_string () const; // Get the value of the #ident string. void case_diff_error (bool); // report an error (1) for indentifiers in the same scope // that differ only by case, or report a warning (0). - bool case_diff_error (void); + bool case_diff_error (); // are we strict about case-only differences or not? void nest_orb (bool); // Set on or off whether we are using the NEST ORB. - bool nest_orb (void); + bool nest_orb (); // are we beIng used with the NEST ORB? - void destroy (void); + void destroy (); // Cleanup function. void append_idl_flag (const char *s); // Save each flag passed to the IDL compiler. - const char *idl_flags (void) const; + const char *idl_flags () const; // Get a string representation of the flags // passed to the idl compiler. ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> & - idl_keywords (void); + idl_keywords (); // Accessor for the IDL keyword container. - ACE_Unbounded_Stack<char *> & pragma_prefixes (void); + ACE_Unbounded_Stack<char *> & pragma_prefixes (); // Accessor for the pragma prefix container. void update_prefix (char *filename); @@ -524,11 +524,11 @@ public: long seen_include_file_before (char *); // Seen this include before? - long last_seen_index (void) const; + long last_seen_index () const; void last_seen_index (long val); // Accessors for last_seen_index_ member. - bool preserve_cpp_keywords (void); + bool preserve_cpp_keywords (); // Whether we should not mung idl element names that are // C++ keywords e.g. delete, operator etc. with _cxx_ prefix. // Should be true when being used by the IFR Service @@ -543,98 +543,98 @@ public: // specific paths and false for paths provided by user. void add_rel_include_path (const char *s); - ACE_Unbounded_Queue<char *> const & rel_include_paths (void) const; + ACE_Unbounded_Queue<char *> const & rel_include_paths () const; // Accessor/mutator for the rel_include_paths_ member. void add_ciao_lem_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_lem_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_lem_file_names (); // Accessor/mutator for the ciao_lem_file_names_ member. void add_ciao_rti_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (); // Accessor/mutator for the ciao_rti_ts_file_names_ member. void add_ciao_spl_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names (); // Accessor/mutator for the ciao_spl_ts_file_names_ member. void add_ciao_oci_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (); // Accessor/mutator for the ciao_oci_ts_file_names_ member. void add_ciao_coredx_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (); // Accessor/mutator for the ciao_coredx_ts_file_names_ member. void add_ciao_ami_iface_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void); + ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (); // Accessor/mutator for the ciao_ami_iface_names_ member. void add_ciao_ami_recep_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void); + ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (); // Accessor/mutator for the ciao_ami_recep_names_ member. void add_included_ami_recep_names (const char *s); - ACE_Unbounded_Queue<char *> & included_ami_recep_names (void); + ACE_Unbounded_Queue<char *> & included_ami_recep_names (); // Accessor/mutator for the included_ami_recep_names_ member. - bool included_ami_receps_done (void) const; + bool included_ami_receps_done () const; void included_ami_receps_done (bool val); void add_ciao_ami_idl_fnames (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void); + ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (); // Accessor/mutator for the included_ami_idl_fnames_ member. void add_dds4ccm_impl_fnames (const char *s); - ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void); + ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (); // Accessor mutator for the dds4ccm_impl_fnames_ member. - ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void); + ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (); // Accessor for the member ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> & - file_prefixes (void); + file_prefixes (); // Accessor for the IDL file prefix container. - bool pass_orb_idl (void) const; + bool pass_orb_idl () const; void pass_orb_idl (bool val); // Accessor for the pass_orb_idl_ member. - bool using_ifr_backend (void) const; + bool using_ifr_backend () const; void using_ifr_backend (bool val); // Accessor for the using_ifr_backend_ member. - bool ignore_idl3 (void) const; + bool ignore_idl3 () const; void ignore_idl3 (bool val); // Accessor for the ignore_idl3_ member. - int check_gperf (void); + int check_gperf (); // Currently called only from IDL backend, but could be useful elsewhere. - void fini (void); + void fini (); // Do final cleanup just before process exits. - ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (void); + ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (); // Accessor for the member. - void check_primary_keys (void); + void check_primary_keys (); // Called affer yy_parse() returns - iterates over our list // of primary keys. Must be called this late so that we can // be sure that all forward declared stucts or unions that // might be used in such a valuetype are fully defined. - const char *recursion_start (void) const; + const char *recursion_start () const; void recursion_start (const char *val); // Accessors for the member. - bool multi_file_input (void) const; + bool multi_file_input () const; void multi_file_input (bool val); // Accessors for the member. - const char *big_file_name (void) const; + const char *big_file_name () const; // Just get the const string. - FE_Utils::T_PARAMLIST_INFO const *current_params (void) const; + FE_Utils::T_PARAMLIST_INFO const *current_params () const; void current_params (FE_Utils::T_PARAMLIST_INFO *params); // Accessors for the member. If UTL_Scope::lookup_by_name() // has a 0 result, it will check this param list (if it is not @@ -643,14 +643,14 @@ public: // referenced template parameter of the eclosing template // module. - UTL_StrList const *alias_params (void) const; + UTL_StrList const *alias_params () const; void alias_params (UTL_StrList *params); // Accessors for the member. If we are parsing a template // module reference, we traverse the scope of the referenced // template module, but create param holders with the // alias names. - UTL_StrList const *for_new_holder (void) const; + UTL_StrList const *for_new_holder () const; void for_new_holder (UTL_StrList *params); // Accessors for the member. If a lookup matches something // from current_params(), the actual created param holder must @@ -661,7 +661,7 @@ public: static char* translateName (const char* name, char *name_buf); #endif - AST_Module *corba_module (void) const; + AST_Module *corba_module () const; void corba_module (AST_Module *m); // Accessors for the member. @@ -676,7 +676,7 @@ public: typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info> Unbounded_Paths_Queue_Iterator; - Unbounded_Paths_Queue &include_paths (void); + Unbounded_Paths_Queue &include_paths (); // Accessor for the member. enum ANON_TYPE_DIAGNOSTIC @@ -694,20 +694,20 @@ public: /// Has anon_type_diagnostic () been called? bool explicit_anon_type_diagnostic () const; - bool anon_error (void) const; - bool anon_warning (void) const; - bool anon_silent (void) const; + bool anon_error () const; + bool anon_warning () const; + bool anon_silent () const; // Simple checks for the value of anon_type_diagnostic_. - bool in_typedef (void) const; + bool in_typedef () const; void in_typedef (bool val); // Accessors for the member. - bool in_tmpl_mod_no_alias (void) const; + bool in_tmpl_mod_no_alias () const; void in_tmpl_mod_no_alias (bool val); // Accessors for the member. - bool in_tmpl_mod_alias (void) const; + bool in_tmpl_mod_alias () const; void in_tmpl_mod_alias (bool val); // Accessors for the member. diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h index 5f0528977bf..ab2818f9bf8 100644 --- a/TAO/TAO_IDL/include/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_decllist.h @@ -88,10 +88,10 @@ public: UTL_DeclList *cdr); // Get element - FE_Declarator *head (void); + FE_Declarator *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data @@ -109,7 +109,7 @@ public: UTL_DecllistActiveIterator (UTL_DeclList *s); // Get current item - FE_Declarator *item (void); + FE_Declarator *item (); }; #endif // _UTL_DECLLIST_UTL_DECLLIST_HH diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index b80970dbe42..4fc0afe033e 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -245,7 +245,7 @@ public: void version_syntax_error (const char *msg); // Repost an attempt to reset the version. - void version_reset_error (void); + void version_reset_error (); // Report an attempt to change the id once set. void id_reset_error (const char *o, @@ -381,7 +381,7 @@ public: // Report illegal infix operator error (they can be used // only with integer, floating point or fixed point expressions. - void illegal_infix (void); + void illegal_infix (); // Report local type used in remote operation. void local_remote_mismatch (AST_Decl *l, @@ -411,7 +411,7 @@ public: AST_Decl *loc); // Error (default) or warning (set by command line option). - void anonymous_type_diagnostic (void); + void anonymous_type_diagnostic (); // Reference to an item in the scope of a template // module was not via an alias. diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h index a04f6276994..5ba9bbbcfb7 100644 --- a/TAO/TAO_IDL/include/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_exceptlist.h @@ -84,14 +84,14 @@ public: UTL_ExceptList *cdr); // Get list item. - AST_Type *head (void); + AST_Type *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Copies the UTL_ExceptList pointers but not the // contained AST_Exceptions. - virtual UTL_ExceptList *copy (void); + virtual UTL_ExceptList *copy (); private: // Data. @@ -106,7 +106,7 @@ public: UTL_ExceptlistActiveIterator (UTL_ExceptList *s); // Get current item - AST_Type *item (void); + AST_Type *item (); }; #endif // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h index 3a7f8ebc875..21ff96e039f 100644 --- a/TAO/TAO_IDL/include/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_exprlist.h @@ -84,10 +84,10 @@ public: UTL_ExprList *cdr); // Get list item. - AST_Expression *head (void); + AST_Expression *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data. @@ -101,7 +101,7 @@ public: UTL_ExprlistActiveIterator (UTL_ExprList *s); // Get current item. - AST_Expression *item (void); + AST_Expression *item (); }; #endif // _UTL_EXPRLIST_UTL_EXPRLIST_HH diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index bae3e637400..85ceadbf06d 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -72,7 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export Identifier { public: - Identifier (void); + Identifier (); // Default Constructor. Identifier (const char *s); @@ -80,7 +80,7 @@ public: Identifier (const Identifier &other); - virtual ~Identifier (void); + virtual ~Identifier (); // Destructor. // Operations @@ -89,7 +89,7 @@ public: * Get the underlying string. */ ///{ - char *get_string (void); + char *get_string (); const char *get_string () const; ///} @@ -107,16 +107,16 @@ public: bool case_compare_quiet (Identifier *other); // Like the above but suppressing error or warning I/O - Identifier *copy (void); + Identifier *copy (); // Create a deep copy. - bool escaped (void) const; + bool escaped () const; // Accessor for the member. virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to an ostream. - virtual void destroy (void); + virtual void destroy (); // Cleanup function. bool operator== (const Identifier &other) const; diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h index ea59e45aca8..a382a35963e 100644 --- a/TAO/TAO_IDL/include/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_idlist.h @@ -90,25 +90,25 @@ public: UTL_IdList *cdr); // Constructor(s) - virtual ~UTL_IdList (void) {} + virtual ~UTL_IdList () {} // destructor virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to ostream. - virtual void destroy (void); + virtual void destroy (); // Cleanup function. - virtual UTL_IdList *copy (void); + virtual UTL_IdList *copy (); // Copy the list. - Identifier *head (void); + Identifier *head (); // Get element. - Identifier *last_component (void); + Identifier *last_component (); // Get last element in this list. - Identifier *first_component (void); + Identifier *first_component (); // Get first element in this list holding a non-empty string. int compare (UTL_IdList *other); @@ -141,7 +141,7 @@ public: UTL_IdListActiveIterator (UTL_IdList *s); /// Retrieves the next item. - Identifier *item (void); + Identifier *item (); }; #endif // _UTL_IDLIST_UTL_IDLIST_HH diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h index 8fe36f5b7db..da328055426 100644 --- a/TAO/TAO_IDL/include/utl_indenter.h +++ b/TAO/TAO_IDL/include/utl_indenter.h @@ -78,17 +78,17 @@ class UTL_Indenter // =DESCRIPTION // useful in generating indented output public: - UTL_Indenter (void); + UTL_Indenter (); - ~UTL_Indenter (void) {} + ~UTL_Indenter () {} - void reset (void); + void reset (); // Reset indentation level to 0. - void increase (void); + void increase (); // Increase indentation level. - void decrease (void); + void decrease (); // Decrease indentation level. void skip_to (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h index 161b294503f..d2e71a94204 100644 --- a/TAO/TAO_IDL/include/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_labellist.h @@ -84,13 +84,13 @@ public: UTL_LabelList *cdr); // Get list item. - AST_UnionLabel *head (void); + AST_UnionLabel *head (); // Override of base class method. - virtual UTL_LabelList *copy (void); + virtual UTL_LabelList *copy (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: AST_UnionLabel *pd_car_data; @@ -103,7 +103,7 @@ public: UTL_LabellistActiveIterator (UTL_LabelList *source); // Get current item. - AST_UnionLabel *item (void); + AST_UnionLabel *item (); }; #endif // _UTL_LABELLIST_UTL_LABELLIST_HH diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index 7e7ed5d781f..a70b9d0ff5d 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -85,25 +85,25 @@ class TAO_IDL_FE_Export UTL_List public: UTL_List (UTL_List *c); - virtual ~UTL_List (void); + virtual ~UTL_List (); // Smash last cdr pointer in "this" with l. void nconc (UTL_List *l); // Copy the list starting at "this". - virtual UTL_List *copy (void); + virtual UTL_List *copy (); // Get next list. - UTL_List *tail (void); + UTL_List *tail (); // Set next list void set_tail (UTL_List *l); // How long is this list? - ACE_CDR::Long length (void); + ACE_CDR::Long length (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // The next list. @@ -123,13 +123,13 @@ public: UTL_ListActiveIterator (UTL_List *s); - virtual ~UTL_ListActiveIterator (void) {} + virtual ~UTL_ListActiveIterator () {} // Get next list. - virtual void next (void); + virtual void next (); // Are we at the end of this list? - virtual bool is_done (void); + virtual bool is_done (); protected: // On what to iterate? diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index 46b946faa5b..2a1d7ab02af 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -82,14 +82,14 @@ public: UTL_NameList *cdr); // Get list item. - UTL_ScopedName *head (void); + UTL_ScopedName *head (); // Accessors. - bool truncatable (void) const; + bool truncatable () const; void truncatable (bool val); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // List item. @@ -106,7 +106,7 @@ public: UTL_NamelistActiveIterator (UTL_NameList *source); // Get current item. - UTL_ScopedName *item (void); + UTL_ScopedName *item (); }; #endif // _UTL_NAMELIST_UTL_NAMELIST_HH diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 658c2be463b..1b1a5c41e54 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -155,14 +155,14 @@ public: // Operations. // Constructor(s). - UTL_Scope (void); + UTL_Scope (); UTL_Scope (AST_Decl::NodeType nt); // Destructor. - virtual ~UTL_Scope (void); + virtual ~UTL_Scope (); // Data Accessors. - AST_Decl::NodeType scope_node_type (void) + AST_Decl::NodeType scope_node_type () { return pd_scope_node_type; } @@ -206,7 +206,7 @@ public: AST_Decl *&final_parent_decl); // How many entries are used? - virtual unsigned long nmembers (void); + virtual unsigned long nmembers (); // If the Identifier string (from the scoped name which has been // already determined to be of length 1) matches a param, @@ -227,11 +227,11 @@ public: void add_to_name_referenced (Identifier *id); // Accessors for the has_prefix_ member. - bool has_prefix (void); + bool has_prefix (); void has_prefix (bool val); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -533,19 +533,19 @@ public: UTL_Scope::ScopeIterationKind ik); // Advance to next item. - void next (void); + void next (); // Get current item. - AST_Decl *item (void); + AST_Decl *item (); // Have we iterated over entire scope? - bool is_done (void); + bool is_done (); // What kind of iterator is this? - UTL_Scope::ScopeIterationKind iteration_kind (void); + UTL_Scope::ScopeIterationKind iteration_kind (); // What stage are we in with this iterator? - UTL_Scope::ScopeIterationKind iteration_stage (void); + UTL_Scope::ScopeIterationKind iteration_stage (); private: // Scope to iterate over. diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h index d83159b6db7..ffc7f909668 100644 --- a/TAO/TAO_IDL/include/utl_stack.h +++ b/TAO/TAO_IDL/include/utl_stack.h @@ -79,35 +79,35 @@ class UTL_ScopeStackActiveIterator; class TAO_IDL_FE_Export UTL_ScopeStack { public: - UTL_ScopeStack (void); - ~UTL_ScopeStack (void); + UTL_ScopeStack (); + ~UTL_ScopeStack (); /// The initial capacity and how much to increment the capacity when needed. static const size_t increments; // Return top element. - UTL_Scope *top (void); + UTL_Scope *top (); // Pop top element. - void pop (void); + void pop (); // Clear entire stack. - void clear (void); + void clear (); // Push an element on the stack and return stack. UTL_ScopeStack *push (UTL_Scope *el); // How deep is the stack now? - unsigned long depth (void); + unsigned long depth (); // Return bottom element. - UTL_Scope *bottom (void); + UTL_Scope *bottom (); // Return (top - 1) element. - UTL_Scope *next_to_top (void); + UTL_Scope *next_to_top (); // return topmost non-NULL element. - UTL_Scope *top_non_null (void); + UTL_Scope *top_non_null (); /** * Call lookup_by_name on all the scopes from the top down. @@ -136,13 +136,13 @@ public: UTL_ScopeStackActiveIterator (UTL_ScopeStack &s); // Advance to next element. - void next (void); + void next (); // Get current item. - UTL_Scope* item (void); + UTL_Scope* item (); // Is the iteration finished? - bool is_done (void) const; + bool is_done () const; private: // On what to iterate? diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 9489421c04f..7b6d788df13 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -79,24 +79,24 @@ class TAO_IDL_FE_Export UTL_String // =DESCRIPTION // string class to store identifiers public: - UTL_String (void); + UTL_String (); UTL_String (const char *str, bool take_copy= false); UTL_String (UTL_String *s, bool force_copy= false); - virtual ~UTL_String (void); + virtual ~UTL_String (); - virtual void destroy (void); + virtual void destroy (); // Cleanup function. virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to the ostream. - char *get_string (void) {return this->p_str;} + char *get_string () {return this->p_str;} // Get contents of utl_string. - char *get_canonical_rep (void); + char *get_canonical_rep (); // Get canonical representation. This is (implemented as) the all upper // case corresponding string. diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index f355ba746b8..2a6c8f60c5f 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -84,25 +84,25 @@ public: UTL_StrList (UTL_String *s, UTL_StrList *cdr); - virtual ~UTL_StrList (void); + virtual ~UTL_StrList (); // AST Dumping virtual void dump (ACE_OSTREAM_TYPE &o); // Copy a list of strings - virtual UTL_List *copy (void); + virtual UTL_List *copy (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Get list element - UTL_String *head (void); + UTL_String *head (); // Set the list element void set_head (UTL_String *); // Get last element in this list - UTL_String *last_component (void); + UTL_String *last_component (); private: // The list item @@ -117,7 +117,7 @@ public: UTL_StrlistActiveIterator(UTL_StrList *s); // Get current item. - UTL_String *item (void); + UTL_String *item (); }; #endif // _UTL_STRLIST_UTL_STRLIST_HH diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index c2079e47d8e..1ed63df688b 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -134,7 +134,7 @@ UTL_Scope::UTL_Scope () pd_name_referenced (nullptr), pd_name_referenced_allocated (0), pd_name_referenced_used (0), - has_prefix_ (0), + has_prefix_ (false), which_pseudo_ (PSEUDO_ABSTRACTBASE) { } @@ -153,7 +153,7 @@ UTL_Scope::UTL_Scope (AST_Decl::NodeType nt) pd_name_referenced (nullptr), pd_name_referenced_allocated (0), pd_name_referenced_used (0), - has_prefix_ (0), + has_prefix_ (false), which_pseudo_ (PSEUDO_ABSTRACTBASE) { } diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp index 1939f4cd587..d9070dfa65f 100644 --- a/TAO/TAO_IDL/util/utl_string.cpp +++ b/TAO/TAO_IDL/util/utl_string.cpp @@ -224,7 +224,7 @@ UTL_String::destroy () if (this->copy_taken) { ACE::strdelete (this->p_str); - this->copy_taken = 0; + this->copy_taken = false; } this->p_str = nullptr; } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index f4707507c05..28563f1378f 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -1,9 +1,9 @@ #include "FP_Scheduler.h" -#include "ace/Atomic_Op.h" #include "tao/RTScheduling/Request_Interceptor.h" #include "test.h" +#include <atomic> -ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; +std::atomic<long> server_guid_counter; RTCORBA::Priority Segment_Sched_Param_Policy::value (void) diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index d1a9f4b6ba2..a26d17387d1 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -1,9 +1,9 @@ #include "MIF_Scheduler.h" -#include "ace/Atomic_Op.h" #include "tao/RTScheduling/Request_Interceptor.h" #include "test.h" +#include <atomic> -ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; +std::atomic<long> server_guid_counter; DT::DT (TAO_SYNCH_MUTEX &lock, int guid) diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h index a64e2292b94..a5714ebb4c1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h @@ -37,9 +37,10 @@ private: ACE_Auto_Ptr<ImR_Activator_ORB_Runner> runner_; private: - // Disallow copying and assignment. - ImR_Activator_Loader (const ImR_Activator_Loader &); - ImR_Activator_Loader &operator = (const ImR_Activator_Loader &); + ImR_Activator_Loader (const ImR_Activator_Loader &) = delete; + ImR_Activator_Loader &operator = (const ImR_Activator_Loader &) = delete; + ImR_Activator_Loader (ImR_Activator_Loader &&) = delete; + ImR_Activator_Loader &operator = (ImR_Activator_Loader &&) = delete; }; ACE_FACTORY_DECLARE (Activator, ImR_Activator_Loader) diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h index 6437f7c289c..4d0602ddfca 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.h @@ -22,11 +22,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Intrusive_Ref_Count_Handle_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> class LiveCheck; class LiveEntry; @@ -96,11 +92,7 @@ class Locator_Export LiveListener ACE_CString server_; private: -#if defined (ACE_HAS_CPP11) std::atomic<int> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_; -#endif /* ACE_HAS_CPP11 */ }; typedef TAO_Intrusive_Ref_Count_Handle<LiveListener> LiveListener_ptr; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h index 31735821a36..d5b154f929c 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h @@ -35,9 +35,10 @@ private: Options opts_; ACE_Auto_Ptr<ImR_Locator_ORB_Runner> runner_; private: - // Disallow copying and assignment. - ImR_Locator_Loader (const ImR_Locator_Loader &); - ImR_Locator_Loader &operator = (const ImR_Locator_Loader &); + ImR_Locator_Loader (const ImR_Locator_Loader &) = delete; + ImR_Locator_Loader &operator = (const ImR_Locator_Loader &) = delete; + ImR_Locator_Loader (ImR_Locator_Loader &&) = delete; + ImR_Locator_Loader &operator = (ImR_Locator_Loader &&) = delete; }; ACE_FACTORY_DECLARE (Locator, ImR_Locator_Loader) diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 4d1a0915e3c..8f06171529d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -161,11 +161,7 @@ namespace { #endif } -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_File_Lock> file_lock_; -#else - auto_ptr<ACE_File_Lock> file_lock_; -#endif FILE* file_; int flags_; bool locked_; diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 1fad41a8e47..baafac90542 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_Qos //------------------------------------------------------------ -TAO_AV_QoS::TAO_AV_QoS (void) +TAO_AV_QoS::TAO_AV_QoS () { } @@ -48,11 +48,11 @@ TAO_AV_QoS::convert (AVStreams::streamQoS &/*network_qos*/) // ---------------------------------------------------------------------- // AV_Null_MediaCtrl // ---------------------------------------------------------------------- -AV_Null_MediaCtrl::AV_Null_MediaCtrl (void) +AV_Null_MediaCtrl::AV_Null_MediaCtrl () { } -AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void) +AV_Null_MediaCtrl::~AV_Null_MediaCtrl () { } @@ -62,7 +62,7 @@ AV_Null_MediaCtrl::~AV_Null_MediaCtrl (void) // ---------------------------------------------------------------------- // Constructor -TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void) +TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl () :flow_count_ (0) { } @@ -288,7 +288,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name, } } -TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void) +TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl () { } @@ -312,7 +312,7 @@ TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */, const int MMDevice_Map_Hash_Key::hash_maximum_ = 10000; //default constructor. -MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (void) +MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key () { this->mmdevice_ = AVStreams::MMDevice::_nil (); } @@ -330,7 +330,7 @@ MMDevice_Map_Hash_Key::MMDevice_Map_Hash_Key (const MMDevice_Map_Hash_Key& hash_ } // destructor. -MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key (void) +MMDevice_Map_Hash_Key::~MMDevice_Map_Hash_Key () { CORBA::release (this->mmdevice_); } @@ -380,7 +380,7 @@ operator < (const MMDevice_Map_Hash_Key &left, } u_long -MMDevice_Map_Hash_Key::hash (void) const +MMDevice_Map_Hash_Key::hash () const { u_long result = 0; try @@ -399,7 +399,7 @@ MMDevice_Map_Hash_Key::hash (void) const // TAO_StreamCtrl // ---------------------------------------------------------------------- -TAO_StreamCtrl::TAO_StreamCtrl (void) +TAO_StreamCtrl::TAO_StreamCtrl () :mcastconfigif_ (0) { try @@ -418,7 +418,7 @@ TAO_StreamCtrl::TAO_StreamCtrl (void) } } -TAO_StreamCtrl::~TAO_StreamCtrl (void) +TAO_StreamCtrl::~TAO_StreamCtrl () { delete this->mcastconfigif_; } @@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a, } void -TAO_StreamCtrl::unbind (void) +TAO_StreamCtrl::unbind () { try { @@ -1296,12 +1296,12 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos, // TAO_MCastConfigIf // ---------------------------------------------------------------------- -TAO_MCastConfigIf::TAO_MCastConfigIf (void) +TAO_MCastConfigIf::TAO_MCastConfigIf () :peer_list_iterator_ (peer_list_) { } -TAO_MCastConfigIf::~TAO_MCastConfigIf (void) +TAO_MCastConfigIf::~TAO_MCastConfigIf () { //no-op } @@ -1428,17 +1428,17 @@ TAO_MCastConfigIf::in_flowSpec (const AVStreams::flowSpec& flow_spec, const char // TAO_Base_StreamEndPoint // ---------------------------------------------------------------------- -TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint (void) +TAO_Base_StreamEndPoint::TAO_Base_StreamEndPoint () : protocol_object_set_ (0) { } -TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint (void) +TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint () { } int -TAO_Base_StreamEndPoint::handle_close (void) +TAO_Base_StreamEndPoint::handle_close () { // This method should not be defined, but EGCS complains endlessly // about it. @@ -1446,7 +1446,7 @@ TAO_Base_StreamEndPoint::handle_close (void) } int -TAO_Base_StreamEndPoint::handle_open (void) +TAO_Base_StreamEndPoint::handle_open () { return 0; } @@ -1501,14 +1501,14 @@ TAO_Base_StreamEndPoint::set_protocol_object (const char * /*flowname*/, } void -TAO_Base_StreamEndPoint::protocol_object_set (void) +TAO_Base_StreamEndPoint::protocol_object_set () { this->protocol_object_set_ = 1; } int -TAO_Base_StreamEndPoint::is_protocol_object_set (void) +TAO_Base_StreamEndPoint::is_protocol_object_set () { return this->protocol_object_set_; } @@ -1557,7 +1557,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname, // constructor. -TAO_StreamEndPoint::TAO_StreamEndPoint (void) +TAO_StreamEndPoint::TAO_StreamEndPoint () :flow_count_ (0), flow_num_ (0), mcast_port_ (ACE_DEFAULT_MULTICAST_PORT+1) @@ -2381,7 +2381,7 @@ TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/, return 0; } -TAO_StreamEndPoint::~TAO_StreamEndPoint (void) +TAO_StreamEndPoint::~TAO_StreamEndPoint () { //this->handle_close (); TAO_AV_FlowSpecSetItor begin = this->forward_flow_spec_set.begin (); @@ -2416,7 +2416,7 @@ TAO_StreamEndPoint::~TAO_StreamEndPoint (void) // TAO_StreamEndPoint_A // ---------------------------------------------------------------------- -TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void) +TAO_StreamEndPoint_A::TAO_StreamEndPoint_A () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamEndPoint_A::TAO_StreamEndPoint_A: created\n")); } @@ -2613,7 +2613,7 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep } -TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void) +TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A () { } @@ -2621,7 +2621,7 @@ TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void) // TAO_StreamEndPoint_B // ---------------------------------------------------------------------- -TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void) +TAO_StreamEndPoint_B::TAO_StreamEndPoint_B () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created")); @@ -2743,7 +2743,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, return 1; } -TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void) +TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B () { } @@ -2751,7 +2751,7 @@ TAO_StreamEndPoint_B::~TAO_StreamEndPoint_B (void) // TAO_VDev // ---------------------------------------------------------------------- -TAO_VDev::TAO_VDev (void) +TAO_VDev::TAO_VDev () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::TAO_VDev: created\n")); @@ -2919,7 +2919,7 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos, return 1; } -TAO_VDev::~TAO_VDev (void) +TAO_VDev::~TAO_VDev () { } @@ -3341,7 +3341,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name) } // destructor. -TAO_MMDevice::~TAO_MMDevice (void) +TAO_MMDevice::~TAO_MMDevice () { delete this->stream_ctrl_; } @@ -3351,7 +3351,7 @@ TAO_MMDevice::~TAO_MMDevice (void) //------------------------------------------------------------------ // default constructor. -TAO_FlowConnection::TAO_FlowConnection (void) +TAO_FlowConnection::TAO_FlowConnection () :fp_name_ (CORBA::string_dup ("")), ip_multicast_ (0) { @@ -3381,7 +3381,7 @@ TAO_FlowConnection::set_protocol (const char *protocol) // stop this flow. void -TAO_FlowConnection::stop (void) +TAO_FlowConnection::stop () { try { @@ -3419,7 +3419,7 @@ TAO_FlowConnection::stop (void) // start this flow. void -TAO_FlowConnection::start (void) +TAO_FlowConnection::start () { try { @@ -3457,7 +3457,7 @@ TAO_FlowConnection::start (void) // destroy this flow. void -TAO_FlowConnection::destroy (void) +TAO_FlowConnection::destroy () { try { @@ -3627,7 +3627,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer, CORBA::Boolean -TAO_FlowConnection::disconnect (void) +TAO_FlowConnection::disconnect () { return 0; } @@ -3820,7 +3820,7 @@ TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target) // ----------------------------------------------------------------- //default constructor. -TAO_FlowEndPoint::TAO_FlowEndPoint (void) +TAO_FlowEndPoint::TAO_FlowEndPoint () :lock_ (0) { } @@ -3889,7 +3889,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname) // used by one flowconnection so that multiple connections cant use // the same flowendpoint. CORBA::Boolean -TAO_FlowEndPoint::lock (void) +TAO_FlowEndPoint::lock () { // lock the current flowendpoint @@ -3901,14 +3901,14 @@ TAO_FlowEndPoint::lock (void) // unlocks the flowendpoint , becomes free to be used in another flow. void -TAO_FlowEndPoint::unlock (void) +TAO_FlowEndPoint::unlock () { this->lock_ = 0; } void -TAO_FlowEndPoint::destroy (void) +TAO_FlowEndPoint::destroy () { int result = TAO_AV_Core::deactivate_servant (this); if (result < 0) @@ -3920,7 +3920,7 @@ TAO_FlowEndPoint::destroy (void) } AVStreams::StreamEndPoint_ptr -TAO_FlowEndPoint::related_sep (void) +TAO_FlowEndPoint::related_sep () { return AVStreams::StreamEndPoint::_duplicate (this->related_sep_.in ()); @@ -3933,7 +3933,7 @@ TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep) } AVStreams::FlowConnection_ptr -TAO_FlowEndPoint::related_flow_connection (void) +TAO_FlowEndPoint::related_flow_connection () { return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ()); } @@ -3946,7 +3946,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related // returns the connected peer for this flow AVStreams::FlowEndPoint_ptr -TAO_FlowEndPoint::get_connected_fep (void) +TAO_FlowEndPoint::get_connected_fep () { return AVStreams::FlowEndPoint::_duplicate (this->peer_fep_.in ()); } @@ -4274,7 +4274,7 @@ TAO_FlowEndPoint::set_protocol_object (const char * /*flowname*/, // ------------------------------------------------------------ //default constructor -TAO_FlowProducer::TAO_FlowProducer (void) +TAO_FlowProducer::TAO_FlowProducer () { } @@ -4294,7 +4294,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/) // The start, stop and destroy are to be handled by the application. void -TAO_FlowProducer::stop (void) +TAO_FlowProducer::stop () { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4306,7 +4306,7 @@ TAO_FlowProducer::stop (void) } void -TAO_FlowProducer::start (void) +TAO_FlowProducer::start () { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4418,7 +4418,7 @@ TAO_FlowProducer::set_source_id (CORBA::Long source_id) // default constructor. -TAO_FlowConsumer::TAO_FlowConsumer (void) +TAO_FlowConsumer::TAO_FlowConsumer () { } @@ -4431,7 +4431,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname, // The start, stop and destroy are to be handled by the application. void -TAO_FlowConsumer::stop (void) +TAO_FlowConsumer::stop () { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4440,7 +4440,7 @@ TAO_FlowConsumer::stop (void) } void -TAO_FlowConsumer::start (void) +TAO_FlowConsumer::start () { TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end (); for (TAO_AV_FlowSpecSetItor begin = this->flow_spec_set_.begin (); @@ -4551,7 +4551,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter) } char* -TAO_Tokenizer::token (void) +TAO_Tokenizer::token () { if (count_ < num_tokens_) return CORBA::string_dup (this->token_array_[this->count_++]); @@ -4560,7 +4560,7 @@ TAO_Tokenizer::token (void) } int -TAO_Tokenizer::num_tokens (void) +TAO_Tokenizer::num_tokens () { return static_cast<int> (this->num_tokens_); } diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index ea7a4029ee1..0c5f67b7260 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -30,7 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_Core //------------------------------------------------------------ -TAO_AV_Core::TAO_AV_Core (void) +TAO_AV_Core::TAO_AV_Core () :connector_registry_ (0), acceptor_registry_ (0) { @@ -42,7 +42,7 @@ TAO_AV_Core::TAO_AV_Core (void) ); } -TAO_AV_Core::~TAO_AV_Core (void) +TAO_AV_Core::~TAO_AV_Core () { delete this->connector_registry_; delete this->acceptor_registry_; @@ -76,7 +76,7 @@ TAO_AV_Core::~TAO_AV_Core (void) } CORBA::ORB_ptr -TAO_AV_Core::orb (void) +TAO_AV_Core::orb () { return this->orb_.in (); } @@ -88,7 +88,7 @@ TAO_AV_Core::orb (CORBA::ORB_ptr orb) } PortableServer::POA_ptr -TAO_AV_Core::poa (void) +TAO_AV_Core::poa () { return this->poa_.in (); } @@ -100,38 +100,38 @@ TAO_AV_Core::poa (PortableServer::POA_ptr poa) } TAO_AV_Connector_Registry* -TAO_AV_Core::connector_registry (void) +TAO_AV_Core::connector_registry () { return this->connector_registry_; } TAO_AV_Acceptor_Registry* -TAO_AV_Core::acceptor_registry (void) +TAO_AV_Core::acceptor_registry () { return this->acceptor_registry_; } TAO_AV_TransportFactorySet * -TAO_AV_Core::transport_factories (void) +TAO_AV_Core::transport_factories () { return &this->transport_factories_; } TAO_AV_Flow_ProtocolFactorySet* -TAO_AV_Core::flow_protocol_factories (void) +TAO_AV_Core::flow_protocol_factories () { return &this->flow_protocol_factories_; } int -TAO_AV_Core::stop_run (void) +TAO_AV_Core::stop_run () { this->stop_run_ = 1; return 0; } int -TAO_AV_Core::run (void) +TAO_AV_Core::run () { this->stop_run_ = 0; while (!this->stop_run_ && this->orb_->work_pending ()) @@ -146,7 +146,7 @@ TAO_AV_Core::reactor (ACE_Reactor *r) } ACE_Reactor * -TAO_AV_Core::reactor (void) +TAO_AV_Core::reactor () { return this->reactor_; } @@ -694,7 +694,7 @@ TAO_AV_Core::get_transport_factory(const char *transport_protocol) } int -TAO_AV_Core::load_default_transport_factories (void) +TAO_AV_Core::load_default_transport_factories () { const char *udp_factory_str = "UDP_Factory"; const char *tcp_factory_str = "TCP_Factory"; @@ -813,7 +813,7 @@ TAO_AV_Core::load_default_transport_factories (void) } int -TAO_AV_Core::init_transport_factories (void) +TAO_AV_Core::init_transport_factories () { TAO_AV_TransportFactorySetItor end = this->transport_factories_.end (); TAO_AV_TransportFactorySetItor factory = this->transport_factories_.begin (); @@ -861,7 +861,7 @@ TAO_AV_Core::init_transport_factories (void) } int -TAO_AV_Core::load_default_flow_protocol_factories (void) +TAO_AV_Core::load_default_flow_protocol_factories () { const char *udp_flow = "UDP_Flow_Factory"; const char *tcp_flow = "TCP_Flow_Factory"; @@ -1051,7 +1051,7 @@ TAO_AV_Core::load_default_flow_protocol_factories (void) } int -TAO_AV_Core::init_flow_protocol_factories (void) +TAO_AV_Core::init_flow_protocol_factories () { TAO_AV_Flow_ProtocolFactorySetItor end = this->flow_protocol_factories_.end (); TAO_AV_Flow_ProtocolFactorySetItor factory = this->flow_protocol_factories_.begin (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index 882a2d742a3..ed0f32ee71a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -22,12 +22,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------------- // Constructor -TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) +TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy () { } // Destructor. -TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) +TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy () { } @@ -71,7 +71,7 @@ TAO_AV_Endpoint_Process_Strategy::TAO_AV_Endpoint_Process_Strategy (ACE_Process_ } // Destructor. -TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void) +TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy () { } @@ -80,7 +80,7 @@ TAO_AV_Endpoint_Process_Strategy::~TAO_AV_Endpoint_Process_Strategy (void) // to get the object references to the various objects created in the // child int -TAO_AV_Endpoint_Process_Strategy::activate (void) +TAO_AV_Endpoint_Process_Strategy::activate () { ACE_Process process; @@ -160,7 +160,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void) // Get ourselves a Naming service reference int -TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void) +TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service () { try { @@ -188,7 +188,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (void) // Get the VDev created in the child process from the namingservice int -TAO_AV_Endpoint_Process_Strategy::get_vdev (void) +TAO_AV_Endpoint_Process_Strategy::get_vdev () { try { @@ -240,7 +240,7 @@ TAO_AV_Endpoint_Process_Strategy_A::TAO_AV_Endpoint_Process_Strategy_A (ACE_Proc } // Destructor -TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void) +TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A () { } @@ -264,7 +264,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s // Gets the stream endpoint object reference from the naming service int -TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (void) +TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint () { try { @@ -317,7 +317,7 @@ TAO_AV_Endpoint_Process_Strategy_B::TAO_AV_Endpoint_Process_Strategy_B (ACE_Proc } // Destructor -TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void) +TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B () { } @@ -353,7 +353,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s // Gets the B type stream_endpoint from the Naming service int -TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (void) +TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint () { try { diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index bff251c8e52..ee6a19ed0eb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // constructor. -TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void) +TAO_FlowSpec_Entry::TAO_FlowSpec_Entry () :address_ (0), clean_up_address_ (0), control_address_ (0), @@ -137,7 +137,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname, } // Destructor. -TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void) +TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry () { if (this->delete_peer_addr_) delete this->peer_addr_; @@ -151,7 +151,7 @@ TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void) } int -TAO_FlowSpec_Entry::set_protocol (void) +TAO_FlowSpec_Entry::set_protocol () { if (!this->use_flow_protocol_) { @@ -459,7 +459,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } char * -TAO_FlowSpec_Entry::get_local_addr_str (void) +TAO_FlowSpec_Entry::get_local_addr_str () { if (this->local_addr_ == 0) return 0; @@ -489,7 +489,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) //------------------------------------------------------------ // default constructor. -TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (void) +TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry () { } @@ -525,7 +525,7 @@ TAO_Forward_FlowSpec_Entry::TAO_Forward_FlowSpec_Entry (const char *flowname, { } -TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry (void) +TAO_Forward_FlowSpec_Entry::~TAO_Forward_FlowSpec_Entry () { } @@ -607,7 +607,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry) } TAO_FlowSpec_Entry::Role -TAO_Forward_FlowSpec_Entry::role (void) +TAO_Forward_FlowSpec_Entry::role () { if (this->role_ != TAO_AV_INVALID_ROLE) return this->role_; @@ -626,7 +626,7 @@ TAO_Forward_FlowSpec_Entry::role (void) } const char * -TAO_Forward_FlowSpec_Entry::entry_to_string (void) +TAO_Forward_FlowSpec_Entry::entry_to_string () { if (this->flowname_.length() == 0) return ""; @@ -821,7 +821,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) //------------------------------------------------------------ //default constructor. -TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (void) +TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry () { } @@ -857,12 +857,12 @@ TAO_Reverse_FlowSpec_Entry::TAO_Reverse_FlowSpec_Entry (const char *flowname, { } -TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry (void) +TAO_Reverse_FlowSpec_Entry::~TAO_Reverse_FlowSpec_Entry () { } TAO_FlowSpec_Entry::Role -TAO_Reverse_FlowSpec_Entry::role (void) +TAO_Reverse_FlowSpec_Entry::role () { if (this->role_ != TAO_AV_INVALID_ROLE) return this->role_; @@ -903,7 +903,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry) const char * -TAO_Reverse_FlowSpec_Entry::entry_to_string (void) +TAO_Reverse_FlowSpec_Entry::entry_to_string () { if (this->flowname_.length() == 0) return ""; diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 6aca9ffafce..8848fffcf47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //TAO_AV_UDP_MCast_Flow_Handler //------------------------------------------------------------ -TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void) +TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler () { ACE_NEW (transport_, TAO_AV_UDP_MCast_Transport (this)); @@ -22,7 +22,7 @@ TAO_AV_UDP_MCast_Flow_Handler::TAO_AV_UDP_MCast_Flow_Handler (void) ACE_SOCK_Dgram_Mcast); } -TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler (void) +TAO_AV_UDP_MCast_Flow_Handler::~TAO_AV_UDP_MCast_Flow_Handler () { delete this->transport_; delete this->dgram_mcast_; @@ -44,7 +44,7 @@ TAO_AV_UDP_MCast_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, } ACE_HANDLE -TAO_AV_UDP_MCast_Flow_Handler::get_handle (void) const +TAO_AV_UDP_MCast_Flow_Handler::get_handle () const { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_MCast_Flow_Handler::get_handle ")); return this->get_mcast_socket ()->get_handle () ; @@ -60,7 +60,7 @@ TAO_AV_UDP_MCast_Flow_Handler::set_peer_addr (ACE_INET_Addr *peer_addr) // TAO_AV_UDP_MCast_Transport //------------------------------------------------------------ -TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (void) +TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport () :handler_ (0) { } @@ -70,7 +70,7 @@ TAO_AV_UDP_MCast_Transport::TAO_AV_UDP_MCast_Transport (TAO_AV_UDP_MCast_Flow_Ha { } -TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport (void) +TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport () { } @@ -81,20 +81,20 @@ TAO_AV_UDP_MCast_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_UDP_MCast_Transport::close (void) +TAO_AV_UDP_MCast_Transport::close () { return 0; } ACE_Addr* -TAO_AV_UDP_MCast_Transport::get_peer_addr (void) +TAO_AV_UDP_MCast_Transport::get_peer_addr () { return &this->peer_addr_; } ACE_Addr* -TAO_AV_UDP_MCast_Transport::get_local_addr (void) +TAO_AV_UDP_MCast_Transport::get_local_addr () { this->handler_->get_mcast_socket ()->get_local_addr (this->local_addr_); return &this->local_addr_; @@ -182,7 +182,7 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, } int -TAO_AV_UDP_MCast_Transport::mtu (void) +TAO_AV_UDP_MCast_Transport::mtu () { return ACE_MAX_DGRAM_SIZE; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp index a5b375deb70..b05af920247 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp @@ -28,23 +28,23 @@ TAO_AV_Payload_Type_Policy::TAO_AV_Payload_Type_Policy (int payload_type) } // TAO_AV_RTP_Sdes_Policy -TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy (void) +TAO_AV_RTCP_Sdes_Policy::TAO_AV_RTCP_Sdes_Policy () :TAO_AV_Policy (TAO_AV_RTCP_SDES_POLICY) { } -TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy (void) +TAO_AV_SFP_Credit_Policy::TAO_AV_SFP_Credit_Policy () :TAO_AV_Policy (TAO_AV_SFP_CREDIT_POLICY) { } // TAO_AV_Callback -TAO_AV_Callback::TAO_AV_Callback (void) +TAO_AV_Callback::TAO_AV_Callback () :protocol_object_ (0) { } -TAO_AV_Callback::~TAO_AV_Callback (void) +TAO_AV_Callback::~TAO_AV_Callback () { } @@ -59,14 +59,14 @@ TAO_AV_Callback::open (TAO_AV_Protocol_Object *object, } int -TAO_AV_Callback::handle_start (void) +TAO_AV_Callback::handle_start () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_start\n")); return -1; } int -TAO_AV_Callback::handle_stop (void) +TAO_AV_Callback::handle_stop () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_stop\n")); return -1; @@ -89,7 +89,7 @@ TAO_AV_Callback::receive_control_frame (ACE_Message_Block *, } int -TAO_AV_Callback::handle_destroy (void) +TAO_AV_Callback::handle_destroy () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_end_stream\n")); return -1; @@ -111,7 +111,7 @@ TAO_AV_Callback::handle_timeout (void * /*arg*/) } TAO_AV_PolicyList -TAO_AV_Callback::get_policies (void) +TAO_AV_Callback::get_policies () { TAO_AV_PolicyList list; return list; @@ -130,7 +130,7 @@ TAO_AV_Callback::get_policies (void) // } TAO_AV_Protocol_Object* -TAO_AV_Callback::protocol_object (void) +TAO_AV_Callback::protocol_object () { return this->protocol_object_; } @@ -142,7 +142,7 @@ TAO_AV_Callback::protocol_object (void) // } int -TAO_AV_Callback::schedule_timer (void) +TAO_AV_Callback::schedule_timer () { return this->handler_->schedule_timer (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp index 841f7fda285..17866cd0922 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp @@ -9,12 +9,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_Flow_Protocol_Factory -TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory (void) +TAO_AV_Flow_Protocol_Factory::TAO_AV_Flow_Protocol_Factory () : ref_count (0) { } -TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory (void) +TAO_AV_Flow_Protocol_Factory::~TAO_AV_Flow_Protocol_Factory () { } @@ -41,7 +41,7 @@ TAO_AV_Flow_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry * /* entr } const char * -TAO_AV_Flow_Protocol_Factory::control_flow_factory (void) +TAO_AV_Flow_Protocol_Factory::control_flow_factory () { return 0; } @@ -49,7 +49,7 @@ TAO_AV_Flow_Protocol_Factory::control_flow_factory (void) //---------------------------------------------------------------------- // TAO_AV_Protocol_Object //---------------------------------------------------------------------- -TAO_AV_Protocol_Object::TAO_AV_Protocol_Object (void) +TAO_AV_Protocol_Object::TAO_AV_Protocol_Object () :transport_ (0), callback_ (0) { @@ -71,18 +71,18 @@ TAO_AV_Protocol_Object::open (TAO_AV_Callback *callback, return 0; } -TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object (void) +TAO_AV_Protocol_Object::~TAO_AV_Protocol_Object () { } int -TAO_AV_Protocol_Object::start (void) +TAO_AV_Protocol_Object::start () { return this->callback_->handle_start (); } int -TAO_AV_Protocol_Object::stop (void) +TAO_AV_Protocol_Object::stop () { return this->callback_->handle_stop (); } @@ -95,13 +95,13 @@ TAO_AV_Protocol_Object::set_policies (const TAO_AV_PolicyList &policy_list) } TAO_AV_PolicyList -TAO_AV_Protocol_Object::get_policies (void) +TAO_AV_Protocol_Object::get_policies () { return this->policy_list_; } TAO_AV_Transport* -TAO_AV_Protocol_Object::transport (void) +TAO_AV_Protocol_Object::transport () { return this->transport_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 084d1fc8421..feb571fe886 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -332,11 +332,11 @@ TAO_AV_RTCP::rtcp_interval (int members, // TAO_AV_RTCP_Flow_Factory -TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory (void) +TAO_AV_RTCP_Flow_Factory::TAO_AV_RTCP_Flow_Factory () { } -TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory (void) +TAO_AV_RTCP_Flow_Factory::~TAO_AV_RTCP_Flow_Factory () { } @@ -383,7 +383,7 @@ TAO_AV_RTCP_Flow_Factory::make_protocol_object (TAO_FlowSpec_Entry * /*entry*/, // TAO_AV_RTCP_Object int -TAO_AV_RTCP_Object::handle_input (void) +TAO_AV_RTCP_Object::handle_input () { size_t bufsiz = 2*this->transport_->mtu (); ACE_Message_Block data (bufsiz); @@ -440,12 +440,12 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, } -TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object (void) +TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () { } int -TAO_AV_RTCP_Object::destroy (void) +TAO_AV_RTCP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -460,13 +460,13 @@ TAO_AV_RTCP_Object::set_policies (const TAO_AV_PolicyList &/*policy_list*/) } int -TAO_AV_RTCP_Object::start (void) +TAO_AV_RTCP_Object::start () { return this->callback_->handle_start (); } int -TAO_AV_RTCP_Object::stop (void) +TAO_AV_RTCP_Object::stop () { return this->callback_->handle_stop (); } @@ -496,7 +496,7 @@ TAO_AV_RTCP_Object::ts_offset (ACE_UINT32 ts_offset) } // TAO_AV_RTCP_Callback -TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void) +TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback () :is_initial_timeout_(1), packet_size_(0) { @@ -510,7 +510,7 @@ TAO_AV_RTCP_Callback::TAO_AV_RTCP_Callback (void) this->output_.cname(cname); } -TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback (void) +TAO_AV_RTCP_Callback::~TAO_AV_RTCP_Callback () { } @@ -521,13 +521,13 @@ TAO_AV_RTCP_Callback::schedule (int ms) } int -TAO_AV_RTCP_Callback::handle_start (void) +TAO_AV_RTCP_Callback::handle_start () { return 0; } int -TAO_AV_RTCP_Callback::handle_stop (void) +TAO_AV_RTCP_Callback::handle_stop () { return this->send_report(1); } @@ -773,7 +773,7 @@ TAO_AV_RTCP_Callback::get_timeout (ACE_Time_Value *&tv, } int -TAO_AV_RTCP_Callback::handle_destroy (void) +TAO_AV_RTCP_Callback::handle_destroy () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 63fcc7c4899..752b1a21d6d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -29,7 +29,7 @@ RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc, this->peer_address_ = inet_addr; } -RTCP_Channel_In::~RTCP_Channel_In(void) +RTCP_Channel_In::~RTCP_Channel_In() { delete this->peer_address_; } @@ -237,7 +237,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb, RR_Block * -RTCP_Channel_In::getRRBlock(void) +RTCP_Channel_In::getRRBlock() { // If no data has been received since the last report, don't create a block. if (!this->data_since_last_report_) @@ -310,7 +310,7 @@ RTCP_Channel_In::getRRBlock(void) return local_block_ptr; } -RTCP_Channel_Out::RTCP_Channel_Out(void) +RTCP_Channel_Out::RTCP_Channel_Out() :cname_ ("cname"), active_ (0), timestamp_ (0), @@ -319,7 +319,7 @@ RTCP_Channel_Out::RTCP_Channel_Out(void) { } -RTCP_Channel_Out::~RTCP_Channel_Out(void) +RTCP_Channel_Out::~RTCP_Channel_Out() { } @@ -337,25 +337,25 @@ RTCP_Channel_Out::updateStatistics (RTP_Packet *data_packet) } ACE_UINT32 -RTCP_Channel_Out::timestamp (void) +RTCP_Channel_Out::timestamp () { return this->timestamp_; } ACE_UINT32 -RTCP_Channel_Out::packets_sent (void) +RTCP_Channel_Out::packets_sent () { return this->packets_sent_; } ACE_UINT32 -RTCP_Channel_Out::octets_sent (void) +RTCP_Channel_Out::octets_sent () { return this->octets_sent_; } char -RTCP_Channel_Out::active (void) +RTCP_Channel_Out::active () { return this->active_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 8c0be928bc6..94fa8838943 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -RTCP_Packet::RTCP_Packet(void) +RTCP_Packet::RTCP_Packet() { this->chd_.ver_ = 2; this->chd_.count_ = 0; @@ -30,7 +30,7 @@ RTCP_Packet::RTCP_Packet(char* buffer) this->packet_data_ = 0; } -RTCP_Packet::~RTCP_Packet(void) +RTCP_Packet::~RTCP_Packet() { } @@ -159,7 +159,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len) //============================================================================== -RTCP_BYE_Packet::~RTCP_BYE_Packet(void) +RTCP_BYE_Packet::~RTCP_BYE_Packet() { if (this->ssrc_list_) delete []this->ssrc_list_; @@ -170,7 +170,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void) //============================================================================== unsigned int -RTCP_BYE_Packet::packet_size(void) +RTCP_BYE_Packet::packet_size() { ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4); @@ -196,7 +196,7 @@ RTCP_BYE_Packet::ssrc_list(ACE_UINT32 **ssrc_list, unsigned char &length) //============================================================================== const char * -RTCP_BYE_Packet::reason (void) +RTCP_BYE_Packet::reason () { ACE_CString reason = (const char *)this->reason_; @@ -206,7 +206,7 @@ RTCP_BYE_Packet::reason (void) //============================================================================== void -RTCP_BYE_Packet::build_packet(void) +RTCP_BYE_Packet::build_packet() { unsigned int index; unsigned int i; @@ -248,7 +248,7 @@ RTCP_BYE_Packet::build_packet(void) } void -RTCP_BYE_Packet::dump (void) +RTCP_BYE_Packet::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "\nRTCP_BYE_Packet:: from ssrc(s) ")); @@ -344,7 +344,7 @@ RTCP_RR_Packet::RTCP_RR_Packet (char* buffer, //============================================================================== -RTCP_RR_Packet::~RTCP_RR_Packet(void) +RTCP_RR_Packet::~RTCP_RR_Packet() { RR_Block *prev; @@ -365,7 +365,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void) //============================================================================== unsigned int -RTCP_RR_Packet::packet_size(void) +RTCP_RR_Packet::packet_size() { ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4); return size; @@ -374,7 +374,7 @@ RTCP_RR_Packet::packet_size(void) //============================================================================== void -RTCP_RR_Packet::build_packet(void) +RTCP_RR_Packet::build_packet() { int index; RR_Block *local_block_ptr; @@ -419,7 +419,7 @@ RTCP_RR_Packet::build_packet(void) } void -RTCP_RR_Packet::dump (void) +RTCP_RR_Packet::dump () { RR_Block *b = this->rr_; int count = 1; @@ -450,7 +450,7 @@ RTCP_RR_Packet::dump (void) } -RTCP_SDES_Packet::RTCP_SDES_Packet(void) : +RTCP_SDES_Packet::RTCP_SDES_Packet() : RTCP_Packet () { this->chd_.pt_ = RTCP_PT_SDES; @@ -563,7 +563,7 @@ RTCP_SDES_Packet::RTCP_SDES_Packet(char* buffer, int *len): //============================================================================== -RTCP_SDES_Packet::~RTCP_SDES_Packet(void) +RTCP_SDES_Packet::~RTCP_SDES_Packet() { sdesChunk_t *cp; // pointer to chunk sdesChunk_t *cpprev; @@ -778,7 +778,7 @@ RTCP_SDES_Packet::add_priv_item (ACE_UINT32 ssrc, //============================================================================== unsigned int -RTCP_SDES_Packet::packet_size(void) +RTCP_SDES_Packet::packet_size() { int size; sdesChunk_t *cp; // pointer to chunk @@ -817,7 +817,7 @@ RTCP_SDES_Packet::packet_size(void) //============================================================================== void -RTCP_SDES_Packet::build_packet(void) +RTCP_SDES_Packet::build_packet() { sdesChunk_t *cp; // pointer to chunk sdesItem_t *ip; // pointer to item @@ -900,7 +900,7 @@ RTCP_SDES_Packet::build_packet(void) } void -RTCP_SDES_Packet::dump (void) +RTCP_SDES_Packet::dump () { sdesItem_t *ip; @@ -1087,7 +1087,7 @@ RTCP_SR_Packet::RTCP_SR_Packet (char* buffer, //============================================================================== -RTCP_SR_Packet::~RTCP_SR_Packet(void) +RTCP_SR_Packet::~RTCP_SR_Packet() { RR_Block *prev; @@ -1107,7 +1107,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void) //============================================================================== -unsigned int RTCP_SR_Packet::packet_size (void) +unsigned int RTCP_SR_Packet::packet_size () { ACE_UINT16 size = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ? size += 20; // the first line is the same as RR; 20 more bytes for SR @@ -1117,7 +1117,7 @@ unsigned int RTCP_SR_Packet::packet_size (void) //============================================================================== -void RTCP_SR_Packet::build_packet(void) +void RTCP_SR_Packet::build_packet() { int index = 0; RR_Block *local_block_ptr; @@ -1171,7 +1171,7 @@ void RTCP_SR_Packet::build_packet(void) } void -RTCP_SR_Packet::dump (void) +RTCP_SR_Packet::dump () { RR_Block *b = this->rr_; int count = 1; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index a7378a76974..633b870830e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -175,78 +175,78 @@ RTP_Packet::RTP_Packet(unsigned char padding, } } -RTP_Packet::~RTP_Packet(void) +RTP_Packet::~RTP_Packet() { } ACE_UINT16 -RTP_Packet::packet_size(void) +RTP_Packet::packet_size() { return this->packet_size_; } ACE_UINT16 -RTP_Packet::payload_size(void) +RTP_Packet::payload_size() { return this->payload_size_; } unsigned int -RTP_Packet::ver (void) +RTP_Packet::ver () { return ( this->packet_[0] & 0xC0 ) >> 6; } unsigned int -RTP_Packet::pad (void) +RTP_Packet::pad () { return ( this->packet_[0] & 0x20 ) >> 5; } unsigned int -RTP_Packet::ext (void) +RTP_Packet::ext () { return ( this->packet_[0] & 0x10 ) >> 4; } unsigned int -RTP_Packet::cc (void) +RTP_Packet::cc () { return ( this->packet_[0] & 0x0F ) ; } unsigned int -RTP_Packet::mrk (void) +RTP_Packet::mrk () { return ( this->packet_[1] & 0x80 ) >> 7; } unsigned int -RTP_Packet::pt (void) +RTP_Packet::pt () { return ( this->packet_[1] & 0x7F ) ; } ACE_UINT16 -RTP_Packet::sn (void) +RTP_Packet::sn () { return ntohs(*(ACE_UINT16*)(&this->packet_[2])) ; } ACE_UINT32 -RTP_Packet::ts (void) +RTP_Packet::ts () { return ntohl(*(ACE_UINT32*)(&this->packet_[4])) ; } ACE_UINT32 -RTP_Packet::ssrc (void) +RTP_Packet::ssrc () { return ntohl(*(ACE_UINT32*)(&this->packet_[8])) ; } unsigned int -RTP_Packet::ext_bytes (void) +RTP_Packet::ext_bytes () { return this->extension_bytes_; } @@ -262,7 +262,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info) } int -RTP_Packet::is_valid (void) +RTP_Packet::is_valid () { // taken from RFC 1889 - Appendix A.1 @@ -315,7 +315,7 @@ RTP_Packet::get_packet_data (char **packet, ACE_UINT16 &length) // TAO_AV_RTP_Object int -TAO_AV_RTP_Object::handle_input (void) +TAO_AV_RTP_Object::handle_input () { TAO_AV_frame_info frame_info; @@ -638,12 +638,12 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, this->frame_.size (2 * this->transport_->mtu ()); } -TAO_AV_RTP_Object::~TAO_AV_RTP_Object (void) +TAO_AV_RTP_Object::~TAO_AV_RTP_Object () { } int -TAO_AV_RTP_Object::destroy (void) +TAO_AV_RTP_Object::destroy () { if(this->control_object_) this->control_object_->destroy (); @@ -702,25 +702,25 @@ TAO_AV_RTP_Object::control_object (TAO_AV_Protocol_Object *object) } int -TAO_AV_RTP_Object::start (void) +TAO_AV_RTP_Object::start () { this->control_object_->start (); return this->callback_->handle_start (); } int -TAO_AV_RTP_Object::stop (void) +TAO_AV_RTP_Object::stop () { this->control_object_->stop (); return this->callback_->handle_stop (); } // TAO_AV_RTP_Flow_Factory -TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory (void) +TAO_AV_RTP_Flow_Factory::TAO_AV_RTP_Flow_Factory () { } -TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory (void) +TAO_AV_RTP_Flow_Factory::~TAO_AV_RTP_Flow_Factory () { } @@ -768,7 +768,7 @@ TAO_AV_RTP_Flow_Factory::match_protocol (const char *flow_string) } const char * -TAO_AV_RTP_Flow_Factory::control_flow_factory (void) +TAO_AV_RTP_Flow_Factory::control_flow_factory () { return "RTCP"; } diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index afe9e424271..8e0291e108d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_TCP_Transport //------------------------------------------------------------ -TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (void) +TAO_AV_TCP_Transport::TAO_AV_TCP_Transport () :handler_ (0) { } @@ -22,7 +22,7 @@ TAO_AV_TCP_Transport::TAO_AV_TCP_Transport (TAO_AV_TCP_Flow_Handler *handler) { } -TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport (void) +TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport () { } @@ -33,19 +33,19 @@ TAO_AV_TCP_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_TCP_Transport::close (void) +TAO_AV_TCP_Transport::close () { return 0; } int -TAO_AV_TCP_Transport::mtu (void) +TAO_AV_TCP_Transport::mtu () { return -1; } ACE_Addr* -TAO_AV_TCP_Transport::get_peer_addr (void) +TAO_AV_TCP_Transport::get_peer_addr () { return 0; } @@ -153,11 +153,11 @@ TAO_AV_TCP_Transport::recv (iovec *iov, // TAO_AV_TCP_Protocol_Factory //------------------------------------------------------------ -TAO_AV_TCP_Factory::TAO_AV_TCP_Factory (void) +TAO_AV_TCP_Factory::TAO_AV_TCP_Factory () { } -TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory (void) +TAO_AV_TCP_Factory::~TAO_AV_TCP_Factory () { } @@ -177,7 +177,7 @@ TAO_AV_TCP_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_TCP_Factory::make_acceptor (void) +TAO_AV_TCP_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_acceptor ")); TAO_AV_Acceptor *acceptor = 0; @@ -188,7 +188,7 @@ TAO_AV_TCP_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_TCP_Factory::make_connector (void) +TAO_AV_TCP_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_TCP_Factory::make_connector ")); TAO_AV_Connector *connector = 0; @@ -203,7 +203,7 @@ TAO_AV_TCP_Factory::make_connector (void) //------------------------------------------------------------ int -TAO_AV_TCP_Object::handle_input (void) +TAO_AV_TCP_Object::handle_input () { int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); @@ -249,12 +249,12 @@ TAO_AV_TCP_Object::TAO_AV_TCP_Object (TAO_AV_Callback *callback, this->frame_.size (BUFSIZ); } -TAO_AV_TCP_Object::~TAO_AV_TCP_Object (void) +TAO_AV_TCP_Object::~TAO_AV_TCP_Object () { // No-op } int -TAO_AV_TCP_Object::destroy (void) +TAO_AV_TCP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -264,11 +264,11 @@ TAO_AV_TCP_Object::destroy (void) //------------------------------------------------------------ // TAO_AV_TCP_Flow_Factory //------------------------------------------------------------ -TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory (void) +TAO_AV_TCP_Flow_Factory::TAO_AV_TCP_Flow_Factory () { } -TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory (void) +TAO_AV_TCP_Flow_Factory::~TAO_AV_TCP_Flow_Factory () { } @@ -357,11 +357,11 @@ TAO_AV_TCP_Base_Connector::connector_connect (TAO_AV_TCP_Flow_Handler *&handler, //------------------------------------------------------------ // TAO_AV_TCP_Connector //------------------------------------------------------------ -TAO_AV_TCP_Connector::TAO_AV_TCP_Connector (void) +TAO_AV_TCP_Connector::TAO_AV_TCP_Connector () { } -TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector (void) +TAO_AV_TCP_Connector::~TAO_AV_TCP_Connector () { } @@ -431,7 +431,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry, } int -TAO_AV_TCP_Connector::close (void) +TAO_AV_TCP_Connector::close () { return 0; } @@ -473,11 +473,11 @@ TAO_AV_TCP_Base_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&handler) // TAO_AV_TCP_Acceptor //------------------------------------------------------------ -TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor (void) +TAO_AV_TCP_Acceptor::TAO_AV_TCP_Acceptor () { } -TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor (void) +TAO_AV_TCP_Acceptor::~TAO_AV_TCP_Acceptor () { } @@ -612,7 +612,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint, int -TAO_AV_TCP_Acceptor::close (void) +TAO_AV_TCP_Acceptor::close () { return 0; } @@ -628,13 +628,13 @@ TAO_AV_TCP_Flow_Handler::TAO_AV_TCP_Flow_Handler (TAO_AV_Callback * /*callback*/ TAO_AV_TCP_Transport (this)); } -TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler (void) +TAO_AV_TCP_Flow_Handler::~TAO_AV_TCP_Flow_Handler () { delete this->transport_; } TAO_AV_Transport * -TAO_AV_TCP_Flow_Handler::transport (void) +TAO_AV_TCP_Flow_Handler::transport () { return this->transport_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp index 909d9eb5657..5e5a7dd19cc 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp @@ -47,7 +47,7 @@ TAO_AV_Flow_Protocol_Item::TAO_AV_Flow_Protocol_Item (const ACE_CString &name) // TAO_AV_Connector_Registry //------------------------------------------------------------ -TAO_AV_Connector_Registry::TAO_AV_Connector_Registry (void) +TAO_AV_Connector_Registry::TAO_AV_Connector_Registry () { } @@ -174,7 +174,7 @@ TAO_AV_Connector_Registry::close (TAO_AV_Connector *connector) } int -TAO_AV_Connector_Registry::close_all (void) +TAO_AV_Connector_Registry::close_all () { for (TAO_AV_ConnectorSetItor i = this->connectors_.begin (); i != this->connectors_.end (); @@ -192,7 +192,7 @@ TAO_AV_Connector_Registry::close_all (void) return 0; } -TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void) +TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry () { this->close_all (); } @@ -201,11 +201,11 @@ TAO_AV_Connector_Registry::~TAO_AV_Connector_Registry (void) // TAO_AV_Acceptor_Registry //------------------------------------------------------------ -TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry (void) +TAO_AV_Acceptor_Registry::TAO_AV_Acceptor_Registry () { } -TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry (void) +TAO_AV_Acceptor_Registry::~TAO_AV_Acceptor_Registry () { this->close_all(); } @@ -443,7 +443,7 @@ TAO_AV_Acceptor_Registry::close (TAO_AV_Acceptor *acceptor) } int -TAO_AV_Acceptor_Registry::close_all (void) +TAO_AV_Acceptor_Registry::close_all () { for (TAO_AV_AcceptorSetItor i = this->acceptors_.begin (); i != this->acceptors_.end (); @@ -465,17 +465,17 @@ TAO_AV_Acceptor_Registry::close_all (void) // TAO_AV_Transport //---------------------------------------------------------------------- -TAO_AV_Transport::TAO_AV_Transport (void) +TAO_AV_Transport::TAO_AV_Transport () { } // Virtual destructor. -TAO_AV_Transport::~TAO_AV_Transport (void) +TAO_AV_Transport::~TAO_AV_Transport () { } ACE_Addr* -TAO_AV_Transport::get_local_addr (void) +TAO_AV_Transport::get_local_addr () { return 0; } @@ -485,7 +485,7 @@ TAO_AV_Transport::get_local_addr (void) //---------------------------------------------------------------------- //TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (TAO_AV_Callback *callback) -TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void) +TAO_AV_Flow_Handler::TAO_AV_Flow_Handler () :transport_ (0), callback_ (0), protocol_object_ (0), @@ -493,7 +493,7 @@ TAO_AV_Flow_Handler::TAO_AV_Flow_Handler (void) { } -TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler(void) +TAO_AV_Flow_Handler::~TAO_AV_Flow_Handler() { // cancel the timer (if there is one) this->cancel_timer(); @@ -524,7 +524,7 @@ TAO_AV_Flow_Handler::start (TAO_FlowSpec_Entry::Role role) } int -TAO_AV_Flow_Handler::schedule_timer (void) +TAO_AV_Flow_Handler::schedule_timer () { ACE_Event_Handler *event_handler = this->event_handler (); ACE_Time_Value *tv = 0; @@ -546,7 +546,7 @@ TAO_AV_Flow_Handler::schedule_timer (void) int -TAO_AV_Flow_Handler::cancel_timer (void) +TAO_AV_Flow_Handler::cancel_timer () { if (this->timer_id_ != -1) return TAO_AV_CORE::instance()->reactor ()->cancel_timer (this->timer_id_); @@ -605,7 +605,7 @@ TAO_AV_Flow_Handler::change_qos (AVStreams::QoS) } TAO_AV_Transport* -TAO_AV_Flow_Handler::transport (void) +TAO_AV_Flow_Handler::transport () { return this->transport_; } @@ -617,7 +617,7 @@ TAO_AV_Flow_Handler::protocol_object (TAO_AV_Protocol_Object *protocol_object) } TAO_AV_Protocol_Object* -TAO_AV_Flow_Handler::protocol_object (void) +TAO_AV_Flow_Handler::protocol_object () { return this->protocol_object_; } @@ -629,29 +629,29 @@ TAO_AV_Flow_Handler::callback (TAO_AV_Callback *callback) } // TAO_AV_Connector -TAO_AV_Connector::TAO_AV_Connector (void) +TAO_AV_Connector::TAO_AV_Connector () { } -TAO_AV_Connector::~TAO_AV_Connector (void) +TAO_AV_Connector::~TAO_AV_Connector () { } // TAO_AV_Acceptor -TAO_AV_Acceptor::TAO_AV_Acceptor (void) +TAO_AV_Acceptor::TAO_AV_Acceptor () { } -TAO_AV_Acceptor::~TAO_AV_Acceptor (void) +TAO_AV_Acceptor::~TAO_AV_Acceptor () { } -TAO_AV_Transport_Factory::TAO_AV_Transport_Factory (void) +TAO_AV_Transport_Factory::TAO_AV_Transport_Factory () : ref_count (0) { } -TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory (void) +TAO_AV_Transport_Factory::~TAO_AV_Transport_Factory () { } @@ -669,13 +669,13 @@ TAO_AV_Transport_Factory::match_protocol (const char * /* protocol_string */) } TAO_AV_Acceptor * -TAO_AV_Transport_Factory::make_acceptor (void) +TAO_AV_Transport_Factory::make_acceptor () { return 0; } TAO_AV_Connector * -TAO_AV_Transport_Factory::make_connector (void) +TAO_AV_Transport_Factory::make_connector () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 601e173fdfc..edfa055b2a1 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -17,13 +17,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // TAO_AV_UDP_Flow_Handler //------------------------------------------------------------ -TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler (void) +TAO_AV_UDP_Flow_Handler::TAO_AV_UDP_Flow_Handler () { ACE_NEW (this->transport_, TAO_AV_UDP_Transport (this)); } -TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void) +TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler () { // remove the event handler from the reactor. TAO_AV_CORE::instance()->reactor ()->remove_handler (this->event_handler(), @@ -35,7 +35,7 @@ TAO_AV_UDP_Flow_Handler::~TAO_AV_UDP_Flow_Handler (void) } TAO_AV_Transport * -TAO_AV_UDP_Flow_Handler::transport (void) +TAO_AV_UDP_Flow_Handler::transport () { return this->transport_; } @@ -68,7 +68,7 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_HANDLE -TAO_AV_UDP_Flow_Handler::get_handle (void) const +TAO_AV_UDP_Flow_Handler::get_handle () const { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, @@ -155,7 +155,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos) // TAO_AV_UDP_Transport //------------------------------------------------------------ -TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (void) +TAO_AV_UDP_Transport::TAO_AV_UDP_Transport () :handler_ (0) { } @@ -166,7 +166,7 @@ TAO_AV_UDP_Transport::TAO_AV_UDP_Transport (TAO_AV_UDP_Flow_Handler *handler) { } -TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport (void) +TAO_AV_UDP_Transport::~TAO_AV_UDP_Transport () { } @@ -184,19 +184,19 @@ TAO_AV_UDP_Transport::open (ACE_Addr * /*address*/) } int -TAO_AV_UDP_Transport::close (void) +TAO_AV_UDP_Transport::close () { return 0; } int -TAO_AV_UDP_Transport::mtu (void) +TAO_AV_UDP_Transport::mtu () { return 65535; } ACE_Addr* -TAO_AV_UDP_Transport::get_peer_addr (void) +TAO_AV_UDP_Transport::get_peer_addr () { return &this->peer_addr_; } @@ -318,13 +318,13 @@ TAO_AV_UDP_Transport::recv (iovec *iov, // TAO_AV_UDP_Acceptor //------------------------------------------------------------ -TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor (void) +TAO_AV_UDP_Acceptor::TAO_AV_UDP_Acceptor () : address_ (0), control_inet_address_ (0) { } -TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor (void) +TAO_AV_UDP_Acceptor::~TAO_AV_UDP_Acceptor () { if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) delete this->entry_->control_handler (); @@ -556,7 +556,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, } int -TAO_AV_UDP_Acceptor::close (void) +TAO_AV_UDP_Acceptor::close () { return 0; } @@ -564,12 +564,12 @@ TAO_AV_UDP_Acceptor::close (void) //------------------------------------------------------------ // TAO_AV_UDP_Connector //------------------------------------------------------------ -TAO_AV_UDP_Connector::TAO_AV_UDP_Connector (void) +TAO_AV_UDP_Connector::TAO_AV_UDP_Connector () : control_inet_address_ (0) { } -TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector (void) +TAO_AV_UDP_Connector::~TAO_AV_UDP_Connector () { if (this->flow_component_ == TAO_AV_Core::TAO_AV_CONTROL) { @@ -779,7 +779,7 @@ TAO_AV_UDP_Connector::activate_svc_handler (TAO_AV_Flow_Handler *handler) } int -TAO_AV_UDP_Connector::close (void) +TAO_AV_UDP_Connector::close () { return 0; } @@ -908,11 +908,11 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler, // TAO_AV_UDP_Protocol_Factory //------------------------------------------------------------ -TAO_AV_UDP_Factory::TAO_AV_UDP_Factory (void) +TAO_AV_UDP_Factory::TAO_AV_UDP_Factory () { } -TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory (void) +TAO_AV_UDP_Factory::~TAO_AV_UDP_Factory () { } @@ -927,7 +927,7 @@ TAO_AV_UDP_Factory::match_protocol (const char *protocol_string) } TAO_AV_Acceptor* -TAO_AV_UDP_Factory::make_acceptor (void) +TAO_AV_UDP_Factory::make_acceptor () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_acceptor\n")); TAO_AV_Acceptor *acceptor = 0; @@ -938,7 +938,7 @@ TAO_AV_UDP_Factory::make_acceptor (void) } TAO_AV_Connector* -TAO_AV_UDP_Factory::make_connector (void) +TAO_AV_UDP_Factory::make_connector () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Factory::make_connector\n")); TAO_AV_Connector *connector = 0; @@ -960,7 +960,7 @@ TAO_AV_UDP_Factory::init (int /* argc */, //------------------------------------------------------------ int -TAO_AV_UDP_Object::handle_input (void) +TAO_AV_UDP_Object::handle_input () { int n = this->transport_->recv (this->frame_.rd_ptr (), this->frame_.size ()); @@ -1012,13 +1012,13 @@ TAO_AV_UDP_Object::TAO_AV_UDP_Object (TAO_AV_Callback *callback, this->frame_.size (this->transport_->mtu ()); } -TAO_AV_UDP_Object::~TAO_AV_UDP_Object (void) +TAO_AV_UDP_Object::~TAO_AV_UDP_Object () { //no-op } int -TAO_AV_UDP_Object::destroy (void) +TAO_AV_UDP_Object::destroy () { this->callback_->handle_destroy (); delete this; @@ -1030,11 +1030,11 @@ TAO_AV_UDP_Object::destroy (void) //------------------------------------------------------------ // TAO_AV_UDP_Flow_Factory //------------------------------------------------------------ -TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory (void) +TAO_AV_UDP_Flow_Factory::TAO_AV_UDP_Flow_Factory () { } -TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory (void) +TAO_AV_UDP_Flow_Factory::~TAO_AV_UDP_Flow_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 19ec09132b9..1a20983efb2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -8,14 +8,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void) +TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory %d\n")); } -TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void) +TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory () { TAO_AV_TransportFactorySetItor t_end = TAO_AV_CORE::instance ()->transport_factories ()->end (); for (TAO_AV_TransportFactorySetItor tfiterator = diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index ad857ef4536..77b9e1542a7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -45,7 +45,7 @@ operator< (const TAO_SFP_Fragment_Node& left, // TAO_SFP_Base //------------------------------------------------------------ -TAO_SFP_Base::TAO_SFP_Base (void) +TAO_SFP_Base::TAO_SFP_Base () { TAO_OutputCDR output_cdr; flowProtocol::frameHeader frame_header; @@ -845,13 +845,13 @@ TAO_SFP_Object::TAO_SFP_Object (TAO_AV_Callback *callback, this->state_.static_frame_.size (2* this->transport_->mtu ()); } -TAO_SFP_Object::~TAO_SFP_Object (void) +TAO_SFP_Object::~TAO_SFP_Object () { //no-op } int -TAO_SFP_Object::destroy (void) +TAO_SFP_Object::destroy () { int result = -1; TAO_OutputCDR out_stream; @@ -1127,7 +1127,7 @@ TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, } int -TAO_SFP_Consumer_Object::handle_input (void) +TAO_SFP_Consumer_Object::handle_input () { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"TAO_SFP_Consumer_Object::handle_input\n")); // This is the entry point for receiving data. @@ -1177,7 +1177,7 @@ TAO_SFP_Producer_Object::TAO_SFP_Producer_Object (TAO_AV_Callback *callback, } int -TAO_SFP_Producer_Object::handle_input (void) +TAO_SFP_Producer_Object::handle_input () { // A producer can only receive credit messages. int result; @@ -1223,11 +1223,11 @@ TAO_SFP_Producer_Object::handle_input (void) } // TAO_AV_SFP_Factory -TAO_AV_SFP_Factory::TAO_AV_SFP_Factory (void) +TAO_AV_SFP_Factory::TAO_AV_SFP_Factory () { } -TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory (void) +TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory () { } @@ -1293,7 +1293,7 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, // TAO_SFP_Frame_State //------------------------------------------------------------ -TAO_SFP_Frame_State::TAO_SFP_Frame_State (void) +TAO_SFP_Frame_State::TAO_SFP_Frame_State () :cdr (new ACE_Data_Block (ACE_CDR::DEFAULT_BUFSIZE, ACE_Message_Block::MB_DATA, 0, @@ -1309,13 +1309,13 @@ TAO_SFP_Frame_State::TAO_SFP_Frame_State (void) } CORBA::Boolean -TAO_SFP_Frame_State::is_complete (void) +TAO_SFP_Frame_State::is_complete () { return (!this->more_fragments_) && (this->frame_block_); } int -TAO_SFP_Frame_State::reset (void) +TAO_SFP_Frame_State::reset () { this->frame_block_ = 0; return 0; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp index 997efb34aca..6b36ef5c48d 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CC_Lock::CC_Lock (void) +CC_Lock::CC_Lock () : mode_ (CosConcurrencyControl::intention_read), lock_held_ (0) { @@ -32,12 +32,12 @@ CC_Lock::CC_Lock (CosConcurrencyControl::lock_mode mode) { } -CC_Lock::~CC_Lock (void) +CC_Lock::~CC_Lock () { } void -CC_Lock::lock (void) +CC_Lock::lock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::lock\n")); @@ -45,7 +45,7 @@ CC_Lock::lock (void) } CORBA::Boolean -CC_Lock::try_lock (void) +CC_Lock::try_lock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::try_lock. ")); @@ -79,7 +79,7 @@ CC_Lock::try_lock (void) } void -CC_Lock::unlock (void) +CC_Lock::unlock () { ORBSVCS_DEBUG ((LM_DEBUG, "CC_Lock::unlock\n")); @@ -133,25 +133,25 @@ CC_Lock::Compatible (CosConcurrencyControl::lock_mode mode) } CosConcurrencyControl::lock_mode -CC_Lock::GetMode (void) +CC_Lock::GetMode () { return mode_; } int -CC_Lock::GetLocksHeld (void) +CC_Lock::GetLocksHeld () { return this->lock_held_; } void -CC_Lock::DecLocksHeld (void) +CC_Lock::DecLocksHeld () { this->lock_held_--; } void -CC_Lock::dump (void) +CC_Lock::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "mode_ %i, lock_held_: %i\n", @@ -183,21 +183,21 @@ CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES] // CC_LockModeterator -CC_LockModeIterator::CC_LockModeIterator (void) +CC_LockModeIterator::CC_LockModeIterator () : current_ (CosConcurrencyControl::intention_read) { } -CC_LockModeIterator::~CC_LockModeIterator (void) +CC_LockModeIterator::~CC_LockModeIterator () { // Do nothing } -void CC_LockModeIterator::First (void) +void CC_LockModeIterator::First () { current_ = CosConcurrencyControl::intention_read; } -void CC_LockModeIterator::Next (void) +void CC_LockModeIterator::Next () { switch (current_) { @@ -221,7 +221,7 @@ void CC_LockModeIterator::Next (void) } CORBA::Boolean -CC_LockModeIterator::IsDone (void) +CC_LockModeIterator::IsDone () { if (current_ == CosConcurrencyControl::write) return 1; @@ -230,7 +230,7 @@ CC_LockModeIterator::IsDone (void) } CosConcurrencyControl::lock_mode -CC_LockModeIterator::GetLockMode (void) +CC_LockModeIterator::GetLockMode () { return current_; } diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 8f1715e7959..99d6a1b442e 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. -CC_LockSet::CC_LockSet (void) +CC_LockSet::CC_LockSet () { try { @@ -45,7 +45,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr ) // Initialization. void -CC_LockSet::Init (void) +CC_LockSet::Init () { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -61,7 +61,7 @@ CC_LockSet::Init (void) // Destructor -CC_LockSet::~CC_LockSet (void) +CC_LockSet::~CC_LockSet () { } @@ -278,7 +278,7 @@ CC_LockSet::lock_held (CC_LockModeEnum lm) } void -CC_LockSet::dump (void) +CC_LockSet::dump () { ORBSVCS_DEBUG ((LM_DEBUG, "waiting_calls_: %i, IR: %i, R: %i, U: %i, IW: %i, W: %i\n", diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp index 9a78bc807ab..03a2175adb9 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp @@ -15,17 +15,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor -CC_LockSetFactory::CC_LockSetFactory (void) +CC_LockSetFactory::CC_LockSetFactory () { } // Destructor. -CC_LockSetFactory::~CC_LockSetFactory (void) +CC_LockSetFactory::~CC_LockSetFactory () { } CosConcurrencyControl::LockSet_ptr -CC_LockSetFactory::create (void) +CC_LockSetFactory::create () { CC_LockSet *ls = 0; diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp index 0056beb1e52..74555ec8ed7 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp @@ -18,11 +18,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Concurrency_Loader::TAO_Concurrency_Loader (void) +TAO_Concurrency_Loader::TAO_Concurrency_Loader () { } -TAO_Concurrency_Loader::~TAO_Concurrency_Loader (void) +TAO_Concurrency_Loader::~TAO_Concurrency_Loader () { } @@ -48,7 +48,7 @@ TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Concurrency_Loader::fini (void) +TAO_Concurrency_Loader::fini () { // Remove the Concurrency Service. this->concurrency_server_.fini(); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index db4f396520d..51ef58e254e 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -56,11 +56,10 @@ public: TAO_Concurrency_Server concurrency_server_; private: - - // Disallow copying and assignment. - TAO_Concurrency_Loader (const TAO_Concurrency_Loader &); - TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &); - + TAO_Concurrency_Loader (const TAO_Concurrency_Loader &) = delete; + TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &) = delete; + TAO_Concurrency_Loader (TAO_Concurrency_Loader &&) = delete; + TAO_Concurrency_Loader &operator = (TAO_Concurrency_Loader &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp index 9ae228725bb..d0147e100f4 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor -TAO_Concurrency_Server::TAO_Concurrency_Server (void) +TAO_Concurrency_Server::TAO_Concurrency_Server () { } @@ -72,7 +72,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_ptr orb, } int -TAO_Concurrency_Server::fini (void) +TAO_Concurrency_Server::fini () { try { @@ -95,12 +95,12 @@ TAO_Concurrency_Server::fini (void) } CC_LockSetFactory * -TAO_Concurrency_Server::GetLockSetFactory(void) +TAO_Concurrency_Server::GetLockSetFactory() { return &this->lock_set_factory_; } -TAO_Concurrency_Server::~TAO_Concurrency_Server (void) +TAO_Concurrency_Server::~TAO_Concurrency_Server () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp index cfd92db0be4..749c421fe0c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp @@ -21,7 +21,7 @@ TAO_CEC_ConsumerAdmin::TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel *ec) this->event_channel_->consumer_poa (); } -TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void) +TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin () { } @@ -74,7 +74,7 @@ TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier) } void -TAO_CEC_ConsumerAdmin::shutdown (void) +TAO_CEC_ConsumerAdmin::shutdown () { this->push_admin_.shutdown (); @@ -82,19 +82,19 @@ TAO_CEC_ConsumerAdmin::shutdown (void) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_push_supplier (void) +TAO_CEC_ConsumerAdmin::obtain_push_supplier () { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_ConsumerAdmin::obtain_pull_supplier (void) +TAO_CEC_ConsumerAdmin::obtain_pull_supplier () { return this->pull_admin_.obtain (); } PortableServer::POA_ptr -TAO_CEC_ConsumerAdmin::_default_POA (void) +TAO_CEC_ConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp index cc9fab516c4..a0b70c10152 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void) +TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl () { } -TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl (void) +TAO_CEC_ConsumerControl::~TAO_CEC_ConsumerControl () { } int -TAO_CEC_ConsumerControl::activate (void) +TAO_CEC_ConsumerControl::activate () { return 0; } int -TAO_CEC_ConsumerControl::shutdown (void) +TAO_CEC_ConsumerControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp index c8703df70c7..84026edf994 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp @@ -41,7 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) +TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory () { if (orbid_dupped_ != 0) { @@ -50,7 +50,7 @@ TAO_CEC_Default_Factory::~TAO_CEC_Default_Factory (void) } int -TAO_CEC_Default_Factory::init_svcs (void) +TAO_CEC_Default_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()->insert ( @@ -423,7 +423,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_CEC_Default_Factory::fini (void) +TAO_CEC_Default_Factory::fini () { return 0; } @@ -1233,7 +1233,7 @@ TAO_CEC_Default_Factory::destroy_proxy_pull_supplier_collection (TAO_CEC_ProxyPu } ACE_Lock* -TAO_CEC_Default_Factory::create_consumer_lock (void) +TAO_CEC_Default_Factory::create_consumer_lock () { if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; @@ -1251,7 +1251,7 @@ TAO_CEC_Default_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_CEC_Default_Factory::create_supplier_lock (void) +TAO_CEC_Default_Factory::create_supplier_lock () { if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp index a98e625c404..192f6edc8c2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp @@ -3,23 +3,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void) +TAO_CEC_Dispatching::~TAO_CEC_Dispatching () { } // **************************************************************** -TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching (void) +TAO_CEC_Reactive_Dispatching::TAO_CEC_Reactive_Dispatching () { } void -TAO_CEC_Reactive_Dispatching::activate (void) +TAO_CEC_Reactive_Dispatching::activate () { } void -TAO_CEC_Reactive_Dispatching::shutdown (void) +TAO_CEC_Reactive_Dispatching::shutdown () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 4ee21c30070..af861810196 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_CEC_Dispatching_Task::svc (void) +TAO_CEC_Dispatching_Task::svc () { bool done = false; @@ -107,27 +107,27 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy, // **************************************************************** -TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void) +TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command () { } // **************************************************************** int -TAO_CEC_Shutdown_Task_Command::execute (void) +TAO_CEC_Shutdown_Task_Command::execute () { return -1; } // **************************************************************** -TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void) +TAO_CEC_Push_Command::~TAO_CEC_Push_Command () { this->proxy_->_decr_refcnt (); } int -TAO_CEC_Push_Command::execute (void) +TAO_CEC_Push_Command::execute () { this->proxy_->push_to_consumer (this->event_); return 0; @@ -136,13 +136,13 @@ TAO_CEC_Push_Command::execute (void) // **************************************************************** #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) -TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command (void) +TAO_CEC_Invoke_Command::~TAO_CEC_Invoke_Command () { this->proxy_->_decr_refcnt (); } int -TAO_CEC_Invoke_Command::execute (void) +TAO_CEC_Invoke_Command::execute () { this->proxy_->invoke_to_consumer (this->typed_event_); return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp index 78ab05ce1d2..c2223a2d8ba 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Destructor -TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void) +TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer () { } @@ -69,7 +69,7 @@ TAO_CEC_DynamicImplementationServer::_primary_interface (const PortableServer::O } PortableServer::POA_ptr -TAO_CEC_DynamicImplementationServer::_default_POA (void) +TAO_CEC_DynamicImplementationServer::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp index 522f8e5506b..579cfadd83d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp @@ -47,7 +47,7 @@ TAO_CEC_EventChannel (const TAO_CEC_EventChannel_Attributes& attr, this->factory_->create_supplier_control (this); } -TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) +TAO_CEC_EventChannel::~TAO_CEC_EventChannel () { this->factory_->destroy_dispatching (this->dispatching_); this->dispatching_ = 0; @@ -70,7 +70,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void) } void -TAO_CEC_EventChannel::activate (void) +TAO_CEC_EventChannel::activate () { this->dispatching_->activate (); this->pulling_strategy_->activate (); @@ -79,7 +79,7 @@ TAO_CEC_EventChannel::activate (void) } void -TAO_CEC_EventChannel::shutdown (void) +TAO_CEC_EventChannel::shutdown () { this->dispatching_->shutdown (); this->pulling_strategy_->shutdown (); @@ -176,19 +176,19 @@ TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier) } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_CEC_EventChannel::for_consumers (void) +TAO_CEC_EventChannel::for_consumers () { return this->consumer_admin_->_this (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_CEC_EventChannel::for_suppliers (void) +TAO_CEC_EventChannel::for_suppliers () { return this->supplier_admin_->_this (); } void -TAO_CEC_EventChannel::destroy (void) +TAO_CEC_EventChannel::destroy () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index deda68038c8..7087b92301b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -29,7 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : +TAO_CEC_Event_Loader::TAO_CEC_Event_Loader () : attributes_ (0) , factory_ (0) , ec_impl_ (0) @@ -41,7 +41,7 @@ TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void) : // Constructor } -TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void) +TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader () { // Destructor } @@ -405,7 +405,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, } int -TAO_CEC_Event_Loader::fini (void) +TAO_CEC_Event_Loader::fini () { // + Since it was activated with _this() you have to do the // canonical: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 1148ce28edb..13444dc750a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -94,9 +94,10 @@ protected: CosNaming::Name channel_name_; private: - // Disallow copying and assignment. - TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &); - TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &); + TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &) = delete; + TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &) = delete; + TAO_CEC_Event_Loader (TAO_CEC_Event_Loader &&) = delete; + TAO_CEC_Event_Loader &operator= (TAO_CEC_Event_Loader &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp index 6eef61ef41a..84e3bb84c64 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Factory::~TAO_CEC_Factory (void) +TAO_CEC_Factory::~TAO_CEC_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp index 6d80809278b..db1e6bf776d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp @@ -17,7 +17,7 @@ TAO_CEC_MT_Dispatching::TAO_CEC_MT_Dispatching (int nthreads, } void -TAO_CEC_MT_Dispatching::activate (void) +TAO_CEC_MT_Dispatching::activate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -41,7 +41,7 @@ TAO_CEC_MT_Dispatching::activate (void) } void -TAO_CEC_MT_Dispatching::shutdown (void) +TAO_CEC_MT_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp index a12bdf9b683..67ba41ddca5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp @@ -30,7 +30,7 @@ TAO_CEC_ProxyPullConsumer (TAO_CEC_EventChannel* ec, this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void) +TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); @@ -53,7 +53,7 @@ TAO_CEC_ProxyPullConsumer::activate ( } void -TAO_CEC_ProxyPullConsumer::deactivate (void) +TAO_CEC_ProxyPullConsumer::deactivate () { try { @@ -189,7 +189,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent ( } void -TAO_CEC_ProxyPullConsumer::shutdown (void) +TAO_CEC_ProxyPullConsumer::shutdown () { CosEventComm::PullSupplier_var supplier; @@ -219,21 +219,21 @@ TAO_CEC_ProxyPullConsumer::shutdown (void) } void -TAO_CEC_ProxyPullConsumer::cleanup_i (void) +TAO_CEC_ProxyPullConsumer::cleanup_i () { this->supplier_ = CosEventComm::PullSupplier::_nil (); } CORBA::ULong -TAO_CEC_ProxyPullConsumer::_incr_refcnt (void) +TAO_CEC_ProxyPullConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPullConsumer::_decr_refcnt (void) +TAO_CEC_ProxyPullConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -358,19 +358,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer () } PortableServer::POA_ptr -TAO_CEC_ProxyPullConsumer::_default_POA (void) +TAO_CEC_ProxyPullConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullConsumer::_add_ref (void) +TAO_CEC_ProxyPullConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullConsumer::_remove_ref (void) +TAO_CEC_ProxyPullConsumer::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp index db840f03ee5..b023d169da2 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp @@ -29,7 +29,7 @@ TAO_CEC_ProxyPullSupplier::TAO_CEC_ProxyPullSupplier this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void) +TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_supplier_lock (this->lock_); @@ -52,7 +52,7 @@ TAO_CEC_ProxyPullSupplier::activate ( } void -TAO_CEC_ProxyPullSupplier::deactivate (void) +TAO_CEC_ProxyPullSupplier::deactivate () { try { @@ -72,7 +72,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (void) } void -TAO_CEC_ProxyPullSupplier::shutdown (void) +TAO_CEC_ProxyPullSupplier::shutdown () { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -148,7 +148,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event) } CORBA::Any * -TAO_CEC_ProxyPullSupplier::pull (void) +TAO_CEC_ProxyPullSupplier::pull () { if (this->is_connected () == 0) throw CosEventComm::Disconnected (); @@ -190,7 +190,7 @@ TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event) } void -TAO_CEC_ProxyPullSupplier::cleanup_i (void) +TAO_CEC_ProxyPullSupplier::cleanup_i () { this->consumer_ = CosEventComm::PullConsumer::_nil (); @@ -198,14 +198,14 @@ TAO_CEC_ProxyPullSupplier::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPullSupplier::_incr_refcnt (void) +TAO_CEC_ProxyPullSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPullSupplier::_decr_refcnt (void) +TAO_CEC_ProxyPullSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -330,19 +330,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier () } PortableServer::POA_ptr -TAO_CEC_ProxyPullSupplier::_default_POA (void) +TAO_CEC_ProxyPullSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPullSupplier::_add_ref (void) +TAO_CEC_ProxyPullSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPullSupplier::_remove_ref (void) +TAO_CEC_ProxyPullSupplier::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp index 27bf794dd05..18428148b39 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp @@ -30,7 +30,7 @@ TAO_CEC_ProxyPushConsumer (TAO_CEC_EventChannel* ec, this->event_channel_->get_servant_retry_map ().bind (this, 0); } -TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void) +TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer () { this->event_channel_->get_servant_retry_map ().unbind (this); this->event_channel_->destroy_consumer_lock (this->lock_); @@ -53,7 +53,7 @@ TAO_CEC_ProxyPushConsumer::activate ( } void -TAO_CEC_ProxyPushConsumer::deactivate (void) +TAO_CEC_ProxyPushConsumer::deactivate () { try { @@ -103,7 +103,7 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent ( } void -TAO_CEC_ProxyPushConsumer::shutdown (void) +TAO_CEC_ProxyPushConsumer::shutdown () { CosEventComm::PushSupplier_var supplier; @@ -134,7 +134,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (void) } void -TAO_CEC_ProxyPushConsumer::cleanup_i (void) +TAO_CEC_ProxyPushConsumer::cleanup_i () { this->supplier_ = CosEventComm::PushSupplier::_nil (); @@ -142,14 +142,14 @@ TAO_CEC_ProxyPushConsumer::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPushConsumer::_incr_refcnt (void) +TAO_CEC_ProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPushConsumer::_decr_refcnt (void) +TAO_CEC_ProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -288,19 +288,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_CEC_ProxyPushConsumer::_default_POA (void) +TAO_CEC_ProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushConsumer::_add_ref (void) +TAO_CEC_ProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushConsumer::_remove_ref (void) +TAO_CEC_ProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } @@ -334,7 +334,7 @@ TAO_CEC_ProxyPushConsumer_Guard:: } TAO_CEC_ProxyPushConsumer_Guard:: - ~TAO_CEC_ProxyPushConsumer_Guard (void) + ~TAO_CEC_ProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp index b1a1569031a..0e5bc198acb 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp @@ -71,7 +71,7 @@ TAO_CEC_ProxyPushSupplier (TAO_CEC_TypedEventChannel* ec, } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void) +TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier () { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) @@ -107,7 +107,7 @@ TAO_CEC_ProxyPushSupplier::activate ( } void -TAO_CEC_ProxyPushSupplier::deactivate (void) +TAO_CEC_ProxyPushSupplier::deactivate () { try { @@ -127,7 +127,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (void) } void -TAO_CEC_ProxyPushSupplier::shutdown (void) +TAO_CEC_ProxyPushSupplier::shutdown () { #if defined (TAO_HAS_TYPED_EVENT_CHANNEL) if (this->is_typed_ec () ) @@ -277,7 +277,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event) } void -TAO_CEC_ProxyPushSupplier::cleanup_i (void) +TAO_CEC_ProxyPushSupplier::cleanup_i () { this->consumer_ = CosEventComm::PushConsumer::_nil (); @@ -288,14 +288,14 @@ TAO_CEC_ProxyPushSupplier::cleanup_i (void) } CORBA::ULong -TAO_CEC_ProxyPushSupplier::_incr_refcnt (void) +TAO_CEC_ProxyPushSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_ProxyPushSupplier::_decr_refcnt (void) +TAO_CEC_ProxyPushSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -876,19 +876,19 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent ( } PortableServer::POA_ptr -TAO_CEC_ProxyPushSupplier::_default_POA (void) +TAO_CEC_ProxyPushSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_ProxyPushSupplier::_add_ref (void) +TAO_CEC_ProxyPushSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_ProxyPushSupplier::_remove_ref (void) +TAO_CEC_ProxyPushSupplier::_remove_ref () { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp index 4cafb289b22..6f61ade96b6 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy (void) +TAO_CEC_Pulling_Strategy::~TAO_CEC_Pulling_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp index d443ae002cb..ab8852c1d3c 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_ConsumerControl:: } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void) +TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl () { } @@ -232,7 +232,7 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout ( } int -TAO_CEC_Reactive_ConsumerControl::activate (void) +TAO_CEC_Reactive_ConsumerControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -283,7 +283,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void) } int -TAO_CEC_Reactive_ConsumerControl::shutdown (void) +TAO_CEC_Reactive_ConsumerControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp index 1d0b3ad00cb..c17ed7364b5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout ( } void -TAO_CEC_Reactive_Pulling_Strategy::activate (void) +TAO_CEC_Reactive_Pulling_Strategy::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 timer_id_ = this->reactor_->schedule_timer (&this->adapter_, @@ -124,7 +124,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void) } void -TAO_CEC_Reactive_Pulling_Strategy::shutdown (void) +TAO_CEC_Reactive_Pulling_Strategy::shutdown () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 this->reactor_->cancel_timer (timer_id_); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp index f92360df4c3..14adf5a5fc5 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp @@ -83,7 +83,7 @@ TAO_CEC_Reactive_SupplierControl:: } #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */ -TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void) +TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl () { } @@ -232,7 +232,7 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout ( } int -TAO_CEC_Reactive_SupplierControl::activate (void) +TAO_CEC_Reactive_SupplierControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -283,7 +283,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void) } int -TAO_CEC_Reactive_SupplierControl::shutdown (void) +TAO_CEC_Reactive_SupplierControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp index fadba6678b8..45685c93d41 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp @@ -19,12 +19,12 @@ TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec) this->event_channel_->supplier_poa (); } -TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void) +TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin () { } PortableServer::POA_ptr -TAO_CEC_SupplierAdmin::_default_POA (void) +TAO_CEC_SupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -66,7 +66,7 @@ TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer) } void -TAO_CEC_SupplierAdmin::shutdown (void) +TAO_CEC_SupplierAdmin::shutdown () { this->push_admin_.shutdown (); @@ -74,13 +74,13 @@ TAO_CEC_SupplierAdmin::shutdown (void) } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_push_consumer (void) +TAO_CEC_SupplierAdmin::obtain_push_consumer () { return this->push_admin_.obtain (); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_SupplierAdmin::obtain_pull_consumer (void) +TAO_CEC_SupplierAdmin::obtain_pull_consumer () { return this->pull_admin_.obtain (); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp index a359fd9549a..50bb6bd63ef 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void) +TAO_CEC_SupplierControl::TAO_CEC_SupplierControl () { } -TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl (void) +TAO_CEC_SupplierControl::~TAO_CEC_SupplierControl () { } int -TAO_CEC_SupplierControl::activate (void) +TAO_CEC_SupplierControl::activate () { return 0; } int -TAO_CEC_SupplierControl::shutdown (void) +TAO_CEC_SupplierControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp index ca290520a07..0c57d545a0b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp @@ -18,7 +18,7 @@ TAO_CEC_TypedConsumerAdmin::TAO_CEC_TypedConsumerAdmin (TAO_CEC_TypedEventChanne } // Implementation skeleton destructor -TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin (void) +TAO_CEC_TypedConsumerAdmin::~TAO_CEC_TypedConsumerAdmin () { } @@ -49,7 +49,7 @@ TAO_CEC_TypedConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier) } void -TAO_CEC_TypedConsumerAdmin::shutdown (void) +TAO_CEC_TypedConsumerAdmin::shutdown () { this->typed_push_admin_.shutdown (); } @@ -77,19 +77,19 @@ TAO_CEC_TypedConsumerAdmin::obtain_typed_push_supplier ( } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_push_supplier (void) +TAO_CEC_TypedConsumerAdmin::obtain_push_supplier () { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier (void) +TAO_CEC_TypedConsumerAdmin::obtain_pull_supplier () { throw CORBA::NO_IMPLEMENT (); } PortableServer::POA_ptr -TAO_CEC_TypedConsumerAdmin::_default_POA (void) +TAO_CEC_TypedConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index 76ddff0af4a..2ed8f27eb16 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -55,7 +55,7 @@ TAO_CEC_TypedEventChannel (const TAO_CEC_TypedEventChannel_Attributes& attr, } // Implementation skeleton destructor -TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) +TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel () { this->clear_ifr_cache (); this->interface_description_.close (); @@ -73,7 +73,7 @@ TAO_CEC_TypedEventChannel::~TAO_CEC_TypedEventChannel (void) } void -TAO_CEC_TypedEventChannel::activate (void) +TAO_CEC_TypedEventChannel::activate () { this->dispatching_->activate (); this->consumer_control_->activate (); @@ -98,7 +98,7 @@ namespace } void -TAO_CEC_TypedEventChannel::shutdown (void) +TAO_CEC_TypedEventChannel::shutdown () { this->dispatching_->shutdown (); this->supplier_control_->shutdown (); @@ -213,7 +213,7 @@ TAO_CEC_TypedEventChannel::insert_into_ifr_cache (const char *operation_, // Clear the ifr cache, freeing up all its contents. int -TAO_CEC_TypedEventChannel::clear_ifr_cache (void) +TAO_CEC_TypedEventChannel::clear_ifr_cache () { for (Iterator i = this->interface_description_.begin (); i != this->interface_description_.end (); @@ -522,19 +522,19 @@ TAO_CEC_TypedEventChannel::create_list (CORBA::Long count, // The CosTypedEventChannelAdmin::TypedEventChannel methods... CosTypedEventChannelAdmin::TypedConsumerAdmin_ptr -TAO_CEC_TypedEventChannel::for_consumers (void) +TAO_CEC_TypedEventChannel::for_consumers () { return this->typed_consumer_admin_->_this (); } CosTypedEventChannelAdmin::TypedSupplierAdmin_ptr -TAO_CEC_TypedEventChannel::for_suppliers (void) +TAO_CEC_TypedEventChannel::for_suppliers () { return this->typed_supplier_admin_->_this (); } void -TAO_CEC_TypedEventChannel::destroy (void) +TAO_CEC_TypedEventChannel::destroy () { if (!destroyed_) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp index 93b02abfe2f..33e9199368d 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp @@ -55,7 +55,7 @@ TAO_CEC_TypedProxyPushConsumer::TAO_CEC_TypedProxyPushConsumer } // Implementation skeleton destructor -TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer (void) +TAO_CEC_TypedProxyPushConsumer::~TAO_CEC_TypedProxyPushConsumer () { try{ this->default_POA_->deactivate_object (this->oid_.in ()); @@ -86,7 +86,7 @@ TAO_CEC_TypedProxyPushConsumer::activate ( } void -TAO_CEC_TypedProxyPushConsumer::deactivate (void) +TAO_CEC_TypedProxyPushConsumer::deactivate () { try { @@ -137,7 +137,7 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent ( } void -TAO_CEC_TypedProxyPushConsumer::shutdown (void) +TAO_CEC_TypedProxyPushConsumer::shutdown () { CosEventComm::PushSupplier_var supplier; @@ -168,7 +168,7 @@ TAO_CEC_TypedProxyPushConsumer::shutdown (void) } void -TAO_CEC_TypedProxyPushConsumer::cleanup_i (void) +TAO_CEC_TypedProxyPushConsumer::cleanup_i () { this->typed_supplier_ = CosEventComm::PushSupplier::_nil (); @@ -176,14 +176,14 @@ TAO_CEC_TypedProxyPushConsumer::cleanup_i (void) } CORBA::ULong -TAO_CEC_TypedProxyPushConsumer::_incr_refcnt (void) +TAO_CEC_TypedProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } CORBA::ULong -TAO_CEC_TypedProxyPushConsumer::_decr_refcnt (void) +TAO_CEC_TypedProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -313,25 +313,25 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_CEC_TypedProxyPushConsumer::_default_POA (void) +TAO_CEC_TypedProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_CEC_TypedProxyPushConsumer::_add_ref (void) +TAO_CEC_TypedProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_CEC_TypedProxyPushConsumer::_remove_ref (void) +TAO_CEC_TypedProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } CORBA::Object_ptr -TAO_CEC_TypedProxyPushConsumer::get_typed_consumer (void) +TAO_CEC_TypedProxyPushConsumer::get_typed_consumer () { CORBA::Object_var server = @@ -382,7 +382,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard:: } TAO_CEC_TypedProxyPushConsumer_Guard:: - ~TAO_CEC_TypedProxyPushConsumer_Guard (void) + ~TAO_CEC_TypedProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp index f5dc2ce81bc..2c00bc62d84 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp @@ -17,12 +17,12 @@ TAO_CEC_TypedSupplierAdmin::TAO_CEC_TypedSupplierAdmin (TAO_CEC_TypedEventChanne } // Implementation skeleton destructor -TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin (void) +TAO_CEC_TypedSupplierAdmin::~TAO_CEC_TypedSupplierAdmin () { } PortableServer::POA_ptr -TAO_CEC_TypedSupplierAdmin::_default_POA (void) +TAO_CEC_TypedSupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } @@ -46,7 +46,7 @@ TAO_CEC_TypedSupplierAdmin::disconnected (TAO_CEC_TypedProxyPushConsumer *consum } void -TAO_CEC_TypedSupplierAdmin::shutdown (void) +TAO_CEC_TypedSupplierAdmin::shutdown () { this->typed_push_admin_.shutdown (); } @@ -75,13 +75,13 @@ TAO_CEC_TypedSupplierAdmin::obtain_typed_pull_consumer ( } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_push_consumer (void) +TAO_CEC_TypedSupplierAdmin::obtain_push_consumer () { throw CORBA::NO_IMPLEMENT (); } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer (void) +TAO_CEC_TypedSupplierAdmin::obtain_pull_consumer () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp index b52c4f60d5e..1fdf7e17b3c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp @@ -2,11 +2,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void) +TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown () { } -TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler (void) +TAO_ECG_Dgram_Handler::~TAO_ECG_Dgram_Handler () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp index 7115d407a11..8f69b305b86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp @@ -14,12 +14,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor (void) +TAO_ECG_CDR_Processor::~TAO_ECG_CDR_Processor () { } // **************************************************************** -TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry (void) +TAO_ECG_UDP_Request_Entry::~TAO_ECG_UDP_Request_Entry () { if (this->own_received_fragments_) { @@ -107,7 +107,7 @@ TAO_ECG_UDP_Request_Entry::mark_received (CORBA::ULong fragment_id) } int -TAO_ECG_UDP_Request_Entry::complete (void) const +TAO_ECG_UDP_Request_Entry::complete () const { for (CORBA::ULong i = 0; i < this->received_fragments_size_; @@ -151,7 +151,7 @@ TAO_ECG_CDR_Message_Receiver::Requests::init (size_t size, return 0; } -TAO_ECG_CDR_Message_Receiver::Requests::~Requests (void) +TAO_ECG_CDR_Message_Receiver::Requests::~Requests () { for (size_t i = 0; i < this->size_; ++i) { @@ -488,7 +488,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) ACE_NEW_RETURN (requests, Requests, 0); - auto_ptr<Requests> requests_aptr (requests); + std::unique_ptr<Requests> requests_aptr (requests); if (requests->init (this->max_requests_, this->min_purge_count_) == -1 || this->request_map_.bind (from, requests, entry) == -1) @@ -504,7 +504,7 @@ TAO_ECG_CDR_Message_Receiver::get_source_entry (const ACE_INET_Addr &from) } void -TAO_ECG_CDR_Message_Receiver::shutdown (void) +TAO_ECG_CDR_Message_Receiver::shutdown () { // ACE_GUARD (ACE_Lock, guard, *this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp index b4968b356b5..0d52735a8f6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp @@ -15,7 +15,7 @@ TAO_ECG_Complex_Address_Server::TAO_ECG_Complex_Address_Server ( { } -TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server (void) +TAO_ECG_Complex_Address_Server::~TAO_ECG_Complex_Address_Server () { } @@ -188,7 +188,7 @@ TAO_ECG_Complex_Address_Server::get_address ( void -TAO_ECG_Complex_Address_Server::dump_content (void) +TAO_ECG_Complex_Address_Server::dump_content () { ORBSVCS_DEBUG ((LM_DEBUG, "Default address: %s:%d\n", this->default_addr_.get_host_addr (), diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp index 47557ef714e..9c513ff2b77 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp @@ -4,22 +4,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void) +TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control () { } -TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control (void) +TAO_ECG_ConsumerEC_Control::~TAO_ECG_ConsumerEC_Control () { } int -TAO_ECG_ConsumerEC_Control::activate (void) +TAO_ECG_ConsumerEC_Control::activate () { return 0; } int -TAO_ECG_ConsumerEC_Control::shutdown (void) +TAO_ECG_ConsumerEC_Control::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 970534d4332..fce5908ebc4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::TAO_ECG_Mcast_EH (TAO_ECG_Dgram_Handler *recv, ACE_ASSERT (this->receiver_); } -TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) +TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH () { ACE_OS::free (this->net_if_); } @@ -78,7 +78,7 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec) } int -TAO_ECG_Mcast_EH::shutdown (void) +TAO_ECG_Mcast_EH::shutdown () { // Already shut down. if (!this->receiver_) @@ -303,7 +303,7 @@ TAO_ECG_Mcast_EH::Observer::update_supplier ( } void -TAO_ECG_Mcast_EH::Observer::shutdown (void) +TAO_ECG_Mcast_EH::Observer::shutdown () { this->eh_ = 0; this->deactivator_.deactivate (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index a679bd3b058..78d4be0b66c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -28,7 +28,7 @@ typedef TAO_EC_Shutdown_Command<PortableServer::Servant_var<TAO_ECG_UDP_Receiver UDP_Receiver_Shutdown; int -TAO_ECG_Mcast_Gateway::init_svcs (void) +TAO_ECG_Mcast_Gateway::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_ECG_Mcast_Gateway); @@ -36,7 +36,7 @@ TAO_ECG_Mcast_Gateway::init_svcs (void) int -TAO_ECG_Mcast_Gateway::fini (void) +TAO_ECG_Mcast_Gateway::fini () { return 0; } @@ -236,7 +236,7 @@ TAO_ECG_Mcast_Gateway::init ( } int -TAO_ECG_Mcast_Gateway::validate_configuration (void) +TAO_ECG_Mcast_Gateway::validate_configuration () { if ((this->handler_type_ == ECG_HANDLER_BASIC || this->handler_type_ == ECG_HANDLER_UDP) @@ -280,7 +280,7 @@ TAO_ECG_Mcast_Gateway::validate_configuration (void) } TAO_ECG_Refcounted_Endpoint -TAO_ECG_Mcast_Gateway::init_endpoint (void) +TAO_ECG_Mcast_Gateway::init_endpoint () { TAO_ECG_UDP_Out_Endpoint* endpoint = 0; TAO_ECG_Refcounted_Endpoint refendpoint; @@ -351,7 +351,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void) } PortableServer::ServantBase * -TAO_ECG_Mcast_Gateway::init_address_server (void) +TAO_ECG_Mcast_Gateway::init_address_server () { const char * address_server_arg = (this->address_server_arg_.length ()) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp index bad8ff7df7b..a72497a0d44 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp @@ -28,7 +28,7 @@ TAO_ECG_Reactive_ConsumerEC_Control:: this->orb_->orb_core ()->reactor (); } -TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control (void) +TAO_ECG_Reactive_ConsumerEC_Control::~TAO_ECG_Reactive_ConsumerEC_Control () { } @@ -104,7 +104,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::handle_timeout ( } int -TAO_ECG_Reactive_ConsumerEC_Control::activate (void) +TAO_ECG_Reactive_ConsumerEC_Control::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -151,7 +151,7 @@ TAO_ECG_Reactive_ConsumerEC_Control::activate (void) } int -TAO_ECG_Reactive_ConsumerEC_Control::shutdown (void) +TAO_ECG_Reactive_ConsumerEC_Control::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp index 0ca681bb896..272b215efc9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp @@ -27,7 +27,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control:: this->orb_->orb_core ()->reactor (); } -TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control (void) +TAO_ECG_Reconnect_ConsumerEC_Control::~TAO_ECG_Reconnect_ConsumerEC_Control () { } @@ -143,7 +143,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::handle_timeout ( } int -TAO_ECG_Reconnect_ConsumerEC_Control::activate (void) +TAO_ECG_Reconnect_ConsumerEC_Control::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -190,7 +190,7 @@ TAO_ECG_Reconnect_ConsumerEC_Control::activate (void) } int -TAO_ECG_Reconnect_ConsumerEC_Control::shutdown (void) +TAO_ECG_Reconnect_ConsumerEC_Control::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp index 1d1249873ce..d1c14b7969c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void) +TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server () { } -TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server (void) +TAO_ECG_Simple_Address_Server::~TAO_ECG_Simple_Address_Server () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp index bce028cdd7b..b671a21d7c0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp @@ -11,7 +11,7 @@ TAO_ECG_Simple_Mcast_EH::TAO_ECG_Simple_Mcast_EH (TAO_ECG_Dgram_Handler *recv) ACE_ASSERT (this->receiver_); } -TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH (void) +TAO_ECG_Simple_Mcast_EH::~TAO_ECG_Simple_Mcast_EH () { } @@ -59,7 +59,7 @@ TAO_ECG_Simple_Mcast_EH::open (const char * mcast_addr, } int -TAO_ECG_Simple_Mcast_EH::shutdown (void) +TAO_ECG_Simple_Mcast_EH::shutdown () { // Already shut down. if (!this->receiver_) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp index b0e6e278d68..53d96374eb8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp @@ -17,7 +17,7 @@ TAO_ECG_UDP_EH::TAO_ECG_UDP_EH (TAO_ECG_Dgram_Handler *recv) ACE_ASSERT (this->receiver_); } -TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH (void) +TAO_ECG_UDP_EH::~TAO_ECG_UDP_EH () { } @@ -50,7 +50,7 @@ TAO_ECG_UDP_EH::open (const ACE_INET_Addr& ipaddr, } int -TAO_ECG_UDP_EH::shutdown (void) +TAO_ECG_UDP_EH::shutdown () { // Already shut down. if (!this->receiver_) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp index 0d27483b7eb..a00410750a6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint (void) +TAO_ECG_UDP_Out_Endpoint::~TAO_ECG_UDP_Out_Endpoint () { this->dgram_.close (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp index 6ac398553b0..a0388b52b59 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void) +TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver () { this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -127,7 +127,7 @@ TAO_ECG_UDP_Receiver::reconnect (const RtecEventChannelAdmin::SupplierQOS& pub) } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (void) +TAO_ECG_UDP_Receiver::disconnect_push_supplier () { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); @@ -136,7 +136,7 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (void) } void -TAO_ECG_UDP_Receiver::shutdown (void) +TAO_ECG_UDP_Receiver::shutdown () { if (this->handler_rptr_.get ()) this->handler_rptr_->shutdown (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index e742497719a..2e5c0b9d1a3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void) +TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender () { } @@ -131,7 +131,7 @@ TAO_ECG_UDP_Sender::reconnect (const RtecEventChannelAdmin::ConsumerQOS& sub) } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (void) +TAO_ECG_UDP_Sender::disconnect_push_consumer () { // Prevent attempts to disconnect. this->auto_proxy_disconnect_.disallow_command (); @@ -140,7 +140,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (void) } void -TAO_ECG_UDP_Sender::shutdown (void) +TAO_ECG_UDP_Sender::shutdown () { this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 9aeb0fd5bee..10d6b5aa22d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -16,7 +16,7 @@ TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[], } } -TAO_EC_And_Filter::~TAO_EC_And_Filter (void) +TAO_EC_And_Filter::~TAO_EC_And_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -32,19 +32,19 @@ TAO_EC_And_Filter::~TAO_EC_And_Filter (void) } TAO_EC_Filter::ChildrenIterator -TAO_EC_And_Filter::begin (void) const +TAO_EC_And_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_And_Filter::end (void) const +TAO_EC_And_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_And_Filter::size (void) const +TAO_EC_And_Filter::size () const { return static_cast<CORBA::ULong> (this->n_); } @@ -104,7 +104,7 @@ TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_And_Filter::clear (void) +TAO_EC_And_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -116,7 +116,7 @@ TAO_EC_And_Filter::clear (void) } CORBA::ULong -TAO_EC_And_Filter::max_event_size (void) const +TAO_EC_And_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp index 8be15fbd97d..fb9914cc01f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp @@ -20,11 +20,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void) +TAO_EC_Basic_Factory::TAO_EC_Basic_Factory () { } -TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory (void) +TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory () { } @@ -194,7 +194,7 @@ TAO_EC_Basic_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSu } ACE_Lock* -TAO_EC_Basic_Factory::create_consumer_lock (void) +TAO_EC_Basic_Factory::create_consumer_lock () { return new ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (); } @@ -206,7 +206,7 @@ TAO_EC_Basic_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Basic_Factory::create_supplier_lock (void) +TAO_EC_Basic_Factory::create_supplier_lock () { return new ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX> (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index a108503b0e5..10b8410bc22 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void) +TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index 0db4efa2b44..4cb7ed15ba9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -12,25 +12,25 @@ TAO_EC_Bitmask_Filter::TAO_EC_Bitmask_Filter (CORBA::ULong source_mask, this->adopt_child (this->child_); } -TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter (void) +TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter () { delete this->child_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Bitmask_Filter::begin (void) const +TAO_EC_Bitmask_Filter::begin () const { return const_cast<TAO_EC_Filter**> (&this->child_); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Bitmask_Filter::end (void) const +TAO_EC_Bitmask_Filter::end () const { return const_cast<TAO_EC_Filter**> (&this->child_) + 1; } int -TAO_EC_Bitmask_Filter::size (void) const +TAO_EC_Bitmask_Filter::size () const { return 1; } @@ -80,13 +80,13 @@ TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Bitmask_Filter::clear (void) +TAO_EC_Bitmask_Filter::clear () { this->child_->clear (); } CORBA::ULong -TAO_EC_Bitmask_Filter::max_event_size (void) const +TAO_EC_Bitmask_Filter::max_event_size () const { return this->child_->max_event_size (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 251a43c8732..3ea1df0215e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -24,7 +24,7 @@ TAO_EC_Conjunction_Filter:: this->clear (); } -TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void) +TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -43,7 +43,7 @@ TAO_EC_Conjunction_Filter::~TAO_EC_Conjunction_Filter (void) } int -TAO_EC_Conjunction_Filter::all_received (void) const +TAO_EC_Conjunction_Filter::all_received () const { Word* i = this->bitvec_; for (; @@ -57,19 +57,19 @@ TAO_EC_Conjunction_Filter::all_received (void) const } TAO_EC_Filter::ChildrenIterator -TAO_EC_Conjunction_Filter::begin (void) const +TAO_EC_Conjunction_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Conjunction_Filter::end (void) const +TAO_EC_Conjunction_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_Conjunction_Filter::size (void) const +TAO_EC_Conjunction_Filter::size () const { return static_cast<int> (this->n_); } @@ -135,7 +135,7 @@ TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Conjunction_Filter::clear (void) +TAO_EC_Conjunction_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -159,7 +159,7 @@ TAO_EC_Conjunction_Filter::clear (void) } CORBA::ULong -TAO_EC_Conjunction_Filter::max_event_size (void) const +TAO_EC_Conjunction_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index da902aa0dc0..a7d2d0e4a55 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -15,18 +15,18 @@ TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) this->event_channel_->consumer_poa (); } -TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) +TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin () { } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (void) +TAO_EC_ConsumerAdmin::obtain_push_supplier () { return this->obtain (); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (void) +TAO_EC_ConsumerAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 9b2e00add98..a972374918a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -2,22 +2,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void) +TAO_EC_ConsumerControl::TAO_EC_ConsumerControl () { } -TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl (void) +TAO_EC_ConsumerControl::~TAO_EC_ConsumerControl () { } int -TAO_EC_ConsumerControl::activate (void) +TAO_EC_ConsumerControl::activate () { return 0; } int -TAO_EC_ConsumerControl::shutdown (void) +TAO_EC_ConsumerControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp index baf9a4b7055..f9e9063c993 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp @@ -40,12 +40,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void) +TAO_EC_Default_Factory::~TAO_EC_Default_Factory () { } int -TAO_EC_Default_Factory::init_svcs (void) +TAO_EC_Default_Factory::init_svcs () { TAO_EC_Simple_Queue_Full_Action::init_svcs(); return ACE_Service_Config::static_svcs ()-> @@ -498,7 +498,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Default_Factory::fini (void) +TAO_EC_Default_Factory::fini () { return 0; } @@ -914,7 +914,7 @@ TAO_EC_Default_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush } ACE_Lock* -TAO_EC_Default_Factory::create_consumer_lock (void) +TAO_EC_Default_Factory::create_consumer_lock () { if (this->consumer_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; @@ -932,7 +932,7 @@ TAO_EC_Default_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Default_Factory::create_supplier_lock (void) +TAO_EC_Default_Factory::create_supplier_lock () { if (this->supplier_lock_ == 0) return new ACE_Lock_Adapter<ACE_Null_Mutex>; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp index a4f22d857e1..731206ed1b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp @@ -14,7 +14,7 @@ TAO_EC_Default_ProxyPushConsumer:: { } -TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer (void) +TAO_EC_Default_ProxyPushConsumer::~TAO_EC_Default_ProxyPushConsumer () { } @@ -133,19 +133,19 @@ TAO_EC_Default_ProxyPushConsumer::disconnect_push_consumer () } PortableServer::POA_ptr -TAO_EC_Default_ProxyPushConsumer::_default_POA (void) +TAO_EC_Default_ProxyPushConsumer::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_Default_ProxyPushConsumer::_add_ref (void) +TAO_EC_Default_ProxyPushConsumer::_add_ref () { this->_incr_refcnt (); } void -TAO_EC_Default_ProxyPushConsumer::_remove_ref (void) +TAO_EC_Default_ProxyPushConsumer::_remove_ref () { this->_decr_refcnt (); } @@ -158,7 +158,7 @@ TAO_EC_Default_ProxyPushConsumer::activate ( } PortableServer::ObjectId -TAO_EC_Default_ProxyPushConsumer::object_id (void) +TAO_EC_Default_ProxyPushConsumer::object_id () { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp index da8a8b21e9e..ed1538aea45 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.cpp @@ -15,7 +15,7 @@ TAO_EC_Default_ProxyPushSupplier::TAO_EC_Default_ProxyPushSupplier ( { } -TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier (void) +TAO_EC_Default_ProxyPushSupplier::~TAO_EC_Default_ProxyPushSupplier () { } @@ -146,31 +146,31 @@ TAO_EC_Default_ProxyPushSupplier::disconnect_push_supplier () } void -TAO_EC_Default_ProxyPushSupplier::suspend_connection (void) +TAO_EC_Default_ProxyPushSupplier::suspend_connection () { this->suspend_connection_locked (); } void -TAO_EC_Default_ProxyPushSupplier::resume_connection (void) +TAO_EC_Default_ProxyPushSupplier::resume_connection () { this->resume_connection_locked (); } PortableServer::POA_ptr -TAO_EC_Default_ProxyPushSupplier::_default_POA (void) +TAO_EC_Default_ProxyPushSupplier::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_Default_ProxyPushSupplier::_add_ref (void) +TAO_EC_Default_ProxyPushSupplier::_add_ref () { this->_incr_refcnt (); } void -TAO_EC_Default_ProxyPushSupplier::_remove_ref (void) +TAO_EC_Default_ProxyPushSupplier::_remove_ref () { this->_decr_refcnt (); } @@ -183,7 +183,7 @@ TAO_EC_Default_ProxyPushSupplier::activate ( } PortableServer::ObjectId -TAO_EC_Default_ProxyPushSupplier::object_id (void) +TAO_EC_Default_ProxyPushSupplier::object_id () { PortableServer::ObjectId_var result = this->default_POA_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index ea7da34ac34..9d036908440 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -17,7 +17,7 @@ TAO_EC_Disjunction_Filter:: } } -TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void) +TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter () { TAO_EC_Filter** end = this->children_ + this->n_; for (TAO_EC_Filter** i = this->children_; @@ -33,19 +33,19 @@ TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void) } TAO_EC_Filter::ChildrenIterator -TAO_EC_Disjunction_Filter::begin (void) const +TAO_EC_Disjunction_Filter::begin () const { return this->children_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Disjunction_Filter::end (void) const +TAO_EC_Disjunction_Filter::end () const { return this->children_ + this->n_; } int -TAO_EC_Disjunction_Filter::size (void) const +TAO_EC_Disjunction_Filter::size () const { return static_cast<int> (this->n_); } @@ -99,7 +99,7 @@ TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Disjunction_Filter::clear (void) +TAO_EC_Disjunction_Filter::clear () { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); @@ -111,7 +111,7 @@ TAO_EC_Disjunction_Filter::clear (void) } CORBA::ULong -TAO_EC_Disjunction_Filter::max_event_size (void) const +TAO_EC_Disjunction_Filter::max_event_size () const { CORBA::ULong n = 0; ChildrenIterator end = this->end (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index 61e9dd657be..2361f7bf3eb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Dispatching::~TAO_EC_Dispatching (void) +TAO_EC_Dispatching::~TAO_EC_Dispatching () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 35d689302dd..3e8cd26ef17 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) +TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action () : queue_full_action_return_value_ (WAIT_TO_EMPTY) { } @@ -21,7 +21,7 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void) /// Helper function to register the default action into the service /// configurator. int -TAO_EC_Simple_Queue_Full_Action::init_svcs (void) +TAO_EC_Simple_Queue_Full_Action::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action); @@ -56,7 +56,7 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Simple_Queue_Full_Action::fini (void) +TAO_EC_Simple_Queue_Full_Action::fini () { return 0; } @@ -83,7 +83,7 @@ ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action) TAO_BEGIN_VERSIONED_NAMESPACE_DECL bool -TAO_EC_Queue::is_full_i (void) +TAO_EC_Queue::is_full_i () { return static_cast<size_t> (this->cur_count_) > this->high_water_mark_; } @@ -91,7 +91,7 @@ TAO_EC_Queue::is_full_i (void) // **************************************************************** int -TAO_EC_Dispatching_Task::svc (void) +TAO_EC_Dispatching_Task::svc () { bool done = false; @@ -180,27 +180,27 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, // **************************************************************** -TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void) +TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command () { } // **************************************************************** int -TAO_EC_Shutdown_Task_Command::execute (void) +TAO_EC_Shutdown_Task_Command::execute () { return -1; } // **************************************************************** -TAO_EC_Push_Command::~TAO_EC_Push_Command (void) +TAO_EC_Push_Command::~TAO_EC_Push_Command () { this->proxy_->_decr_refcnt (); } int -TAO_EC_Push_Command::execute (void) +TAO_EC_Push_Command::execute () { this->proxy_->push_to_consumer (this->consumer_.in (), this->event_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp index d1ccf21bc5f..c392ccf3ac7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp @@ -41,7 +41,7 @@ TAO_EC_Event_Channel_Base (const TAO_EC_Event_Channel_Attributes& attr, CORBA::Object::_duplicate (attr.scheduler); } -TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) +TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base () { // Destroy Strategies in the reverse order of creation, they // reference to each other during destruction and thus need to be @@ -78,7 +78,7 @@ TAO_EC_Event_Channel_Base::~TAO_EC_Event_Channel_Base (void) } void -TAO_EC_Event_Channel_Base::create_strategies (void) +TAO_EC_Event_Channel_Base::create_strategies () { this->dispatching_ = this->factory_->create_dispatching (this); @@ -105,7 +105,7 @@ TAO_EC_Event_Channel_Base::create_strategies (void) } void -TAO_EC_Event_Channel_Base::activate (void) +TAO_EC_Event_Channel_Base::activate () { { // First check if the EC is idle, if it is not then we need to @@ -129,7 +129,7 @@ TAO_EC_Event_Channel_Base::activate (void) } void -TAO_EC_Event_Channel_Base::shutdown (void) +TAO_EC_Event_Channel_Base::shutdown () { { // First check if the EC is already active, if it is not then we @@ -161,7 +161,7 @@ TAO_EC_Event_Channel_Base::shutdown (void) } void -TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void) +TAO_EC_Event_Channel_Base::deactivate_supplier_admin () { try { @@ -178,7 +178,7 @@ TAO_EC_Event_Channel_Base::deactivate_supplier_admin (void) } void -TAO_EC_Event_Channel_Base::deactivate_consumer_admin (void) +TAO_EC_Event_Channel_Base::deactivate_consumer_admin () { try { @@ -243,19 +243,19 @@ TAO_EC_Event_Channel_Base::disconnected (TAO_EC_ProxyPushSupplier* supplier) } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel_Base::for_consumers (void) +TAO_EC_Event_Channel_Base::for_consumers () { return this->consumer_admin_->_this (); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel_Base::for_suppliers (void) +TAO_EC_Event_Channel_Base::for_suppliers () { return this->supplier_admin_->_this (); } void -TAO_EC_Event_Channel_Base::destroy (void) +TAO_EC_Event_Channel_Base::destroy () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp index d4e94f46eb7..260d8784d6f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_RTEvent_Serv_Export unsigned short TAO_EC_debug_level; -TAO_EC_Factory::TAO_EC_Factory (void) +TAO_EC_Factory::TAO_EC_Factory () { TAO_EC_debug_level = 0; } -TAO_EC_Factory::~TAO_EC_Factory (void) +TAO_EC_Factory::~TAO_EC_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index f5534a16d02..4861e5e00d6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Filter::~TAO_EC_Filter (void) +TAO_EC_Filter::~TAO_EC_Filter () { } @@ -20,19 +20,19 @@ TAO_EC_Filter::adopt_child (TAO_EC_Filter* child) } TAO_EC_Filter::ChildrenIterator -TAO_EC_Filter::begin (void) const +TAO_EC_Filter::begin () const { return 0; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Filter::end (void) const +TAO_EC_Filter::end () const { return 0; } int -TAO_EC_Filter::size (void) const +TAO_EC_Filter::size () const { return 0; } @@ -83,13 +83,13 @@ TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Null_Filter::clear (void) +TAO_EC_Null_Filter::clear () { // do nothing } CORBA::ULong -TAO_EC_Null_Filter::max_event_size (void) const +TAO_EC_Null_Filter::max_event_size () const { // @@ Is there a better way to express this? return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index 3c1c2c12db8..3a1ddc40b1f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -7,13 +7,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder (void) +TAO_EC_Filter_Builder::~TAO_EC_Filter_Builder () { } // **************************************************************** -TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void) +TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 6f9d31798ae..145e4c8f594 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -2,12 +2,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway::TAO_EC_Gateway (void) +TAO_EC_Gateway::TAO_EC_Gateway () : handle_ (0) { } -TAO_EC_Gateway::~TAO_EC_Gateway (void) +TAO_EC_Gateway::~TAO_EC_Gateway () { } @@ -18,7 +18,7 @@ TAO_EC_Gateway::observer_handle (RtecEventChannelAdmin::Observer_Handle h) } RtecEventChannelAdmin::Observer_Handle -TAO_EC_Gateway::observer_handle (void) const +TAO_EC_Gateway::observer_handle () const { return this->handle_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp index d8287744bc6..8e979dfbd67 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) +TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP () : busy_count_ (0), update_posted_ (0), cleanup_posted_ (0), @@ -48,7 +48,7 @@ TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void) } } -TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void) +TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP () { delete ec_control_; ec_control_ = 0; @@ -90,7 +90,7 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr supplier_ec } void -TAO_EC_Gateway_IIOP::close (void) +TAO_EC_Gateway_IIOP::close () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -98,7 +98,7 @@ TAO_EC_Gateway_IIOP::close (void) } void -TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_proxies () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -113,7 +113,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_proxies (void) } void -TAO_EC_Gateway_IIOP::close_i (void) +TAO_EC_Gateway_IIOP::close_i () { // ORBSVCS_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); this->disconnect_consumer_proxies_i (); @@ -122,7 +122,7 @@ TAO_EC_Gateway_IIOP::close_i (void) } void -TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void) +TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i () { if (this->consumer_proxy_map_.current_size () > 0) { @@ -157,7 +157,7 @@ TAO_EC_Gateway_IIOP::disconnect_consumer_proxies_i (void) } void -TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void) +TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i () { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -169,7 +169,7 @@ TAO_EC_Gateway_IIOP::disconnect_supplier_proxy_i (void) } void -TAO_EC_Gateway_IIOP::reconnect_consumer_ec(void) +TAO_EC_Gateway_IIOP::reconnect_consumer_ec() { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -203,7 +203,7 @@ TAO_EC_Gateway_IIOP::update_consumer ( } void -TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_proxies_i () { if (this->consumer_proxy_map_.current_size () > 0) { @@ -420,7 +420,7 @@ TAO_EC_Gateway_IIOP::update_supplier ( } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) +TAO_EC_Gateway_IIOP::disconnect_push_consumer () { // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " @@ -428,7 +428,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (void) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (void) +TAO_EC_Gateway_IIOP::disconnect_push_supplier () { // ORBSVCS_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -531,7 +531,7 @@ TAO_EC_Gateway_IIOP::push_to_consumer ( } int -TAO_EC_Gateway_IIOP::shutdown (void) +TAO_EC_Gateway_IIOP::shutdown () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -566,7 +566,7 @@ TAO_EC_Gateway_IIOP::shutdown (void) } int -TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_ec () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -576,7 +576,7 @@ TAO_EC_Gateway_IIOP::cleanup_consumer_ec (void) } int -TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void) +TAO_EC_Gateway_IIOP::cleanup_supplier_ec () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); @@ -586,21 +586,21 @@ TAO_EC_Gateway_IIOP::cleanup_supplier_ec (void) } void -TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i (void) +TAO_EC_Gateway_IIOP::cleanup_consumer_ec_i () { this->consumer_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void -TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i (void) +TAO_EC_Gateway_IIOP::cleanup_supplier_ec_i () { this->supplier_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } CORBA::Boolean -TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i (void) const +TAO_EC_Gateway_IIOP::is_consumer_ec_connected_i () const { return !CORBA::is_nil (this->consumer_ec_.in ()); } @@ -633,7 +633,7 @@ TAO_EC_Gateway_IIOP::consumer_ec_non_existent ( } void -TAO_EC_Gateway_IIOP::suspend_supplier_ec (void) +TAO_EC_Gateway_IIOP::suspend_supplier_ec () { if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 0) { @@ -644,7 +644,7 @@ TAO_EC_Gateway_IIOP::suspend_supplier_ec (void) } void -TAO_EC_Gateway_IIOP::resume_supplier_ec (void) +TAO_EC_Gateway_IIOP::resume_supplier_ec () { if (!CORBA::is_nil (this->supplier_proxy_.in ()) && supplier_ec_suspended_ == 1) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp index df33e3292f6..3a6b062ce0f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp @@ -20,13 +20,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_EC_Gateway_IIOP_Factory::init_svcs (void) +TAO_EC_Gateway_IIOP_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Gateway_IIOP_Factory); } -TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void) +TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory () : orbid_ (TAO_ECG_DEFAULT_IIOP_ORB_ID), consumer_ec_control_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL), consumer_ec_control_period_ (TAO_ECG_DEFAULT_IIOP_CONSUMEREC_CONTROL_PERIOD), @@ -36,12 +36,12 @@ TAO_EC_Gateway_IIOP_Factory::TAO_EC_Gateway_IIOP_Factory (void) { } -TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory (void) +TAO_EC_Gateway_IIOP_Factory::~TAO_EC_Gateway_IIOP_Factory () { } int -TAO_EC_Gateway_IIOP_Factory::fini (void) +TAO_EC_Gateway_IIOP_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index 428104e1233..ca0b9b11dc1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void) +TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched () : TAO_EC_Gateway_IIOP () { } -TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched (void) +TAO_EC_Gateway_Sched::~TAO_EC_Gateway_Sched () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp index 59be08f552e..d60e247ffd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp @@ -36,7 +36,7 @@ TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *e } void -TAO_EC_Kokyu_Dispatching::activate (void) +TAO_EC_Kokyu_Dispatching::activate () { if (!lanes_setup_) setup_lanes (); @@ -47,7 +47,7 @@ TAO_EC_Kokyu_Dispatching::activate (void) } void -TAO_EC_Kokyu_Dispatching::setup_lanes (void) +TAO_EC_Kokyu_Dispatching::setup_lanes () { // Query the scheduler togetConfig_Infos RtecScheduler::Config_Info_Set_var configs; @@ -96,7 +96,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void) } void -TAO_EC_Kokyu_Dispatching::shutdown (void) +TAO_EC_Kokyu_Dispatching::shutdown () { this->dispatcher_->shutdown(); } @@ -154,19 +154,19 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, // **************************************************************** -TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command(void) +TAO_EC_Kokyu_Shutdown_Command::~TAO_EC_Kokyu_Shutdown_Command() { } int -TAO_EC_Kokyu_Shutdown_Command::execute(void) +TAO_EC_Kokyu_Shutdown_Command::execute() { return -1; } // **************************************************************** -TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command(void) +TAO_EC_Kokyu_Push_Command::~TAO_EC_Kokyu_Push_Command() { this->proxy_->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp index 34adfa62c22..815c50fe3ff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp @@ -17,12 +17,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void) +TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory () { } int -TAO_EC_Kokyu_Factory::init_svcs (void) +TAO_EC_Kokyu_Factory::init_svcs () { return ACE_Service_Config::static_svcs ()-> insert (&ace_svc_desc_TAO_EC_Kokyu_Factory); @@ -203,7 +203,7 @@ TAO_EC_Kokyu_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Kokyu_Factory::fini (void) +TAO_EC_Kokyu_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp index 033b9aa4a4f..37aa366a1a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.cpp @@ -27,25 +27,25 @@ this->rt_info_computed_ = 1; #endif } -TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter (void) +TAO_EC_Kokyu_Filter::~TAO_EC_Kokyu_Filter () { delete this->body_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Kokyu_Filter::begin (void) const +TAO_EC_Kokyu_Filter::begin () const { return this->body_->begin (); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Kokyu_Filter::end (void) const +TAO_EC_Kokyu_Filter::end () const { return this->body_->end (); } int -TAO_EC_Kokyu_Filter::size (void) const +TAO_EC_Kokyu_Filter::size () const { return this->body_->size (); } @@ -117,13 +117,13 @@ TAO_EC_Kokyu_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Kokyu_Filter::clear (void) +TAO_EC_Kokyu_Filter::clear () { this->body_->clear (); } CORBA::ULong -TAO_EC_Kokyu_Filter::max_event_size (void) const +TAO_EC_Kokyu_Filter::max_event_size () const { return this->body_->max_event_size (); } @@ -225,7 +225,7 @@ TAO_EC_Kokyu_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info) } void -TAO_EC_Kokyu_Filter::init_rt_info (void) +TAO_EC_Kokyu_Filter::init_rt_info () { if (this->rt_info_computed_) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 79c76c9860c..e8d8a5997b1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -31,7 +31,7 @@ const char* designator (long dsgn) TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void) +TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index 0e86459dc4c..9263064b6af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling (void) +TAO_EC_Kokyu_Scheduling::~TAO_EC_Kokyu_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index e75e12bb54e..e112189d97c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -22,7 +22,7 @@ TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads, } void -TAO_EC_MT_Dispatching::activate (void) +TAO_EC_MT_Dispatching::activate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -49,7 +49,7 @@ TAO_EC_MT_Dispatching::activate (void) } void -TAO_EC_MT_Dispatching::shutdown (void) +TAO_EC_MT_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index dc550ba2fda..8b0c0053fd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -16,24 +16,24 @@ TAO_EC_Masked_Type_Filter:: { } -TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter (void) +TAO_EC_Masked_Type_Filter::~TAO_EC_Masked_Type_Filter () { } TAO_EC_Filter::ChildrenIterator -TAO_EC_Masked_Type_Filter::begin (void) const +TAO_EC_Masked_Type_Filter::begin () const { return 0; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Masked_Type_Filter::end (void) const +TAO_EC_Masked_Type_Filter::end () const { return 0; } int -TAO_EC_Masked_Type_Filter::size (void) const +TAO_EC_Masked_Type_Filter::size () const { return 0; } @@ -87,12 +87,12 @@ TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, } void -TAO_EC_Masked_Type_Filter::clear (void) +TAO_EC_Masked_Type_Filter::clear () { } CORBA::ULong -TAO_EC_Masked_Type_Filter::max_event_size (void) const +TAO_EC_Masked_Type_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 41ce09ab69b..6e93808d5e5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -10,25 +10,25 @@ TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child) this->adopt_child (this->child_); } -TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void) +TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter () { delete this->child_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Negation_Filter::begin (void) const +TAO_EC_Negation_Filter::begin () const { return const_cast<TAO_EC_Filter**> (&this->child_); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Negation_Filter::end (void) const +TAO_EC_Negation_Filter::end () const { return const_cast<TAO_EC_Filter**> (&this->child_) + 1; } int -TAO_EC_Negation_Filter::size (void) const +TAO_EC_Negation_Filter::size () const { return 1; } @@ -74,13 +74,13 @@ TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_Negation_Filter::clear (void) +TAO_EC_Negation_Filter::clear () { this->child_->clear (); } CORBA::ULong -TAO_EC_Negation_Filter::max_event_size (void) const +TAO_EC_Negation_Filter::max_event_size () const { return this->child_->max_event_size (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp index 71411aa2818..3ec46436444 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp @@ -21,11 +21,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Null_Factory::TAO_EC_Null_Factory (void) +TAO_EC_Null_Factory::TAO_EC_Null_Factory () { } -TAO_EC_Null_Factory::~TAO_EC_Null_Factory (void) +TAO_EC_Null_Factory::~TAO_EC_Null_Factory () { } @@ -189,7 +189,7 @@ TAO_EC_Null_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSup } ACE_Lock* -TAO_EC_Null_Factory::create_consumer_lock (void) +TAO_EC_Null_Factory::create_consumer_lock () { return new ACE_Lock_Adapter<ACE_Null_Mutex> (); } @@ -201,7 +201,7 @@ TAO_EC_Null_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_Null_Factory::create_supplier_lock (void) +TAO_EC_Null_Factory::create_supplier_lock () { return new ACE_Lock_Adapter<ACE_Null_Mutex> (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 973ecaf9ba7..33e4df630d4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) +TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy () { } @@ -57,7 +57,7 @@ TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*) // **************************************************************** -TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) +TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy () { delete this->lock_; this->lock_ = 0; @@ -262,7 +262,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( // **************************************************************** -TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy (void) +TAO_EC_Reactive_ObserverStrategy::~TAO_EC_Reactive_ObserverStrategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index bc9d38bc388..aeecbe8e85c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -26,7 +26,7 @@ TAO_EC_Per_Supplier_Filter:: this->event_channel_->create_proxy_collection (this->collection_); } -TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void) +TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter () { this->event_channel_->destroy_proxy_collection (this->collection_); this->collection_ = 0; @@ -135,7 +135,7 @@ TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier) } void -TAO_EC_Per_Supplier_Filter::shutdown (void) +TAO_EC_Per_Supplier_Filter::shutdown () { this->collection_->shutdown (); } @@ -160,7 +160,7 @@ TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event } CORBA::ULong -TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) +TAO_EC_Per_Supplier_Filter::_incr_refcnt () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -169,7 +169,7 @@ TAO_EC_Per_Supplier_Filter::_incr_refcnt (void) } CORBA::ULong -TAO_EC_Per_Supplier_Filter::_decr_refcnt (void) +TAO_EC_Per_Supplier_Filter::_decr_refcnt () { { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 855a58e620a..90af063fa1b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void) +TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 5f5eb1383f6..1908203fd0b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -22,7 +22,7 @@ TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel_B } void -TAO_EC_Priority_Dispatching::activate (void) +TAO_EC_Priority_Dispatching::activate () { if (this->tasks_ != 0) return; @@ -83,7 +83,7 @@ TAO_EC_Priority_Dispatching::activate (void) } void -TAO_EC_Priority_Dispatching::shutdown (void) +TAO_EC_Priority_Dispatching::shutdown () { if (this->tasks_ == 0) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 750d6dd82dd..7f8bae66487 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void) +TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index 9ca4c7a410a..51ffb0ffd78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -29,7 +29,7 @@ TAO_EC_ProxyPushConsumer:: this->qos_.is_gateway = false; } -TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) +TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer () { this->event_channel_->destroy_consumer_lock (this->lock_); this->cleanup_i (); @@ -121,12 +121,12 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*) } void -TAO_EC_ProxyPushConsumer::shutdown_hook (void) +TAO_EC_ProxyPushConsumer::shutdown_hook () { } void -TAO_EC_ProxyPushConsumer::shutdown (void) +TAO_EC_ProxyPushConsumer::shutdown () { RtecEventComm::PushSupplier_var supplier; @@ -165,7 +165,7 @@ TAO_EC_ProxyPushConsumer::shutdown (void) } void -TAO_EC_ProxyPushConsumer::cleanup_i (void) +TAO_EC_ProxyPushConsumer::cleanup_i () { this->supplier_ = RtecEventComm::PushSupplier::_nil (); @@ -180,7 +180,7 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void) } void -TAO_EC_ProxyPushConsumer::deactivate (void) +TAO_EC_ProxyPushConsumer::deactivate () { try { @@ -198,21 +198,21 @@ TAO_EC_ProxyPushConsumer::deactivate (void) } CORBA::ULong -TAO_EC_ProxyPushConsumer::_incr_refcnt (void) +TAO_EC_ProxyPushConsumer::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->ec_refcount_++; } void -TAO_EC_ProxyPushConsumer::refcount_zero_hook (void) +TAO_EC_ProxyPushConsumer::refcount_zero_hook () { // Use the event channel this->event_channel_->destroy_proxy (this); } CORBA::ULong -TAO_EC_ProxyPushConsumer::_decr_refcnt (void) +TAO_EC_ProxyPushConsumer::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -257,7 +257,7 @@ TAO_EC_ProxyPushConsumer_Guard:: } TAO_EC_ProxyPushConsumer_Guard:: - ~TAO_EC_ProxyPushConsumer_Guard (void) + ~TAO_EC_ProxyPushConsumer_Guard () { // This access is safe because guard objects are created on the // stack, only one thread has access to them diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 23d9a366eb9..5521a7b996e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -35,7 +35,7 @@ TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* e this->qos_.is_gateway = false; } -TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) +TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier () { this->event_channel_->destroy_supplier_lock (this->lock_); this->cleanup_i (); @@ -80,7 +80,7 @@ TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*) } void -TAO_EC_ProxyPushSupplier::shutdown (void) +TAO_EC_ProxyPushSupplier::shutdown () { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -116,7 +116,7 @@ TAO_EC_ProxyPushSupplier::shutdown (void) } void -TAO_EC_ProxyPushSupplier::cleanup_i (void) +TAO_EC_ProxyPushSupplier::cleanup_i () { this->consumer_ = RtecEventComm::PushConsumer::_nil (); @@ -128,7 +128,7 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void) } void -TAO_EC_ProxyPushSupplier::deactivate (void) throw () +TAO_EC_ProxyPushSupplier::deactivate () throw () { try { @@ -145,21 +145,21 @@ TAO_EC_ProxyPushSupplier::deactivate (void) throw () } CORBA::ULong -TAO_EC_ProxyPushSupplier::_incr_refcnt (void) +TAO_EC_ProxyPushSupplier::_incr_refcnt () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); return this->refcount_++; } void -TAO_EC_ProxyPushSupplier::refcount_zero_hook (void) +TAO_EC_ProxyPushSupplier::refcount_zero_hook () { // Use the event channel this->event_channel_->destroy_proxy (this); } CORBA::ULong -TAO_EC_ProxyPushSupplier::_decr_refcnt (void) +TAO_EC_ProxyPushSupplier::_decr_refcnt () { { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); @@ -430,7 +430,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( } void -TAO_EC_ProxyPushSupplier::clear (void) +TAO_EC_ProxyPushSupplier::clear () { ACE_GUARD (ACE_Lock, ace_mon, *this->lock_); @@ -438,7 +438,7 @@ TAO_EC_ProxyPushSupplier::clear (void) } CORBA::ULong -TAO_EC_ProxyPushSupplier::max_event_size (void) const +TAO_EC_ProxyPushSupplier::max_event_size () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index cb057292fc2..07ecf59d97c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -19,13 +19,13 @@ TAO_EC_RTCORBA_Dispatching:: this->tasks_[i].thr_mgr (&this->thread_manager_); } -TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching (void) +TAO_EC_RTCORBA_Dispatching::~TAO_EC_RTCORBA_Dispatching () { delete[] this->tasks_; } void -TAO_EC_RTCORBA_Dispatching::activate (void) +TAO_EC_RTCORBA_Dispatching::activate () { for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) { @@ -48,7 +48,7 @@ TAO_EC_RTCORBA_Dispatching::activate (void) } void -TAO_EC_RTCORBA_Dispatching::shutdown (void) +TAO_EC_RTCORBA_Dispatching::shutdown () { for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index 01d6063199d..8c0d8d3723a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -15,7 +15,7 @@ TAO_EC_RTCORBA_Factory:: { } -TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void) +TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory () { } @@ -27,7 +27,7 @@ TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_RTCORBA_Factory::fini (void) +TAO_EC_RTCORBA_Factory::fini () { return this->body_->fini (); } @@ -212,7 +212,7 @@ TAO_EC_RTCORBA_Factory::destroy_proxy_push_supplier_collection (TAO_EC_ProxyPush } ACE_Lock* -TAO_EC_RTCORBA_Factory::create_consumer_lock (void) +TAO_EC_RTCORBA_Factory::create_consumer_lock () { return this->body_->create_consumer_lock (); } @@ -224,7 +224,7 @@ TAO_EC_RTCORBA_Factory::destroy_consumer_lock (ACE_Lock* x) } ACE_Lock* -TAO_EC_RTCORBA_Factory::create_supplier_lock (void) +TAO_EC_RTCORBA_Factory::create_supplier_lock () { return this->body_->create_supplier_lock (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index e23bf2bc0fa..165818a0cc0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -35,7 +35,7 @@ TAO_EC_Reactive_ConsumerControl:: this->orb_->orb_core ()->reactor (); } -TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void) +TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl () { } @@ -88,7 +88,7 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( } int -TAO_EC_Reactive_ConsumerControl::activate (void) +TAO_EC_Reactive_ConsumerControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -134,7 +134,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void) } int -TAO_EC_Reactive_ConsumerControl::shutdown (void) +TAO_EC_Reactive_ConsumerControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp index f9011dc1df8..1a2dee5f5d9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp @@ -5,18 +5,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching (void) +TAO_EC_Reactive_Dispatching::TAO_EC_Reactive_Dispatching () : TAO_EC_Dispatching () { } void -TAO_EC_Reactive_Dispatching::activate (void) +TAO_EC_Reactive_Dispatching::activate () { } void -TAO_EC_Reactive_Dispatching::shutdown (void) +TAO_EC_Reactive_Dispatching::shutdown () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 070edd73045..0e05a2902ad 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -35,7 +35,7 @@ TAO_EC_Reactive_SupplierControl:: this->orb_->orb_core ()->reactor (); } -TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void) +TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl () { } @@ -80,7 +80,7 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( } int -TAO_EC_Reactive_SupplierControl::activate (void) +TAO_EC_Reactive_SupplierControl::activate () { #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 try @@ -127,7 +127,7 @@ TAO_EC_Reactive_SupplierControl::activate (void) } int -TAO_EC_Reactive_SupplierControl::shutdown (void) +TAO_EC_Reactive_SupplierControl::shutdown () { int r = 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 19acc6826e1..9fcc4d159ba 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -9,17 +9,17 @@ TAO_EC_Reactive_Timeout_Generator:: { } -TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator (void) +TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator () { } void -TAO_EC_Reactive_Timeout_Generator::activate (void) +TAO_EC_Reactive_Timeout_Generator::activate () { } void -TAO_EC_Reactive_Timeout_Generator::shutdown (void) +TAO_EC_Reactive_Timeout_Generator::shutdown () { this->reactor_->cancel_timer (&this->event_handler_); this->event_handler_.reactor (0); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp index 56c9af969ee..edc5a380c27 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory (void) +TAO_EC_Sched_Factory::~TAO_EC_Sched_Factory () { } @@ -162,7 +162,7 @@ TAO_EC_Sched_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO_EC_Sched_Factory::fini (void) +TAO_EC_Sched_Factory::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index d85da896b8f..99a0693f1f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -27,25 +27,25 @@ TAO_EC_Sched_Filter:: this->adopt_child (this->body_); } -TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter (void) +TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter () { delete this->body_; } TAO_EC_Filter::ChildrenIterator -TAO_EC_Sched_Filter::begin (void) const +TAO_EC_Sched_Filter::begin () const { return this->body_->begin (); } TAO_EC_Filter::ChildrenIterator -TAO_EC_Sched_Filter::end (void) const +TAO_EC_Sched_Filter::end () const { return this->body_->end (); } int -TAO_EC_Sched_Filter::size (void) const +TAO_EC_Sched_Filter::size () const { return this->body_->size (); } @@ -117,13 +117,13 @@ TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, } void -TAO_EC_Sched_Filter::clear (void) +TAO_EC_Sched_Filter::clear () { this->body_->clear (); } CORBA::ULong -TAO_EC_Sched_Filter::max_event_size (void) const +TAO_EC_Sched_Filter::max_event_size () const { return this->body_->max_event_size (); } @@ -172,7 +172,7 @@ TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info) } void -TAO_EC_Sched_Filter::init_rt_info (void) +TAO_EC_Sched_Filter::init_rt_info () { if (this->rt_info_computed_) return; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 6db96184ed2..3df2fa9f386 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) +TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp index 88ca6abf682..ea13e8047b4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void) +TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index 7ed8c79aad1..e31589276a4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -17,18 +17,18 @@ TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel_Base *ec) this->event_channel_->supplier_poa (); } -TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) +TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin () { } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (void) +TAO_EC_SupplierAdmin::obtain_push_consumer () { return this->obtain (); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (void) +TAO_EC_SupplierAdmin::_default_POA () { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index a24ce675bb2..5519b5b9022 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -4,22 +4,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_SupplierControl::TAO_EC_SupplierControl (void) +TAO_EC_SupplierControl::TAO_EC_SupplierControl () { } -TAO_EC_SupplierControl::~TAO_EC_SupplierControl (void) +TAO_EC_SupplierControl::~TAO_EC_SupplierControl () { } int -TAO_EC_SupplierControl::activate (void) +TAO_EC_SupplierControl::activate () { return 0; } int -TAO_EC_SupplierControl::shutdown (void) +TAO_EC_SupplierControl::shutdown () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 3534ca66a7c..46ea1b4e70e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) +TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp index 02b830ff850..446058b3f45 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void) +TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index d932bb3c9ac..6d0ab6519a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -119,12 +119,12 @@ TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consume } void -TAO_EC_TPC_Dispatching::activate (void) +TAO_EC_TPC_Dispatching::activate () { } void -TAO_EC_TPC_Dispatching::shutdown (void) +TAO_EC_TPC_Dispatching::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp index d4904b5a195..52af0795fc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Factory.cpp @@ -17,17 +17,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL unsigned long TAO_EC_TPC_debug_level; -TAO_EC_TPC_Factory::TAO_EC_TPC_Factory (void) +TAO_EC_TPC_Factory::TAO_EC_TPC_Factory () { TAO_EC_TPC_debug_level = 0; } -TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory (void) +TAO_EC_TPC_Factory::~TAO_EC_TPC_Factory () { } int -TAO_EC_TPC_Factory::init_svcs (void) +TAO_EC_TPC_Factory::init_svcs () { TAO_EC_Simple_Queue_Full_Action::init_svcs(); return ACE_Service_Config::static_svcs ()-> diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp index 0b60d49d1cf..d781c1702e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp @@ -13,7 +13,7 @@ TAO_EC_TPC_ProxyPushConsumer::TAO_EC_TPC_ProxyPushConsumer (TAO_EC_Event_Channel } TAO_EC_TPC_Dispatching* -TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void) +TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching () { TAO_EC_Dispatching* dispatcher = this->event_channel_->dispatching (); TAO_EC_TPC_Dispatching* tpcdispatcher = @@ -21,7 +21,7 @@ TAO_EC_TPC_ProxyPushConsumer::tpc_dispatching (void) return tpcdispatcher; } -TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) +TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer () { // @@@ Do I need to call the logic to remove the consumer from the // dispatch map in here? I'm not sure... But, if I do, then I need @@ -32,7 +32,7 @@ TAO_EC_TPC_ProxyPushConsumer::~TAO_EC_TPC_ProxyPushConsumer (void) } void -TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer (void) +TAO_EC_TPC_ProxyPushConsumer::disconnect_push_consumer () { RtecEventComm::PushConsumer_var emulated_exceptions_suck = this->_this (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp index a45da4bd065..6438de63fbf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp @@ -12,12 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL extern unsigned long TAO_EC_TPC_debug_level; -TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void) +TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier () { } void -TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void) +TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier () { if (TAO_EC_TPC_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): consumer=%@\n", diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index dde8279502e..15cca030176 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -55,7 +55,7 @@ TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter ( // this->id_)); } -TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) +TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter () { this->event_channel_->timeout_generator ()->cancel_timer (this->qos_info_, this->id_); @@ -111,7 +111,7 @@ TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, } void -TAO_EC_Timeout_Filter::clear (void) +TAO_EC_Timeout_Filter::clear () { if (this->type_ == ACE_ES_EVENT_DEADLINE_TIMEOUT) { @@ -133,7 +133,7 @@ TAO_EC_Timeout_Filter::clear (void) } CORBA::ULong -TAO_EC_Timeout_Filter::max_event_size (void) const +TAO_EC_Timeout_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 60278f39599..e315214c6d1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void) +TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index 7dea70568b6..1ec13c1e230 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -44,7 +44,7 @@ TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*) } void -TAO_EC_Trivial_Supplier_Filter::shutdown (void) +TAO_EC_Trivial_Supplier_Filter::shutdown () { } @@ -68,13 +68,13 @@ TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &e } CORBA::ULong -TAO_EC_Trivial_Supplier_Filter::_incr_refcnt (void) +TAO_EC_Trivial_Supplier_Filter::_incr_refcnt () { return 1; } CORBA::ULong -TAO_EC_Trivial_Supplier_Filter::_decr_refcnt (void) +TAO_EC_Trivial_Supplier_Filter::_decr_refcnt () { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 77bcb2af011..66ff295aa4f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -56,12 +56,12 @@ TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, } void -TAO_EC_Type_Filter::clear (void) +TAO_EC_Type_Filter::clear () { } CORBA::ULong -TAO_EC_Type_Filter::max_event_size (void) const +TAO_EC_Type_Filter::max_event_size () const { return 1; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 5068fd0edfc..553fdfb6c63 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -8,7 +8,7 @@ TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port) { } -TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) +TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer () { } diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index aaee3390c4a..3768edc213e 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -25,7 +25,7 @@ ACE_ConsumerQOS_Factory:: qos_.dependencies.length (0); } -ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void) +ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory () { } @@ -72,7 +72,7 @@ ACE_ConsumerQOS_Factory::start_logical_and_group (int nchildren) } int -ACE_ConsumerQOS_Factory::start_negation (void) +ACE_ConsumerQOS_Factory::start_negation () { int l = qos_.dependencies.length (); qos_.dependencies.length (l + 1); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp index c0e3ab94736..f3203343855 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_policy_value (void) +TAO_FT_Request_Duration_Policy::request_duration_policy_value () { return this->request_duration_; } CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (void) +TAO_FT_Request_Duration_Policy::policy_type () { return FT::REQUEST_DURATION_POLICY; } @@ -43,7 +43,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val) } TAO_FT_Request_Duration_Policy * -TAO_FT_Request_Duration_Policy::clone (void) const +TAO_FT_Request_Duration_Policy::clone () const { TAO_FT_Request_Duration_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const } CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::copy (void) +TAO_FT_Request_Duration_Policy::copy () { TAO_FT_Request_Duration_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), @@ -64,7 +64,7 @@ TAO_FT_Request_Duration_Policy::copy (void) } void -TAO_FT_Request_Duration_Policy::destroy (void) +TAO_FT_Request_Duration_Policy::destroy () { } @@ -89,7 +89,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) /*****************************************************************/ FT::HeartbeatPolicyValue -TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void) +TAO_FT_Heart_Beat_Policy::heartbeat_policy_value () { FT::HeartbeatPolicyValue val; val.heartbeat = this->heartbeat_; @@ -120,14 +120,14 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val) CORBA::PolicyType -TAO_FT_Heart_Beat_Policy::policy_type (void) +TAO_FT_Heart_Beat_Policy::policy_type () { return FT::HEARTBEAT_POLICY; } CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (void) +TAO_FT_Heart_Beat_Policy::copy () { TAO_FT_Heart_Beat_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), @@ -138,7 +138,7 @@ TAO_FT_Heart_Beat_Policy::copy (void) } TAO_FT_Heart_Beat_Policy * -TAO_FT_Heart_Beat_Policy::clone (void) const +TAO_FT_Heart_Beat_Policy::clone () const { TAO_FT_Heart_Beat_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -148,7 +148,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Policy::destroy (void) +TAO_FT_Heart_Beat_Policy::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index dda812b88b0..51faf3010a7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor (void) + FT_ClientRequest_Interceptor::FT_ClientRequest_Interceptor () : name_ ("TAO_FT_ClientRequest_Interceptor") , uuid_ (0) , lock_ (0) @@ -36,20 +36,20 @@ namespace TAO } - FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor (void) + FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor () { delete this->uuid_; delete this->lock_; } char * - FT_ClientRequest_Interceptor::name (void) + FT_ClientRequest_Interceptor::name () { return CORBA::string_dup (this->name_); } void - FT_ClientRequest_Interceptor::destroy (void) + FT_ClientRequest_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp index 11844309254..51ec9ccd7ea 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp @@ -10,11 +10,11 @@ static bool initialized = false; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate (void) +TAO_FT_ClientService_Activate::TAO_FT_ClientService_Activate () { } -TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate (void) +TAO_FT_ClientService_Activate::~TAO_FT_ClientService_Activate () { } @@ -35,7 +35,7 @@ TAO_FT_ClientService_Activate::activate_services (TAO_ORB_Core *orb_core) int -TAO_FT_ClientService_Activate::Initializer (void) +TAO_FT_ClientService_Activate::Initializer () { if (initialized == false) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp index 10f9aa9c141..dc4a86e8883 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory (void) +TAO_FT_Endpoint_Selector_Factory::TAO_FT_Endpoint_Selector_Factory () : ft_endpoint_selector_ (0) { } -TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void) +TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory () { delete this->ft_endpoint_selector_; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index 638686d0048..9bd5d50ffe9 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -12,12 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector (void) +TAO_FT_Invocation_Endpoint_Selector::TAO_FT_Invocation_Endpoint_Selector () : TAO_Default_Endpoint_Selector () { } -TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void) +TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp index 75e3b09891d..195f5c2bdce 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp @@ -38,14 +38,14 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val) } CORBA::PolicyType -TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) +TAO_FT_Heart_Beat_Enabled_Policy::policy_type () { return FT::HEARTBEAT_ENABLED_POLICY; } CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (void) +TAO_FT_Heart_Beat_Enabled_Policy::copy () { TAO_FT_Heart_Beat_Enabled_Policy * tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), @@ -56,7 +56,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (void) } TAO_FT_Heart_Beat_Enabled_Policy * -TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const +TAO_FT_Heart_Beat_Enabled_Policy::clone () const { TAO_FT_Heart_Beat_Enabled_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -66,7 +66,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const } void -TAO_FT_Heart_Beat_Enabled_Policy::destroy (void) +TAO_FT_Heart_Beat_Enabled_Policy::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index 85e8eabfff0..4b62b30cb21 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void) + FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor () : object_group_ref_version_ (0) , is_primary_ (false) , iogr_ (0) @@ -20,18 +20,18 @@ namespace TAO { } - FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor (void) + FT_ServerRequest_Interceptor::~FT_ServerRequest_Interceptor () { } char * - FT_ServerRequest_Interceptor::name (void) + FT_ServerRequest_Interceptor::name () { return CORBA::string_dup ("TAO_FT_ServerRequest_Interceptor"); } void - FT_ServerRequest_Interceptor::destroy (void) + FT_ServerRequest_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp index e48abf59844..06b3cd218b0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp @@ -9,16 +9,16 @@ static bool initialized = false; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate (void) +TAO_FT_ServerService_Activate::TAO_FT_ServerService_Activate () { } -TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void) +TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate () { } int -TAO_FT_ServerService_Activate::Initializer (void) +TAO_FT_ServerService_Activate::Initializer () { if (initialized == false) { diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index e4ab0334684..2e87871cfb0 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -19,7 +19,7 @@ TAO_FT_Service_Callbacks::TAO_FT_Service_Callbacks (TAO_ORB_Core *) { } -TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks (void) +TAO_FT_Service_Callbacks::~TAO_FT_Service_Callbacks () { } @@ -325,7 +325,7 @@ TAO_FT_Service_Callbacks::restart_policy_check ( } TimeBase::TimeT -TAO_FT_Service_Callbacks::now (void) +TAO_FT_Service_Callbacks::now () { // Grab the localtime on the machine where this is running ACE_Time_Value time_val = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 2437068b3eb..0049477f82a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -18,18 +18,18 @@ FTRT_ClientORB_Interceptor (CORBA::Long transaction_depth) { } -FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor (void) +FTRT_ClientORB_Interceptor::~FTRT_ClientORB_Interceptor () { } char * -FTRT_ClientORB_Interceptor::name (void) +FTRT_ClientORB_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -FTRT_ClientORB_Interceptor::destroy (void) +FTRT_ClientORB_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp index 0e9e8568433..19d68d23691 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp @@ -10,11 +10,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRT { - FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void) + FTRT_ClientORB_Loader::FTRT_ClientORB_Loader () { } - FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader (void) + FTRT_ClientORB_Loader::~FTRT_ClientORB_Loader () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index 80a00b4b270..9d2b52cebc4 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -24,17 +24,17 @@ AMI_Primary_Replication_Strategy::~AMI_Primary_Replication_Strategy() this->wait(); } -int AMI_Primary_Replication_Strategy::acquire_read (void) +int AMI_Primary_Replication_Strategy::acquire_read () { return mutex_ ? mutex_->acquire_read() : 0; } -int AMI_Primary_Replication_Strategy::acquire_write (void) +int AMI_Primary_Replication_Strategy::acquire_write () { return mutex_ ? mutex_->acquire_write() : 0; } -int AMI_Primary_Replication_Strategy::release (void) +int AMI_Primary_Replication_Strategy::release () { return mutex_ ? mutex_->release() : 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp index 8a8416ab398..7ebb7de55a9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.cpp @@ -38,23 +38,23 @@ AMI_Replication_Strategy::make_primary_strategy() { AMI_Primary_Replication_Strategy* result; ACE_NEW_RETURN(result, AMI_Primary_Replication_Strategy(mt_), 0); - auto_ptr<AMI_Primary_Replication_Strategy> holder(result); + std::unique_ptr<AMI_Primary_Replication_Strategy> holder(result); if (result->activate() == 0) return holder.release(); return 0; } -int AMI_Replication_Strategy::acquire_read (void) +int AMI_Replication_Strategy::acquire_read () { return 0; } -int AMI_Replication_Strategy::acquire_write (void) +int AMI_Replication_Strategy::acquire_write () { return 0; } -int AMI_Replication_Strategy::release (void) +int AMI_Replication_Strategy::release () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp index 4c9a470ec4c..7c8551d649b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp @@ -21,7 +21,7 @@ Basic_Replication_Strategy::~Basic_Replication_Strategy() } void -Basic_Replication_Strategy::check_validity(void) +Basic_Replication_Strategy::check_validity() { FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(); @@ -118,17 +118,17 @@ Basic_Replication_Strategy::add_member(const FTRT::ManagerInfo & info, } while (!finished); } -int Basic_Replication_Strategy::acquire_read (void) +int Basic_Replication_Strategy::acquire_read () { return mutex_ ? mutex_->acquire_read() : 0; } -int Basic_Replication_Strategy::acquire_write (void) +int Basic_Replication_Strategy::acquire_write () { return mutex_ ? mutex_->acquire_write() : 0; } -int Basic_Replication_Strategy::release (void) +int Basic_Replication_Strategy::release () { return mutex_ ? mutex_->release() : 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp index 2fe7edd1eaa..d41ed665aed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp @@ -17,12 +17,12 @@ TAO_FTEC_ConsumerAdmin::TAO_FTEC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec) { } -TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin (void) +TAO_FTEC_ConsumerAdmin::~TAO_FTEC_ConsumerAdmin () { } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_FTEC_ConsumerAdmin::obtain_push_supplier (void) +TAO_FTEC_ConsumerAdmin::obtain_push_supplier () { ORBSVCS_DEBUG((LM_DEBUG,"obtain_push_supplier\n" )); return obtain_proxy(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 3ed1b7628f0..a0d88dd93f7 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -148,13 +148,13 @@ void TAO_FTEC_Event_Channel::oneway_set_update ( RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel::for_consumers (void) +TAO_FTEC_Event_Channel::for_consumers () { return ec_impl_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel::for_suppliers (void) +TAO_FTEC_Event_Channel::for_suppliers () { return ec_impl_->for_suppliers(); } @@ -168,7 +168,7 @@ TAO_FTEC_Event_Channel::set_state (const FTRT::State & s) } void -TAO_FTEC_Event_Channel::destroy (void) +TAO_FTEC_Event_Channel::destroy () { if (Fault_Detector::instance()) Fault_Detector::instance()->stop(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 66f7793c896..1a346c32385 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -226,7 +226,7 @@ TAO_FTEC_Event_Channel_Impl::activate_object ( /// The default implementation is: /// this->consumer_admin ()->_this (); RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_consumers (void) +TAO_FTEC_Event_Channel_Impl::for_consumers () { CORBA::Object_var obj = consumer_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -237,7 +237,7 @@ TAO_FTEC_Event_Channel_Impl::for_consumers (void) /// The default implementation is: /// this->supplier_admin ()->_this (); RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_FTEC_Event_Channel_Impl::for_suppliers (void) +TAO_FTEC_Event_Channel_Impl::for_suppliers () { CORBA::Object_var obj = supplier_admin()->reference(); obj = IOGR_Maker::instance()->forge_iogr(obj.in()); @@ -419,14 +419,14 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s) } -TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin (void) const +TAO_FTEC_ConsumerAdmin* TAO_FTEC_Event_Channel_Impl::consumer_admin () const { return static_cast<TAO_FTEC_ConsumerAdmin*> (TAO_EC_Event_Channel_Base::consumer_admin()); } /// Access the supplier admin implementation, useful for controlling /// the activation... -TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin (void) const +TAO_FTEC_SupplierAdmin* TAO_FTEC_Event_Channel_Impl::supplier_admin () const { return static_cast<TAO_FTEC_SupplierAdmin*> (TAO_EC_Event_Channel_Base::supplier_admin()); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp index 6056a120fe9..90d4d1f2071 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void) +TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp index f1c24c01f4d..9e559b2fa09 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.cpp @@ -116,7 +116,7 @@ void TAO_FTEC_Group_Manager::add_member ( TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"), (const char*)info.the_location[0].id); - auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); + std::unique_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl); new_impl->my_position = impl_->my_position; size_t pos = impl_->info_list.length(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp index 6701e3ad7cd..62577d767b0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp @@ -68,7 +68,7 @@ void TAO_FTEC_ProxyPushConsumer::connect_push_supplier ( } } -void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer (void) +void TAO_FTEC_ProxyPushConsumer::disconnect_push_consumer () { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp index 34b5848c15b..c962ed0542a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp @@ -70,7 +70,7 @@ void TAO_FTEC_ProxyPushSupplier::connect_push_consumer ( } -void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) +void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier () { if (Request_Context_Repository().is_executed_request()) return; @@ -88,7 +88,7 @@ void TAO_FTEC_ProxyPushSupplier::disconnect_push_supplier (void) } -void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) +void TAO_FTEC_ProxyPushSupplier::suspend_connection () { if (Request_Context_Repository().is_executed_request()) return; @@ -113,7 +113,7 @@ void TAO_FTEC_ProxyPushSupplier::suspend_connection (void) } } -void TAO_FTEC_ProxyPushSupplier::resume_connection (void) +void TAO_FTEC_ProxyPushSupplier::resume_connection () { if (Request_Context_Repository().is_executed_request()) return; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp index 0240e85014c..f8a274de7fb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp @@ -21,7 +21,7 @@ TAO_FTEC_SupplierAdmin::~TAO_FTEC_SupplierAdmin() RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_FTEC_SupplierAdmin::obtain_push_consumer (void) +TAO_FTEC_SupplierAdmin::obtain_push_consumer () { return obtain_proxy(); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index e8f4ae86d5f..5ee21412e22 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -26,14 +26,14 @@ FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid) const FtRtecEventComm::ObjectId& -FT_ProxyAdmin_Base::object_id(void) const +FT_ProxyAdmin_Base::object_id() const { return object_id_; } CORBA::Object_var -FT_ProxyAdmin_Base::reference(void) const +FT_ProxyAdmin_Base::reference() const { return poa_->servant_to_reference(servant_); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp index 8f04f5d83be..909cc006159 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp @@ -11,7 +11,7 @@ Fault_Detector::ReactorTask::ReactorTask() } int -Fault_Detector::ReactorTask::svc (void) +Fault_Detector::ReactorTask::svc () { this->reactor_.owner(ACE_OS::thr_self()); this->reactor_.run_reactor_event_loop(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp index 7485754612d..8cddd9bcb50 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.cpp @@ -18,11 +18,11 @@ namespace FTRTEC { ACE_SOCK_Connector, ConnectionDetectHandler<ACE_SOCK_STREAM> > TCP_Fault_Detector; - Fault_Detector_Loader::Fault_Detector_Loader (void) + Fault_Detector_Loader::Fault_Detector_Loader () { } - Fault_Detector_Loader::~Fault_Detector_Loader (void) + Fault_Detector_Loader::~Fault_Detector_Loader () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 788a65217af..7a7ea02de09 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -67,12 +67,12 @@ ForwardCtrlServerInterceptor::~ForwardCtrlServerInterceptor() { } -char * ForwardCtrlServerInterceptor::name (void) +char * ForwardCtrlServerInterceptor::name () { return CORBA::string_dup("ForwardCtrlServerInterceptor"); } -void ForwardCtrlServerInterceptor::destroy (void) +void ForwardCtrlServerInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 8796c03aca0..aa5763720eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -180,13 +180,13 @@ FtEventServiceInterceptor::instance() } char * -FtEventServiceInterceptor::name (void) +FtEventServiceInterceptor::name () { return CORBA::string_dup ("FtEventServiceInterceptor"); } void -FtEventServiceInterceptor::destroy (void) +FtEventServiceInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp index 97c83c66083..715f06ede3b 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp @@ -21,7 +21,7 @@ ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *) { } -void ObjectGroupManagerHandler::create_group (void) +void ObjectGroupManagerHandler::create_group () { } @@ -32,7 +32,7 @@ ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *) } void -ObjectGroupManagerHandler::add_member (void) +ObjectGroupManagerHandler::add_member () { if (--num_backups_ ==0) evt_.signal(); @@ -45,7 +45,7 @@ ObjectGroupManagerHandler::add_member_excep (::Messaging::ExceptionHolder *) } void -ObjectGroupManagerHandler::set_state (void) +ObjectGroupManagerHandler::set_state () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp index 9f43f278154..52656b42fba 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace FTRTEC { namespace { - auto_ptr<Replication_Strategy> replication_strategy; + std::unique_ptr<Replication_Strategy> replication_strategy; int threads = 1; Replication_Service* service; } @@ -108,7 +108,7 @@ namespace FTRTEC } } - void Replication_Service::check_validity(void) + void Replication_Service::check_validity() { replication_strategy->check_validity(); } @@ -152,21 +152,21 @@ namespace FTRTEC replication_strategy->add_member(info, object_group_ref_version); } - int Replication_Service::acquire_read (void) + int Replication_Service::acquire_read () { int r = replication_strategy->acquire_read(); TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r); return r; } - int Replication_Service::acquire_write (void) + int Replication_Service::acquire_write () { int r= replication_strategy->acquire_write(); TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r); return r; } - int Replication_Service::release (void) + int Replication_Service::release () { int r= replication_strategy->release(); TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp index f6c0611358a..c6879652d91 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp @@ -14,7 +14,7 @@ Replication_Strategy::~Replication_Strategy() void -Replication_Strategy::check_validity(void) +Replication_Strategy::check_validity() { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index 29abc223232..f146aa999f0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -80,7 +80,7 @@ get_object_id(CORBA::Any_var a) FtRtecEventChannelAdmin::ObjectId_var -Request_Context_Repository::get_object_id(void) +Request_Context_Repository::get_object_id() { /* PortableInterceptor::Current_var pic = @@ -117,7 +117,7 @@ Request_Context_Repository::set_cached_result( } CORBA::Any_ptr -Request_Context_Repository::get_cached_result(void) +Request_Context_Repository::get_cached_result() { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent"); @@ -167,7 +167,7 @@ Request_Context_Repository::set_sequence_number( FTRT::SequenceNumber -Request_Context_Repository::get_sequence_number(void) +Request_Context_Repository::get_sequence_number() { PortableInterceptor::Current_var pic = resolve_init<PortableInterceptor::Current>(orb, "PICurrent"); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp index 908c7de402c..9866af127a9 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp @@ -12,18 +12,18 @@ TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor () { } -TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor (void) +TAO_Set_Update_Interceptor::~TAO_Set_Update_Interceptor () { } char * -TAO_Set_Update_Interceptor::name (void) +TAO_Set_Update_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -TAO_Set_Update_Interceptor::destroy (void) +TAO_Set_Update_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp index 80a774bfcd4..c2d71044d19 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp @@ -21,7 +21,7 @@ public: ~FTEC_Gateway_ConsumerAdmin(); // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (void); + obtain_push_supplier (); FTEC_Gateway_Impl* impl_; }; @@ -33,7 +33,7 @@ public: ~FTEC_Gateway_SupplierAdmin(); // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (void); + obtain_push_consumer (); FTEC_Gateway_Impl* impl_; }; @@ -47,9 +47,9 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos); - virtual void disconnect_push_supplier (void); - virtual void suspend_connection (void); - virtual void resume_connection (void); + virtual void disconnect_push_supplier (); + virtual void suspend_connection (); + virtual void resume_connection (); FTEC_Gateway_Impl* impl_; }; @@ -65,7 +65,7 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); FTEC_Gateway_Impl* impl_; }; @@ -75,7 +75,7 @@ class PushConsumerHandler : public POA_FtRtecEventComm::AMI_PushConsumerHandler public: PushConsumerHandler(); ~PushConsumerHandler(); - virtual void push (void); + virtual void push (); virtual void push_excep (::Messaging::ExceptionHolder * excep_holder); }; @@ -91,7 +91,7 @@ public: } private: Interceptor_Destoryer(); - inline void do_it(void) { + inline void do_it() { destroy_interceptors(); }; }; @@ -210,19 +210,19 @@ FTEC_Gateway::activate(PortableServer::POA_ptr root_poa) //= The RtecEventChannelAdmin::EventChannel methods RtecEventChannelAdmin::ConsumerAdmin_ptr -FTEC_Gateway::for_consumers (void) +FTEC_Gateway::for_consumers () { return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(impl_->consumer_admin.in()); } RtecEventChannelAdmin::SupplierAdmin_ptr -FTEC_Gateway::for_suppliers (void) +FTEC_Gateway::for_suppliers () { ORBSVCS_DEBUG((LM_DEBUG, "FTEC_Gateway::for_suppliers\n")); return RtecEventChannelAdmin::SupplierAdmin::_duplicate(impl_->supplier_admin.in()); } -void FTEC_Gateway::destroy (void) +void FTEC_Gateway::destroy () { impl_->ftec->destroy(); } @@ -262,7 +262,7 @@ FTEC_Gateway_ConsumerAdmin::~FTEC_Gateway_ConsumerAdmin() } RtecEventChannelAdmin::ProxyPushSupplier_ptr -FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void) +FTEC_Gateway_ConsumerAdmin::obtain_push_supplier () { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; @@ -292,7 +292,7 @@ FTEC_Gateway_SupplierAdmin::~FTEC_Gateway_SupplierAdmin() // = The RtecEventChannelAdmin::SupplierAdmin methods... RtecEventChannelAdmin::ProxyPushConsumer_ptr -FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void) +FTEC_Gateway_SupplierAdmin::obtain_push_consumer () { FtRtecEventComm::ObjectId** remote_proxy_oid_ptr; ACE_NEW_THROW_EX(remote_proxy_oid_ptr, FtRtecEventComm::ObjectId*, CORBA::NO_MEMORY()); @@ -347,7 +347,7 @@ void FTEC_Gateway_ProxyPushSupplier::connect_push_consumer ( *oid_ptr = impl_->ftec->connect_push_consumer(push_consumer, qos); } -void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) +void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_supplier(**oid_ptr); @@ -355,13 +355,13 @@ void FTEC_Gateway_ProxyPushSupplier::disconnect_push_supplier (void) delete oid_ptr; } -void FTEC_Gateway_ProxyPushSupplier::suspend_connection (void) +void FTEC_Gateway_ProxyPushSupplier::suspend_connection () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->suspend_push_supplier(**oid_ptr); } -void FTEC_Gateway_ProxyPushSupplier::resume_connection (void) +void FTEC_Gateway_ProxyPushSupplier::resume_connection () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->resume_push_supplier(**oid_ptr); @@ -405,7 +405,7 @@ void FTEC_Gateway_ProxyPushConsumer::connect_push_supplier ( *oid_ptr = impl_->ftec->connect_push_supplier(push_supplier, qos); } -void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer (void) +void FTEC_Gateway_ProxyPushConsumer::disconnect_push_consumer () { FtRtecEventComm::ObjectId** oid_ptr = get_remote_oid_ptr(impl_->orb.in()); impl_->ftec->disconnect_push_consumer(**oid_ptr); @@ -421,7 +421,7 @@ PushConsumerHandler::~PushConsumerHandler() { } -void PushConsumerHandler::push (void) +void PushConsumerHandler::push () { } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index bf379827c0a..278cae08786 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -40,7 +40,7 @@ TAO::HTIOP::Acceptor::Acceptor (ACE::HTBP::Environment *ht_env, { } -TAO::HTIOP::Acceptor::~Acceptor (void) +TAO::HTIOP::Acceptor::~Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -246,7 +246,7 @@ TAO::HTIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint) } int -TAO::HTIOP::Acceptor::close (void) +TAO::HTIOP::Acceptor::close () { return this->base_acceptor_.close (); } @@ -743,7 +743,7 @@ TAO::HTIOP::Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) } CORBA::ULong -TAO::HTIOP::Acceptor::endpoint_count (void) +TAO::HTIOP::Acceptor::endpoint_count () { return this->endpoint_count_; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index ff8a07a0be6..b5e35eedf77 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -44,7 +44,7 @@ TAO::HTIOP::Completion_Handler::Completion_Handler (TAO_ORB_Core *orb_core, } -TAO::HTIOP::Completion_Handler::~Completion_Handler (void) +TAO::HTIOP::Completion_Handler::~Completion_Handler () { delete this->creation_strategy_; delete this->concurrency_strategy_; @@ -66,7 +66,7 @@ TAO::HTIOP::Completion_Handler::open (void*) } int -TAO::HTIOP::Completion_Handler::resume_handler (void) +TAO::HTIOP::Completion_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 1917da10b24..de51d760b7e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -47,7 +47,7 @@ TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) this->transport (specific_transport); } -TAO::HTIOP::Connection_Handler::~Connection_Handler (void) +TAO::HTIOP::Connection_Handler::~Connection_Handler () { delete this->transport (); int const result = @@ -141,13 +141,13 @@ TAO::HTIOP::Connection_Handler::open (void*) } int -TAO::HTIOP::Connection_Handler::resume_handler (void) +TAO::HTIOP::Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO::HTIOP::Connection_Handler::close_connection (void) +TAO::HTIOP::Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -208,14 +208,14 @@ TAO::HTIOP::Connection_Handler::close (u_long) } int -TAO::HTIOP::Connection_Handler::release_os_resources (void) +TAO::HTIOP::Connection_Handler::release_os_resources () { int result = this->peer().close (); return result; } int -TAO::HTIOP::Connection_Handler::add_transport_to_cache (void) +TAO::HTIOP::Connection_Handler::add_transport_to_cache () { ACE::HTBP::Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index e513b06caea..abe63a47620 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -29,7 +29,7 @@ TAO::HTIOP::Connector::Connector (ACE::HTBP::Environment *ht_env) { } -TAO::HTIOP::Connector::~Connector (void) +TAO::HTIOP::Connector::~Connector () { } @@ -59,7 +59,7 @@ TAO::HTIOP::Connector::open (TAO_ORB_Core *orb_core) } int -TAO::HTIOP::Connector::close (void) +TAO::HTIOP::Connector::close () { delete this->concurrency_strategy_; delete this->connect_creation_strategy_; @@ -341,7 +341,7 @@ TAO::HTIOP::Connector::create_profile (TAO_InputCDR& cdr) * @brief Create a profile with a given endpoint. */ TAO_Profile * -TAO::HTIOP::Connector::make_profile (void) +TAO::HTIOP::Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -385,7 +385,7 @@ TAO::HTIOP::Connector::check_prefix (const char *endpoint) } char -TAO::HTIOP::Connector::object_key_delimiter (void) const +TAO::HTIOP::Connector::object_key_delimiter () const { return TAO::HTIOP::Profile::object_key_delimiter_; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index f54168e2603..88b96524ac9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -44,7 +44,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host, this->htid_ = htid; } -TAO::HTIOP::Endpoint::Endpoint (void) +TAO::HTIOP::Endpoint::Endpoint () : TAO_Endpoint (OCI_TAG_HTIOP_PROFILE), host_ (), port_ (0), @@ -72,7 +72,7 @@ TAO::HTIOP::Endpoint::Endpoint (const char *host, this->htid_ = htid; } -TAO::HTIOP::Endpoint::~Endpoint (void) +TAO::HTIOP::Endpoint::~Endpoint () { } @@ -150,7 +150,7 @@ TAO::HTIOP::Endpoint::htid (const char *h) } void -TAO::HTIOP::Endpoint::reset_hint (void) +TAO::HTIOP::Endpoint::reset_hint () { // Commented out for the time being.... /* if (this->hint_) @@ -158,13 +158,13 @@ TAO::HTIOP::Endpoint::reset_hint (void) } TAO_Endpoint * -TAO::HTIOP::Endpoint::next (void) +TAO::HTIOP::Endpoint::next () { return this->next_; } TAO_Endpoint * -TAO::HTIOP::Endpoint::duplicate (void) +TAO::HTIOP::Endpoint::duplicate () { // @@ Bala, we probably need to make sure that the duplicate has the // same priority as the original. Although it does not matter in @@ -204,7 +204,7 @@ TAO::HTIOP::Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } CORBA::ULong -TAO::HTIOP::Endpoint::hash (void) +TAO::HTIOP::Endpoint::hash () { if (this->htid_.in() && ACE_OS::strlen (this->htid_.in())) return ACE::hash_pjw(this->htid_.in()); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp index 443def1b352..b929bcc2a9b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp @@ -12,14 +12,14 @@ static const char the_prefix[] = "htiop"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::HTIOP::Protocol_Factory::Protocol_Factory (void) +TAO::HTIOP::Protocol_Factory::Protocol_Factory () : TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE), ht_env_ (0), inside_ (-1) { } -TAO::HTIOP::Protocol_Factory::~Protocol_Factory (void) +TAO::HTIOP::Protocol_Factory::~Protocol_Factory () { delete this->ht_env_; } @@ -32,13 +32,13 @@ TAO::HTIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO::HTIOP::Protocol_Factory::prefix (void) const +TAO::HTIOP::Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO::HTIOP::Protocol_Factory::options_delimiter (void) const +TAO::HTIOP::Protocol_Factory::options_delimiter () const { return '/'; } @@ -111,7 +111,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc, } TAO_Acceptor * -TAO::HTIOP::Protocol_Factory::make_acceptor (void) +TAO::HTIOP::Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; @@ -123,7 +123,7 @@ TAO::HTIOP::Protocol_Factory::make_acceptor (void) } TAO_Connector * -TAO::HTIOP::Protocol_Factory::make_connector (void) +TAO::HTIOP::Protocol_Factory::make_connector () { TAO_Connector *connector = 0; ACE_NEW_RETURN (connector, @@ -133,7 +133,7 @@ TAO::HTIOP::Protocol_Factory::make_connector (void) } int -TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint (void) const +TAO::HTIOP::Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index ab4e94d9819..5d17a0de8d2 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO::HTIOP::Profile::object_key_delimiter_ = '/'; char -TAO::HTIOP::Profile::object_key_delimiter (void) const +TAO::HTIOP::Profile::object_key_delimiter () const { return TAO::HTIOP::Profile::object_key_delimiter_; } @@ -63,7 +63,7 @@ TAO::HTIOP::Profile::Profile (TAO_ORB_Core *orb_core) { } -TAO::HTIOP::Profile::~Profile (void) +TAO::HTIOP::Profile::~Profile () { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. @@ -258,13 +258,13 @@ TAO::HTIOP::Profile::hash (CORBA::ULong max) } TAO_Endpoint* -TAO::HTIOP::Profile::endpoint (void) +TAO::HTIOP::Profile::endpoint () { return &this->endpoint_; } CORBA::ULong -TAO::HTIOP::Profile::endpoint_count (void) const +TAO::HTIOP::Profile::endpoint_count () const { return this->count_; } @@ -279,7 +279,7 @@ TAO::HTIOP::Profile::add_endpoint (TAO::HTIOP::Endpoint *endp) } char * -TAO::HTIOP::Profile::to_string (void) const +TAO::HTIOP::Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), @@ -319,7 +319,7 @@ TAO::HTIOP::Profile::to_string (void) const const char * -TAO::HTIOP::Profile::prefix (void) +TAO::HTIOP::Profile::prefix () { return ::the_prefix; } @@ -413,7 +413,7 @@ TAO::HTIOP::Profile::encode_endpoints () } int -TAO::HTIOP::Profile::decode_endpoints (void) +TAO::HTIOP::Profile::decode_endpoints () { IOP::TaggedComponent tagged_component; tagged_component.tag = TAO_TAG_ENDPOINTS; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 1f0ec2faa71..296db0bad23 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -30,18 +30,18 @@ TAO::HTIOP::Transport::Transport (TAO::HTIOP::Connection_Handler *h, { } -TAO::HTIOP::Transport::~Transport (void) +TAO::HTIOP::Transport::~Transport () { } ACE_Event_Handler * -TAO::HTIOP::Transport::event_handler_i (void) +TAO::HTIOP::Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO::HTIOP::Transport::connection_handler_i (void) +TAO::HTIOP::Transport::connection_handler_i () { return this->connection_handler_; } @@ -106,7 +106,7 @@ TAO::HTIOP::Transport::recv (char *buf, } int -TAO::HTIOP::Transport::register_handler (void) +TAO::HTIOP::Transport::register_handler () { if (TAO_debug_level > 4) { @@ -355,7 +355,7 @@ TAO::HTIOP::Transport::get_listen_point (::HTIOP::ListenPointList &lp_list, TAO_Connection_Handler * -TAO::HTIOP::Transport::invalidate_event_handler_i (void) +TAO::HTIOP::Transport::invalidate_event_handler_i () { TAO_Connection_Handler * eh = this->connection_handler_; this->connection_handler_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp index c08eb8ef809..0ed392a3d0b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp @@ -12,12 +12,12 @@ TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void) +TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i () { } CORBA::DefinitionKind -TAO_AbstractInterfaceDef_i::def_kind (void) +TAO_AbstractInterfaceDef_i::def_kind () { return CORBA::dk_AbstractInterface; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp index 9a581fe1c5a..283253def36 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp @@ -14,18 +14,18 @@ TAO_AliasDef_i::TAO_AliasDef_i (TAO_Repository_i *repo) { } -TAO_AliasDef_i::~TAO_AliasDef_i (void) +TAO_AliasDef_i::~TAO_AliasDef_i () { } CORBA::DefinitionKind -TAO_AliasDef_i::def_kind (void) +TAO_AliasDef_i::def_kind () { return CORBA::dk_Alias; } CORBA::TypeCode_ptr -TAO_AliasDef_i::type (void) +TAO_AliasDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -35,7 +35,7 @@ TAO_AliasDef_i::type (void) } CORBA::TypeCode_ptr -TAO_AliasDef_i::type_i (void) +TAO_AliasDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -68,7 +68,7 @@ TAO_AliasDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_AliasDef_i::original_type_def (void) +TAO_AliasDef_i::original_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -78,7 +78,7 @@ TAO_AliasDef_i::original_type_def (void) } CORBA::IDLType_ptr -TAO_AliasDef_i::original_type_def_i (void) +TAO_AliasDef_i::original_type_def_i () { ACE_TString original_type; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 7c685d9fc06..c31a73f0ba7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -12,18 +12,18 @@ TAO_ArrayDef_i::TAO_ArrayDef_i (TAO_Repository_i *repo) { } -TAO_ArrayDef_i::~TAO_ArrayDef_i (void) +TAO_ArrayDef_i::~TAO_ArrayDef_i () { } CORBA::DefinitionKind -TAO_ArrayDef_i::def_kind (void) +TAO_ArrayDef_i::def_kind () { return CORBA::dk_Array; } void -TAO_ArrayDef_i::destroy (void) +TAO_ArrayDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -33,7 +33,7 @@ TAO_ArrayDef_i::destroy (void) } void -TAO_ArrayDef_i::destroy_i (void) +TAO_ArrayDef_i::destroy_i () { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -49,7 +49,7 @@ TAO_ArrayDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type (void) +TAO_ArrayDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -59,7 +59,7 @@ TAO_ArrayDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::type_i (void) +TAO_ArrayDef_i::type_i () { // Store the current array's section key. ACE_Configuration_Section_Key @@ -83,7 +83,7 @@ TAO_ArrayDef_i::type_i (void) } CORBA::ULong -TAO_ArrayDef_i::length (void) +TAO_ArrayDef_i::length () { TAO_IFR_READ_GUARD_RETURN (0); @@ -93,7 +93,7 @@ TAO_ArrayDef_i::length (void) } CORBA::ULong -TAO_ArrayDef_i::length_i (void) +TAO_ArrayDef_i::length_i () { u_int length = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -122,7 +122,7 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type (void) +TAO_ArrayDef_i::element_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -132,7 +132,7 @@ TAO_ArrayDef_i::element_type (void) } CORBA::TypeCode_ptr -TAO_ArrayDef_i::element_type_i (void) +TAO_ArrayDef_i::element_type_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -146,7 +146,7 @@ TAO_ArrayDef_i::element_type_i (void) } CORBA::IDLType_ptr -TAO_ArrayDef_i::element_type_def (void) +TAO_ArrayDef_i::element_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -156,7 +156,7 @@ TAO_ArrayDef_i::element_type_def (void) } CORBA::IDLType_ptr -TAO_ArrayDef_i::element_type_def_i (void) +TAO_ArrayDef_i::element_type_def_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index 6f56fed7bc1..dbddc089e7d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -14,18 +14,18 @@ TAO_AttributeDef_i::TAO_AttributeDef_i (TAO_Repository_i *repo) { } -TAO_AttributeDef_i::~TAO_AttributeDef_i (void) +TAO_AttributeDef_i::~TAO_AttributeDef_i () { } CORBA::DefinitionKind -TAO_AttributeDef_i::def_kind (void) +TAO_AttributeDef_i::def_kind () { return CORBA::dk_Attribute; } CORBA::Contained::Description * -TAO_AttributeDef_i::describe (void) +TAO_AttributeDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -35,7 +35,7 @@ TAO_AttributeDef_i::describe (void) } CORBA::Contained::Description * -TAO_AttributeDef_i::describe_i (void) +TAO_AttributeDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -58,7 +58,7 @@ TAO_AttributeDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type (void) +TAO_AttributeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -68,7 +68,7 @@ TAO_AttributeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_AttributeDef_i::type_i (void) +TAO_AttributeDef_i::type_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -83,7 +83,7 @@ TAO_AttributeDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_AttributeDef_i::type_def (void) +TAO_AttributeDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -93,7 +93,7 @@ TAO_AttributeDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_AttributeDef_i::type_def_i (void) +TAO_AttributeDef_i::type_def_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -131,7 +131,7 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::AttributeMode -TAO_AttributeDef_i::mode (void) +TAO_AttributeDef_i::mode () { TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL); @@ -141,7 +141,7 @@ TAO_AttributeDef_i::mode (void) } CORBA::AttributeMode -TAO_AttributeDef_i::mode_i (void) +TAO_AttributeDef_i::mode_i () { u_int mode = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -192,7 +192,7 @@ TAO_AttributeDef_i::make_description ( } CORBA::ExceptionDefSeq * -TAO_AttributeDef_i::get_exceptions (void) +TAO_AttributeDef_i::get_exceptions () { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; @@ -263,7 +263,7 @@ TAO_AttributeDef_i::get_exceptions (void) } CORBA::ExceptionDefSeq * -TAO_AttributeDef_i::put_exceptions (void) +TAO_AttributeDef_i::put_exceptions () { ACE_Unbounded_Queue<ACE_TString> path_queue; int index = 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp index fb5870084af..196bacc8492 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp @@ -17,7 +17,7 @@ TAO_ComponentContainer_i::TAO_ComponentContainer_i (TAO_Repository_i *repo) { } -TAO_ComponentContainer_i::~TAO_ComponentContainer_i (void) +TAO_ComponentContainer_i::~TAO_ComponentContainer_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index 783a6093cab..6f41666db3f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -69,18 +69,18 @@ TAO_ComponentDef_i::TAO_ComponentDef_i (TAO_Repository_i *repo) { } -TAO_ComponentDef_i::~TAO_ComponentDef_i (void) +TAO_ComponentDef_i::~TAO_ComponentDef_i () { } CORBA::DefinitionKind -TAO_ComponentDef_i::def_kind (void) +TAO_ComponentDef_i::def_kind () { return CORBA::dk_Component; } void -TAO_ComponentDef_i::destroy (void) +TAO_ComponentDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -90,7 +90,7 @@ TAO_ComponentDef_i::destroy (void) } void -TAO_ComponentDef_i::destroy_i (void) +TAO_ComponentDef_i::destroy_i () { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -129,7 +129,7 @@ TAO_ComponentDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ComponentDef_i::describe (void) +TAO_ComponentDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -139,7 +139,7 @@ TAO_ComponentDef_i::describe (void) } CORBA::Contained::Description * -TAO_ComponentDef_i::describe_i (void) +TAO_ComponentDef_i::describe_i () { CORBA::ComponentIR::ComponentDescription cd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription, @@ -278,7 +278,7 @@ TAO_ComponentDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type (void) +TAO_ComponentDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -288,7 +288,7 @@ TAO_ComponentDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ComponentDef_i::type_i (void) +TAO_ComponentDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -307,7 +307,7 @@ TAO_ComponentDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces (void) +TAO_ComponentDef_i::supported_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -317,7 +317,7 @@ TAO_ComponentDef_i::supported_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_ComponentDef_i::supported_interfaces_i (void) +TAO_ComponentDef_i::supported_interfaces_i () { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -421,7 +421,7 @@ TAO_ComponentDef_i::supported_interfaces_i ( } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component (void) +TAO_ComponentDef_i::base_component () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -431,7 +431,7 @@ TAO_ComponentDef_i::base_component (void) } CORBA::ComponentIR::ComponentDef_ptr -TAO_ComponentDef_i::base_component_i (void) +TAO_ComponentDef_i::base_component_i () { ACE_TString base_path; int status = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp index 63c10e9dc3e..2e7937885b0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp @@ -9,7 +9,7 @@ TAO_ComponentModuleDef_i::TAO_ComponentModuleDef_i (TAO_Repository_i *repo) { } -TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i (void) +TAO_ComponentModuleDef_i::~TAO_ComponentModuleDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp index 7e6bd0996b3..c980d2b422e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp @@ -27,7 +27,7 @@ TAO_ComponentRepository_i::TAO_ComponentRepository_i ( { } -TAO_ComponentRepository_i::~TAO_ComponentRepository_i (void) +TAO_ComponentRepository_i::~TAO_ComponentRepository_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index f91f727f4ba..168af593a08 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -16,18 +16,18 @@ TAO_ConstantDef_i::TAO_ConstantDef_i (TAO_Repository_i *repo) { } -TAO_ConstantDef_i::~TAO_ConstantDef_i (void) +TAO_ConstantDef_i::~TAO_ConstantDef_i () { } CORBA::DefinitionKind -TAO_ConstantDef_i::def_kind (void) +TAO_ConstantDef_i::def_kind () { return CORBA::dk_Constant; } CORBA::Contained::Description * -TAO_ConstantDef_i::describe (void) +TAO_ConstantDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -37,7 +37,7 @@ TAO_ConstantDef_i::describe (void) } CORBA::Contained::Description * -TAO_ConstantDef_i::describe_i (void) +TAO_ConstantDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -73,7 +73,7 @@ TAO_ConstantDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type (void) +TAO_ConstantDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -83,7 +83,7 @@ TAO_ConstantDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ConstantDef_i::type_i (void) +TAO_ConstantDef_i::type_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_ConstantDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ConstantDef_i::type_def (void) +TAO_ConstantDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -107,7 +107,7 @@ TAO_ConstantDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_ConstantDef_i::type_def_i (void) +TAO_ConstantDef_i::type_def_i () { ACE_TString type_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -142,7 +142,7 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::Any * -TAO_ConstantDef_i::value (void) +TAO_ConstantDef_i::value () { TAO_IFR_READ_GUARD_RETURN (0); @@ -152,7 +152,7 @@ TAO_ConstantDef_i::value (void) } CORBA::Any * -TAO_ConstantDef_i::value_i (void) +TAO_ConstantDef_i::value_i () { CORBA::TypeCode_var tc = this->type_i (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp index d991b8009bc..e2ea5176907 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp @@ -13,12 +13,12 @@ TAO_ConsumesDef_i::TAO_ConsumesDef_i ( { } -TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void) +TAO_ConsumesDef_i::~TAO_ConsumesDef_i () { } CORBA::DefinitionKind -TAO_ConsumesDef_i::def_kind (void) +TAO_ConsumesDef_i::def_kind () { return CORBA::dk_Consumes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 975ade416ab..dc711338a09 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -15,12 +15,12 @@ TAO_Contained_i::TAO_Contained_i ( { } -TAO_Contained_i::~TAO_Contained_i (void) +TAO_Contained_i::~TAO_Contained_i () { } void -TAO_Contained_i::destroy (void) +TAO_Contained_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -30,7 +30,7 @@ TAO_Contained_i::destroy (void) } void -TAO_Contained_i::destroy_i (void) +TAO_Contained_i::destroy_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -85,7 +85,7 @@ TAO_Contained_i::destroy_i (void) } char * -TAO_Contained_i::id (void) +TAO_Contained_i::id () { TAO_IFR_READ_GUARD_RETURN (0); @@ -95,7 +95,7 @@ TAO_Contained_i::id (void) } char * -TAO_Contained_i::id_i (void) +TAO_Contained_i::id_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -157,7 +157,7 @@ TAO_Contained_i::id_i (const char *id) } char * -TAO_Contained_i::name (void) +TAO_Contained_i::name () { TAO_IFR_READ_GUARD_RETURN (0); @@ -167,7 +167,7 @@ TAO_Contained_i::name (void) } char * -TAO_Contained_i::name_i (void) +TAO_Contained_i::name_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -178,7 +178,7 @@ TAO_Contained_i::name_i (void) } char * -TAO_Contained_i::version (void) +TAO_Contained_i::version () { TAO_IFR_READ_GUARD_RETURN (0); @@ -188,7 +188,7 @@ TAO_Contained_i::version (void) } char * -TAO_Contained_i::version_i (void) +TAO_Contained_i::version_i () { ACE_TString retval; this->repo_->config ()->get_string_value (this->section_key_, @@ -260,7 +260,7 @@ TAO_Contained_i::version_i (const char *version) } CORBA::Container_ptr -TAO_Contained_i::defined_in (void) +TAO_Contained_i::defined_in () { TAO_IFR_READ_GUARD_RETURN (CORBA::Container::_nil ()); @@ -270,7 +270,7 @@ TAO_Contained_i::defined_in (void) } CORBA::Container_ptr -TAO_Contained_i::defined_in_i (void) +TAO_Contained_i::defined_in_i () { ACE_TString container_id; this->repo_->config ()->get_string_value (this->section_key_, @@ -298,7 +298,7 @@ TAO_Contained_i::defined_in_i (void) } char * -TAO_Contained_i::absolute_name (void) +TAO_Contained_i::absolute_name () { TAO_IFR_READ_GUARD_RETURN (0); @@ -308,7 +308,7 @@ TAO_Contained_i::absolute_name (void) } char * -TAO_Contained_i::absolute_name_i (void) +TAO_Contained_i::absolute_name_i () { ACE_TString absolute_name; this->repo_->config ()->get_string_value (this->section_key_, @@ -319,7 +319,7 @@ TAO_Contained_i::absolute_name_i (void) } CORBA::Repository_ptr -TAO_Contained_i::containing_repository (void) +TAO_Contained_i::containing_repository () { return this->repo_->repo_objref (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index 9dad1c8b29b..94b7fb91931 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -21,12 +21,12 @@ TAO_Container_i::TAO_Container_i (TAO_Repository_i *repo) { } -TAO_Container_i::~TAO_Container_i (void) +TAO_Container_i::~TAO_Container_i () { } void -TAO_Container_i::destroy (void) +TAO_Container_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -36,14 +36,14 @@ TAO_Container_i::destroy (void) } void -TAO_Container_i::destroy_i (void) +TAO_Container_i::destroy_i () { this->destroy_references_i(); this->destroy_definitions_i(); } void -TAO_Container_i::destroy_references_i (void) +TAO_Container_i::destroy_references_i () { int index = 0; int status; @@ -119,7 +119,7 @@ TAO_Container_i::destroy_references_i (void) } void -TAO_Container_i::destroy_definitions_i (void) +TAO_Container_i::destroy_definitions_i () { int index = 0; int status; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp index 424f8674e3c..86170850374 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp @@ -10,12 +10,12 @@ TAO_EmitsDef_i::TAO_EmitsDef_i (TAO_Repository_i *repo) { } -TAO_EmitsDef_i::~TAO_EmitsDef_i (void) +TAO_EmitsDef_i::~TAO_EmitsDef_i () { } CORBA::DefinitionKind -TAO_EmitsDef_i::def_kind (void) +TAO_EmitsDef_i::def_kind () { return CORBA::dk_Emits; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp index 9c6c11fa9ae..1bff5c0cbd0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp @@ -14,18 +14,18 @@ TAO_EnumDef_i::TAO_EnumDef_i (TAO_Repository_i *repo) { } -TAO_EnumDef_i::~TAO_EnumDef_i (void) +TAO_EnumDef_i::~TAO_EnumDef_i () { } CORBA::DefinitionKind -TAO_EnumDef_i::def_kind (void) +TAO_EnumDef_i::def_kind () { return CORBA::dk_Enum; } CORBA::TypeCode_ptr -TAO_EnumDef_i::type (void) +TAO_EnumDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -35,7 +35,7 @@ TAO_EnumDef_i::type (void) } CORBA::TypeCode_ptr -TAO_EnumDef_i::type_i (void) +TAO_EnumDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -55,7 +55,7 @@ TAO_EnumDef_i::type_i (void) } CORBA::EnumMemberSeq * -TAO_EnumDef_i::members (void) +TAO_EnumDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -65,7 +65,7 @@ TAO_EnumDef_i::members (void) } CORBA::EnumMemberSeq * -TAO_EnumDef_i::members_i (void) +TAO_EnumDef_i::members_i () { u_int count = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp index 94a36220fe5..cd612feea46 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp @@ -13,18 +13,18 @@ TAO_EventDef_i::TAO_EventDef_i (TAO_Repository_i *repo) { } -TAO_EventDef_i::~TAO_EventDef_i (void) +TAO_EventDef_i::~TAO_EventDef_i () { } CORBA::DefinitionKind -TAO_EventDef_i::def_kind (void) +TAO_EventDef_i::def_kind () { return CORBA::dk_Event; } void -TAO_EventDef_i::destroy (void) +TAO_EventDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -34,14 +34,14 @@ TAO_EventDef_i::destroy (void) } void -TAO_EventDef_i::destroy_i (void) +TAO_EventDef_i::destroy_i () { // An event type is a restriction of a value type, not an extension. this->TAO_ExtValueDef_i::destroy_i (); } CORBA::Contained::Description * -TAO_EventDef_i::describe (void) +TAO_EventDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -51,7 +51,7 @@ TAO_EventDef_i::describe (void) } CORBA::Contained::Description * -TAO_EventDef_i::describe_i (void) +TAO_EventDef_i::describe_i () { return this->TAO_ValueDef_i::describe_i (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp index bf67c03d0c8..5e5186a678d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp @@ -14,7 +14,7 @@ TAO_EventPortDef_i::TAO_EventPortDef_i (TAO_Repository_i *repo) { } -TAO_EventPortDef_i::~TAO_EventPortDef_i (void) +TAO_EventPortDef_i::~TAO_EventPortDef_i () { } @@ -121,7 +121,7 @@ TAO_EventPortDef_i::is_a_i ( } CORBA::Contained::Description * -TAO_EventPortDef_i::describe (void) +TAO_EventPortDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -131,7 +131,7 @@ TAO_EventPortDef_i::describe (void) } CORBA::Contained::Description * -TAO_EventPortDef_i::describe_i (void) +TAO_EventPortDef_i::describe_i () { CORBA::ComponentIR::EventPortDescription epd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription, @@ -158,7 +158,7 @@ TAO_EventPortDef_i::describe_i (void) } CORBA::DefinitionKind -TAO_EventPortDef_i::def_kind (void) +TAO_EventPortDef_i::def_kind () { return CORBA::dk_none; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 54a720bc9df..83aca20e401 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -14,18 +14,18 @@ TAO_ExceptionDef_i::TAO_ExceptionDef_i (TAO_Repository_i *repo) { } -TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void) +TAO_ExceptionDef_i::~TAO_ExceptionDef_i () { } CORBA::DefinitionKind -TAO_ExceptionDef_i::def_kind (void) +TAO_ExceptionDef_i::def_kind () { return CORBA::dk_Exception; } void -TAO_ExceptionDef_i::destroy (void) +TAO_ExceptionDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -35,7 +35,7 @@ TAO_ExceptionDef_i::destroy (void) } void -TAO_ExceptionDef_i::destroy_i (void) +TAO_ExceptionDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -45,7 +45,7 @@ TAO_ExceptionDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ExceptionDef_i::describe (void) +TAO_ExceptionDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -55,7 +55,7 @@ TAO_ExceptionDef_i::describe (void) } CORBA::Contained::Description * -TAO_ExceptionDef_i::describe_i (void) +TAO_ExceptionDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -90,7 +90,7 @@ TAO_ExceptionDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type (void) +TAO_ExceptionDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -100,7 +100,7 @@ TAO_ExceptionDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ExceptionDef_i::type_i (void) +TAO_ExceptionDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -123,7 +123,7 @@ TAO_ExceptionDef_i::type_i (void) } CORBA::StructMemberSeq * -TAO_ExceptionDef_i::members (void) +TAO_ExceptionDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -133,7 +133,7 @@ TAO_ExceptionDef_i::members (void) } CORBA::StructMemberSeq * -TAO_ExceptionDef_i::members_i (void) +TAO_ExceptionDef_i::members_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp index 649c86a069e..72da496bbcb 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp @@ -15,14 +15,14 @@ TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i ( { } -TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i (void) +TAO_ExtAbstractInterfaceDef_i::~TAO_ExtAbstractInterfaceDef_i () { } // Just call the base class version, this is here only to // disambiguate multiple inheritance. void -TAO_ExtAbstractInterfaceDef_i::destroy (void) +TAO_ExtAbstractInterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp index 4c532eab20f..e18697e9ad6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp @@ -14,7 +14,7 @@ TAO_ExtAttributeDef_i::TAO_ExtAttributeDef_i (TAO_Repository_i *repo) { } -TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i (void) +TAO_ExtAttributeDef_i::~TAO_ExtAttributeDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp index 55c6413a73a..0e3166e25d4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp @@ -13,7 +13,7 @@ TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i (void) +TAO_ExtInterfaceDef_i::~TAO_ExtInterfaceDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp index 0d7c2d6fbdd..c9c27dbe34c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp @@ -14,14 +14,14 @@ TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i (void) +TAO_ExtLocalInterfaceDef_i::~TAO_ExtLocalInterfaceDef_i () { } // Just call the base class version, this is here only to // disambiguate multiple inheritance. void -TAO_ExtLocalInterfaceDef_i::destroy (void) +TAO_ExtLocalInterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index e2386bbf087..842fe5d72c9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -17,7 +17,7 @@ TAO_ExtValueDef_i::TAO_ExtValueDef_i (TAO_Repository_i *repo) { } -TAO_ExtValueDef_i::~TAO_ExtValueDef_i (void) +TAO_ExtValueDef_i::~TAO_ExtValueDef_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp index 4ad931fe56a..d96e0eb2a06 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp @@ -10,12 +10,12 @@ TAO_FactoryDef_i::TAO_FactoryDef_i (TAO_Repository_i *repo) { } -TAO_FactoryDef_i::~TAO_FactoryDef_i (void) +TAO_FactoryDef_i::~TAO_FactoryDef_i () { } CORBA::DefinitionKind -TAO_FactoryDef_i::def_kind (void) +TAO_FactoryDef_i::def_kind () { return CORBA::dk_Factory; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp index 8a7abfb8312..408c047eb9e 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp @@ -10,12 +10,12 @@ TAO_FinderDef_i::TAO_FinderDef_i (TAO_Repository_i *repo) { } -TAO_FinderDef_i::~TAO_FinderDef_i (void) +TAO_FinderDef_i::~TAO_FinderDef_i () { } CORBA::DefinitionKind -TAO_FinderDef_i::def_kind (void) +TAO_FinderDef_i::def_kind () { return CORBA::dk_Finder; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp index 50a59fe7ca6..866f767ca5f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp @@ -9,18 +9,18 @@ TAO_FixedDef_i::TAO_FixedDef_i (TAO_Repository_i *repo) { } -TAO_FixedDef_i::~TAO_FixedDef_i (void) +TAO_FixedDef_i::~TAO_FixedDef_i () { } CORBA::DefinitionKind -TAO_FixedDef_i::def_kind (void) +TAO_FixedDef_i::def_kind () { return CORBA::dk_Fixed; } void -TAO_FixedDef_i::destroy (void) +TAO_FixedDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -30,13 +30,13 @@ TAO_FixedDef_i::destroy (void) } void -TAO_FixedDef_i::destroy_i (void) +TAO_FixedDef_i::destroy_i () { // TODO } CORBA::TypeCode_ptr -TAO_FixedDef_i::type (void) +TAO_FixedDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -46,14 +46,14 @@ TAO_FixedDef_i::type (void) } CORBA::TypeCode_ptr -TAO_FixedDef_i::type_i (void) +TAO_FixedDef_i::type_i () { // TODO return CORBA::TypeCode::_nil (); } CORBA::UShort -TAO_FixedDef_i::digits (void) +TAO_FixedDef_i::digits () { TAO_IFR_READ_GUARD_RETURN (0); @@ -63,7 +63,7 @@ TAO_FixedDef_i::digits (void) } CORBA::UShort -TAO_FixedDef_i::digits_i (void) +TAO_FixedDef_i::digits_i () { // TODO return 0; @@ -87,7 +87,7 @@ TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */ } CORBA::Short -TAO_FixedDef_i::scale (void) +TAO_FixedDef_i::scale () { TAO_IFR_READ_GUARD_RETURN (0); @@ -97,7 +97,7 @@ TAO_FixedDef_i::scale (void) } CORBA::Short -TAO_FixedDef_i::scale_i (void) +TAO_FixedDef_i::scale_i () { // TODO return 0; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index 97d7bc8c76f..c83e120a01b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -23,18 +23,18 @@ TAO_HomeDef_i::TAO_HomeDef_i (TAO_Repository_i *repo) { } -TAO_HomeDef_i::~TAO_HomeDef_i (void) +TAO_HomeDef_i::~TAO_HomeDef_i () { } CORBA::DefinitionKind -TAO_HomeDef_i::def_kind (void) +TAO_HomeDef_i::def_kind () { return CORBA::dk_Home; } void -TAO_HomeDef_i::destroy (void) +TAO_HomeDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -44,7 +44,7 @@ TAO_HomeDef_i::destroy (void) } void -TAO_HomeDef_i::destroy_i (void) +TAO_HomeDef_i::destroy_i () { // Destroy our special subsections first, then call destroy_i // on our base class. @@ -65,7 +65,7 @@ TAO_HomeDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_HomeDef_i::describe (void) +TAO_HomeDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -75,7 +75,7 @@ TAO_HomeDef_i::describe (void) } CORBA::Contained::Description * -TAO_HomeDef_i::describe_i (void) +TAO_HomeDef_i::describe_i () { CORBA::ComponentIR::HomeDescription home_desc; @@ -150,7 +150,7 @@ TAO_HomeDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_HomeDef_i::type (void) +TAO_HomeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -160,7 +160,7 @@ TAO_HomeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_HomeDef_i::type_i (void) +TAO_HomeDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -177,7 +177,7 @@ TAO_HomeDef_i::type_i (void) } CORBA::ComponentIR::HomeDef_ptr -TAO_HomeDef_i::base_home (void) +TAO_HomeDef_i::base_home () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::HomeDef::_nil ()); @@ -187,7 +187,7 @@ TAO_HomeDef_i::base_home (void) } CORBA::ComponentIR::HomeDef_ptr -TAO_HomeDef_i::base_home_i (void) +TAO_HomeDef_i::base_home_i () { ACE_TString path; int status = @@ -336,7 +336,7 @@ TAO_HomeDef_i::supported_interfaces_i ( } CORBA::ComponentIR::ComponentDef_ptr -TAO_HomeDef_i::managed_component (void) +TAO_HomeDef_i::managed_component () { TAO_IFR_READ_GUARD_RETURN (CORBA::ComponentIR::ComponentDef::_nil ()); @@ -346,7 +346,7 @@ TAO_HomeDef_i::managed_component (void) } CORBA::ComponentIR::ComponentDef_ptr -TAO_HomeDef_i::managed_component_i (void) +TAO_HomeDef_i::managed_component_i () { ACE_TString path; this->repo_->config ()->get_string_value (this->section_key_, @@ -383,7 +383,7 @@ TAO_HomeDef_i::managed_component_i ( } CORBA::ValueDef_ptr -TAO_HomeDef_i::primary_key (void) +TAO_HomeDef_i::primary_key () { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -393,7 +393,7 @@ TAO_HomeDef_i::primary_key (void) } CORBA::ValueDef_ptr -TAO_HomeDef_i::primary_key_i (void) +TAO_HomeDef_i::primary_key_i () { ACE_TString path; int status = diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp index 78c10859022..522df7a364b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp @@ -7,7 +7,7 @@ TAO_IDLType_i::TAO_IDLType_i (TAO_Repository_i *repo) { } -TAO_IDLType_i::~TAO_IDLType_i (void) +TAO_IDLType_i::~TAO_IDLType_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp index fa7b25f8c37..7b661d821bf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp @@ -14,12 +14,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void) +TAO_IFR_Service_Loader::TAO_IFR_Service_Loader () { // Constructor } -TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader (void) +TAO_IFR_Service_Loader::~TAO_IFR_Service_Loader () { // Destructor } @@ -50,7 +50,7 @@ TAO_IFR_Service_Loader::init (int argc, } int -TAO_IFR_Service_Loader::fini (void) +TAO_IFR_Service_Loader::fini () { // Remove the IFR_Service Service. return this->ifr_server_.fini (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 09f75725f10..9497487226b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -22,13 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Repository_i *TAO_IFR_Service_Utils::repo_ = 0; -TAO_IFR_Server::TAO_IFR_Server (void) +TAO_IFR_Server::TAO_IFR_Server () : ior_multicast_ (0), config_ (0) { } -TAO_IFR_Server::~TAO_IFR_Server (void) +TAO_IFR_Server::~TAO_IFR_Server () { // Get reactor instance from TAO. ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); @@ -148,7 +148,7 @@ TAO_IFR_Server::init_with_poa (int argc, } int -TAO_IFR_Server::fini (void) +TAO_IFR_Server::fini () { try { @@ -164,7 +164,7 @@ TAO_IFR_Server::fini (void) } int -TAO_IFR_Server::create_poa (void) +TAO_IFR_Server::create_poa () { PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); @@ -211,7 +211,7 @@ TAO_IFR_Server::create_poa (void) } int -TAO_IFR_Server::open_config (void) +TAO_IFR_Server::open_config () { if (OPTIONS::instance ()->using_registry ()) { @@ -266,7 +266,7 @@ TAO_IFR_Server::open_config (void) } int -TAO_IFR_Server::create_repository (void) +TAO_IFR_Server::create_repository () { TAO_ComponentRepository_i *impl = 0; ACE_NEW_THROW_EX ( @@ -279,7 +279,7 @@ TAO_IFR_Server::create_repository (void) CORBA::NO_MEMORY () ); - auto_ptr<TAO_ComponentRepository_i> safety (impl); + std::unique_ptr<TAO_ComponentRepository_i> safety (impl); TAO_IFR_Service_Utils::repo_ = impl; POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i> *impl_tie = 0; @@ -371,7 +371,7 @@ TAO_IFR_Server::create_repository (void) // Install ior multicast handler. int -TAO_IFR_Server::init_multicast_server (void) +TAO_IFR_Server::init_multicast_server () { #if defined (ACE_HAS_IP_MULTICAST) // Get reactor instance from TAO. @@ -463,11 +463,11 @@ TAO_IFR_Server::init_multicast_server (void) return 0; } -TAO_IFR_Service_Utils::TAO_IFR_Service_Utils (void) +TAO_IFR_Service_Utils::TAO_IFR_Service_Utils () { } -TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils (void) +TAO_IFR_Service_Utils::~TAO_IFR_Service_Utils () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 4b4bf77db08..a93bfc97e9a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -17,7 +17,7 @@ TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo) { } -TAO_IRObject_i::~TAO_IRObject_i (void) +TAO_IRObject_i::~TAO_IRObject_i () { } @@ -36,7 +36,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key) } void -TAO_IRObject_i::update_key (void) +TAO_IRObject_i::update_key () { TAO::Portable_Server::POA_Current_Impl *pc_impl = static_cast <TAO::Portable_Server::POA_Current_Impl *> diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index 50f496b0dba..6ca2337f6b4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -18,7 +18,7 @@ TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i ( { } -TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i (void) +TAO_InterfaceAttrExtension_i::~TAO_InterfaceAttrExtension_i () { } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 1baecb43533..d2f73c4d659 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -17,18 +17,18 @@ TAO_InterfaceDef_i::TAO_InterfaceDef_i (TAO_Repository_i *repo) { } -TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void) +TAO_InterfaceDef_i::~TAO_InterfaceDef_i () { } CORBA::DefinitionKind -TAO_InterfaceDef_i::def_kind (void) +TAO_InterfaceDef_i::def_kind () { return CORBA::dk_Interface; } void -TAO_InterfaceDef_i::destroy (void) +TAO_InterfaceDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_InterfaceDef_i::destroy (void) } void -TAO_InterfaceDef_i::destroy_i (void) +TAO_InterfaceDef_i::destroy_i () { // Destroy our members. this->TAO_Container_i::destroy_i (); @@ -64,7 +64,7 @@ TAO_InterfaceDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_InterfaceDef_i::describe (void) +TAO_InterfaceDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -74,7 +74,7 @@ TAO_InterfaceDef_i::describe (void) } CORBA::Contained::Description * -TAO_InterfaceDef_i::describe_i (void) +TAO_InterfaceDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, @@ -137,7 +137,7 @@ TAO_InterfaceDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type (void) +TAO_InterfaceDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -147,7 +147,7 @@ TAO_InterfaceDef_i::type (void) } CORBA::TypeCode_ptr -TAO_InterfaceDef_i::type_i (void) +TAO_InterfaceDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -166,7 +166,7 @@ TAO_InterfaceDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces (void) +TAO_InterfaceDef_i::base_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -176,7 +176,7 @@ TAO_InterfaceDef_i::base_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_InterfaceDef_i::base_interfaces_i (void) +TAO_InterfaceDef_i::base_interfaces_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; @@ -355,7 +355,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id) } CORBA::InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface (void) +TAO_InterfaceDef_i::describe_interface () { TAO_IFR_READ_GUARD_RETURN (0); @@ -365,7 +365,7 @@ TAO_InterfaceDef_i::describe_interface (void) } CORBA::InterfaceDef::FullInterfaceDescription * -TAO_InterfaceDef_i::describe_interface_i (void) +TAO_InterfaceDef_i::describe_interface_i () { CORBA::InterfaceDef::FullInterfaceDescription *fifd = 0; ACE_NEW_RETURN (fifd, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp index d078ec7ca7f..3ddbc46afed 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp @@ -12,12 +12,12 @@ TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (TAO_Repository_i *repo) { } -TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void) +TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i () { } CORBA::DefinitionKind -TAO_LocalInterfaceDef_i::def_kind (void) +TAO_LocalInterfaceDef_i::def_kind () { return CORBA::dk_LocalInterface; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp index 9f5b20010d0..ba036951827 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp @@ -14,18 +14,18 @@ TAO_ModuleDef_i::TAO_ModuleDef_i (TAO_Repository_i *repo) { } -TAO_ModuleDef_i::~TAO_ModuleDef_i (void) +TAO_ModuleDef_i::~TAO_ModuleDef_i () { } CORBA::DefinitionKind -TAO_ModuleDef_i::def_kind (void) +TAO_ModuleDef_i::def_kind () { return CORBA::dk_Module; } void -TAO_ModuleDef_i::destroy (void) +TAO_ModuleDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -35,7 +35,7 @@ TAO_ModuleDef_i::destroy (void) } void -TAO_ModuleDef_i::destroy_i (void) +TAO_ModuleDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -45,7 +45,7 @@ TAO_ModuleDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ModuleDef_i::describe (void) +TAO_ModuleDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -55,7 +55,7 @@ TAO_ModuleDef_i::describe (void) } CORBA::Contained::Description * -TAO_ModuleDef_i::describe_i (void) +TAO_ModuleDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp index d3bdb5e3192..4894451318a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp @@ -13,18 +13,18 @@ TAO_NativeDef_i::TAO_NativeDef_i (TAO_Repository_i *repo) { } -TAO_NativeDef_i::~TAO_NativeDef_i (void) +TAO_NativeDef_i::~TAO_NativeDef_i () { } CORBA::DefinitionKind -TAO_NativeDef_i::def_kind (void) +TAO_NativeDef_i::def_kind () { return CORBA::dk_Native; } CORBA::TypeCode_ptr -TAO_NativeDef_i::type (void) +TAO_NativeDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -34,7 +34,7 @@ TAO_NativeDef_i::type (void) } CORBA::TypeCode_ptr -TAO_NativeDef_i::type_i (void) +TAO_NativeDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index 73c79b50ff2..e4981989d82 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -19,12 +19,12 @@ TAO_OperationDef_i::TAO_OperationDef_i ( { } -TAO_OperationDef_i::~TAO_OperationDef_i (void) +TAO_OperationDef_i::~TAO_OperationDef_i () { } CORBA::DefinitionKind -TAO_OperationDef_i::def_kind (void) +TAO_OperationDef_i::def_kind () { return CORBA::dk_Operation; } @@ -60,7 +60,7 @@ TAO_OperationDef_i::describe_i ( ) } CORBA::TypeCode_ptr -TAO_OperationDef_i::result (void) +TAO_OperationDef_i::result () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -70,7 +70,7 @@ TAO_OperationDef_i::result (void) } CORBA::TypeCode_ptr -TAO_OperationDef_i::result_i (void) +TAO_OperationDef_i::result_i () { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -86,7 +86,7 @@ TAO_OperationDef_i::result_i (void) } CORBA::IDLType_ptr -TAO_OperationDef_i::result_def (void) +TAO_OperationDef_i::result_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -96,7 +96,7 @@ TAO_OperationDef_i::result_def (void) } CORBA::IDLType_ptr -TAO_OperationDef_i::result_def_i (void) +TAO_OperationDef_i::result_def_i () { ACE_TString result_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -132,7 +132,7 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def) } CORBA::ParDescriptionSeq * -TAO_OperationDef_i::params (void) +TAO_OperationDef_i::params () { TAO_IFR_READ_GUARD_RETURN (0); @@ -142,7 +142,7 @@ TAO_OperationDef_i::params (void) } CORBA::ParDescriptionSeq * -TAO_OperationDef_i::params_i (void) +TAO_OperationDef_i::params_i () { CORBA::ULong i = 0; ACE_Configuration_Section_Key params_key; @@ -307,7 +307,7 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq ¶ms) } CORBA::OperationMode -TAO_OperationDef_i::mode (void) +TAO_OperationDef_i::mode () { TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL); @@ -317,7 +317,7 @@ TAO_OperationDef_i::mode (void) } CORBA::OperationMode -TAO_OperationDef_i::mode_i (void) +TAO_OperationDef_i::mode_i () { u_int mode; this->repo_->config ()->get_integer_value (this->section_key_, @@ -346,7 +346,7 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode) } CORBA::ContextIdSeq * -TAO_OperationDef_i::contexts (void) +TAO_OperationDef_i::contexts () { TAO_IFR_READ_GUARD_RETURN (0); @@ -356,7 +356,7 @@ TAO_OperationDef_i::contexts (void) } CORBA::ContextIdSeq * -TAO_OperationDef_i::contexts_i (void) +TAO_OperationDef_i::contexts_i () { ACE_Configuration_Section_Key contexts_key; int status = @@ -665,7 +665,7 @@ TAO_OperationDef_i::make_description ( } CORBA::TypeCode_ptr -TAO_OperationDef_i::type_i (void) +TAO_OperationDef_i::type_i () { return this->result_i (); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp index dd6ba317df2..2c545920ee0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp @@ -90,37 +90,37 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } const char * -Options::ior_output_file (void) const +Options::ior_output_file () const { return this->ior_output_file_; } int -Options::persistent (void) const +Options::persistent () const { return this->persistent_; } const char * -Options::persistent_file (void) const +Options::persistent_file () const { return this->persistent_file_; } int -Options::using_registry (void) const +Options::using_registry () const { return this->using_registry_; } int -Options::enable_locking (void) const +Options::enable_locking () const { return this->enable_locking_; } int -Options::support_multicast_discovery (void) const +Options::support_multicast_discovery () const { return this->support_multicast_; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 44af15021ad..b0435b983fc 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -9,30 +9,30 @@ TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (TAO_Repository_i *repo) { } -TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void) +TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i () { } CORBA::DefinitionKind -TAO_PrimitiveDef_i::def_kind (void) +TAO_PrimitiveDef_i::def_kind () { return CORBA::dk_Primitive; } void -TAO_PrimitiveDef_i::destroy (void) +TAO_PrimitiveDef_i::destroy () { this->destroy_i (); } void -TAO_PrimitiveDef_i::destroy_i (void) +TAO_PrimitiveDef_i::destroy_i () { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type (void) +TAO_PrimitiveDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -42,7 +42,7 @@ TAO_PrimitiveDef_i::type (void) } CORBA::TypeCode_ptr -TAO_PrimitiveDef_i::type_i (void) +TAO_PrimitiveDef_i::type_i () { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -101,7 +101,7 @@ TAO_PrimitiveDef_i::type_i (void) } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind (void) +TAO_PrimitiveDef_i::kind () { TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null); @@ -111,7 +111,7 @@ TAO_PrimitiveDef_i::kind (void) } CORBA::PrimitiveKind -TAO_PrimitiveDef_i::kind_i (void) +TAO_PrimitiveDef_i::kind_i () { u_int pkind = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp index 796f36acfb2..55edddb4cc4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp @@ -12,18 +12,18 @@ TAO_ProvidesDef_i::TAO_ProvidesDef_i (TAO_Repository_i *repo) { } -TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void) +TAO_ProvidesDef_i::~TAO_ProvidesDef_i () { } CORBA::DefinitionKind -TAO_ProvidesDef_i::def_kind (void) +TAO_ProvidesDef_i::def_kind () { return CORBA::dk_Provides; } CORBA::Contained::Description * -TAO_ProvidesDef_i::describe (void) +TAO_ProvidesDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -33,7 +33,7 @@ TAO_ProvidesDef_i::describe (void) } CORBA::Contained::Description * -TAO_ProvidesDef_i::describe_i (void) +TAO_ProvidesDef_i::describe_i () { CORBA::ComponentIR::ProvidesDescription pd; TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription, @@ -60,7 +60,7 @@ TAO_ProvidesDef_i::describe_i (void) } CORBA::InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type (void) +TAO_ProvidesDef_i::interface_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -70,7 +70,7 @@ TAO_ProvidesDef_i::interface_type (void) } CORBA::InterfaceDef_ptr -TAO_ProvidesDef_i::interface_type_i (void) +TAO_ProvidesDef_i::interface_type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp index 40f64d82e02..c9531a80fb3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp @@ -9,12 +9,12 @@ TAO_PublishesDef_i::TAO_PublishesDef_i (TAO_Repository_i *repo) { } -TAO_PublishesDef_i::~TAO_PublishesDef_i (void) +TAO_PublishesDef_i::~TAO_PublishesDef_i () { } CORBA::DefinitionKind -TAO_PublishesDef_i::def_kind (void) +TAO_PublishesDef_i::def_kind () { return CORBA::dk_Publishes; } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index 3711e269ef8..54778f26be8 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -28,19 +28,19 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb, { } -TAO_Repository_i::~TAO_Repository_i (void) +TAO_Repository_i::~TAO_Repository_i () { delete this->lock_; } CORBA::DefinitionKind -TAO_Repository_i::def_kind (void) +TAO_Repository_i::def_kind () { return CORBA::dk_Repository; } void -TAO_Repository_i::destroy (void) +TAO_Repository_i::destroy () { throw CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO); } @@ -549,7 +549,7 @@ TAO_Repository_i::repo_init (CORBA::Repository_ptr repo_ref, } int -TAO_Repository_i::create_sections (void) +TAO_Repository_i::create_sections () { this->config_->open_section (config_->root_section (), "root", @@ -680,7 +680,7 @@ TAO_Repository_i::create_sections (void) } int -TAO_Repository_i::create_servants_and_poas (void) +TAO_Repository_i::create_servants_and_poas () { CORBA::PolicyList policies (5); policies.length (5); @@ -913,25 +913,25 @@ TAO_Repository_i::select_poa (CORBA::DefinitionKind def_kind) const } PortableServer::Current_ptr -TAO_Repository_i::poa_current (void) const +TAO_Repository_i::poa_current () const { return this->poa_current_.in (); } ACE_Configuration * -TAO_Repository_i::config (void) const +TAO_Repository_i::config () const { return this->config_; } CORBA::TypeCodeFactory_ptr -TAO_Repository_i::tc_factory (void) const +TAO_Repository_i::tc_factory () const { return this->tc_factory_.in (); } CORBA::Repository_ptr -TAO_Repository_i::repo_objref (void) const +TAO_Repository_i::repo_objref () const { return CORBA::Repository::_duplicate (this->repo_objref_.in ()); } @@ -943,61 +943,61 @@ TAO_Repository_i::repo_objref (CORBA::Repository_ptr objref) } ACE_Configuration_Section_Key -TAO_Repository_i::root_key (void) const +TAO_Repository_i::root_key () const { return this->root_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::repo_ids_key (void) const +TAO_Repository_i::repo_ids_key () const { return this->repo_ids_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::pkinds_key (void) const +TAO_Repository_i::pkinds_key () const { return this->pkinds_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::strings_key (void) const +TAO_Repository_i::strings_key () const { return this->strings_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::wstrings_key (void) const +TAO_Repository_i::wstrings_key () const { return this->wstrings_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::fixeds_key (void) const +TAO_Repository_i::fixeds_key () const { return this->fixeds_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::arrays_key (void) const +TAO_Repository_i::arrays_key () const { return this->arrays_key_; } ACE_Configuration_Section_Key -TAO_Repository_i::sequences_key (void) const +TAO_Repository_i::sequences_key () const { return this->sequences_key_; } const char * -TAO_Repository_i::extension (void) const +TAO_Repository_i::extension () const { return this->extension_.in (); } ACE_Lock & -TAO_Repository_i::lock (void) const +TAO_Repository_i::lock () const { return *this->lock_; } @@ -1035,14 +1035,14 @@ TAO_Repository_i::pkind_to_string (CORBA::PrimitiveKind pkind) const } u_int -TAO_Repository_i::num_pkinds (void) const +TAO_Repository_i::num_pkinds () const { return sizeof (TAO_Repository_i::TAO_IFR_primitive_kinds) / sizeof (char*); } // For debugging use only. void -TAO_Repository_i::shutdown (void) +TAO_Repository_i::shutdown () { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 3badf1b343e..d537a2c5d90 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -13,18 +13,18 @@ TAO_SequenceDef_i::TAO_SequenceDef_i (TAO_Repository_i *repo) { } -TAO_SequenceDef_i::~TAO_SequenceDef_i (void) +TAO_SequenceDef_i::~TAO_SequenceDef_i () { } CORBA::DefinitionKind -TAO_SequenceDef_i::def_kind (void) +TAO_SequenceDef_i::def_kind () { return CORBA::dk_Sequence; } void -TAO_SequenceDef_i::destroy (void) +TAO_SequenceDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -34,7 +34,7 @@ TAO_SequenceDef_i::destroy (void) } void -TAO_SequenceDef_i::destroy_i (void) +TAO_SequenceDef_i::destroy_i () { // Only if it is (w)string, fixed, array or sequence. this->destroy_element_type (); @@ -50,7 +50,7 @@ TAO_SequenceDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type (void) +TAO_SequenceDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -60,7 +60,7 @@ TAO_SequenceDef_i::type (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::type_i (void) +TAO_SequenceDef_i::type_i () { CORBA::TypeCode_var element_typecode = this->element_type_i (); @@ -74,7 +74,7 @@ TAO_SequenceDef_i::type_i (void) } CORBA::ULong -TAO_SequenceDef_i::bound (void) +TAO_SequenceDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -84,7 +84,7 @@ TAO_SequenceDef_i::bound (void) } CORBA::ULong -TAO_SequenceDef_i::bound_i (void) +TAO_SequenceDef_i::bound_i () { u_int bound = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -111,7 +111,7 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type (void) +TAO_SequenceDef_i::element_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -121,7 +121,7 @@ TAO_SequenceDef_i::element_type (void) } CORBA::TypeCode_ptr -TAO_SequenceDef_i::element_type_i (void) +TAO_SequenceDef_i::element_type_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -136,7 +136,7 @@ TAO_SequenceDef_i::element_type_i (void) } CORBA::IDLType_ptr -TAO_SequenceDef_i::element_type_def (void) +TAO_SequenceDef_i::element_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -146,7 +146,7 @@ TAO_SequenceDef_i::element_type_def (void) } CORBA::IDLType_ptr -TAO_SequenceDef_i::element_type_def_i (void) +TAO_SequenceDef_i::element_type_def_i () { ACE_TString element_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index d065fb17b9f..b316c778ed6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -11,18 +11,18 @@ TAO_StringDef_i::TAO_StringDef_i (TAO_Repository_i *repo) { } -TAO_StringDef_i::~TAO_StringDef_i (void) +TAO_StringDef_i::~TAO_StringDef_i () { } CORBA::DefinitionKind -TAO_StringDef_i::def_kind (void) +TAO_StringDef_i::def_kind () { return CORBA::dk_String; } void -TAO_StringDef_i::destroy (void) +TAO_StringDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -32,7 +32,7 @@ TAO_StringDef_i::destroy (void) } void -TAO_StringDef_i::destroy_i (void) +TAO_StringDef_i::destroy_i () { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -45,7 +45,7 @@ TAO_StringDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_StringDef_i::type (void) +TAO_StringDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -55,7 +55,7 @@ TAO_StringDef_i::type (void) } CORBA::TypeCode_ptr -TAO_StringDef_i::type_i (void) +TAO_StringDef_i::type_i () { CORBA::ULong bound = this->bound_i (); @@ -65,7 +65,7 @@ TAO_StringDef_i::type_i (void) } CORBA::ULong -TAO_StringDef_i::bound (void) +TAO_StringDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -75,7 +75,7 @@ TAO_StringDef_i::bound (void) } CORBA::ULong -TAO_StringDef_i::bound_i (void) +TAO_StringDef_i::bound_i () { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index a5586fd2f8b..b085d10321a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -17,18 +17,18 @@ TAO_StructDef_i::TAO_StructDef_i (TAO_Repository_i *repo) { } -TAO_StructDef_i::~TAO_StructDef_i (void) +TAO_StructDef_i::~TAO_StructDef_i () { } CORBA::DefinitionKind -TAO_StructDef_i::def_kind (void) +TAO_StructDef_i::def_kind () { return CORBA::dk_Struct; } void -TAO_StructDef_i::destroy (void) +TAO_StructDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_StructDef_i::destroy (void) } void -TAO_StructDef_i::destroy_i (void) +TAO_StructDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -48,7 +48,7 @@ TAO_StructDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_StructDef_i::type (void) +TAO_StructDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -58,7 +58,7 @@ TAO_StructDef_i::type (void) } CORBA::TypeCode_ptr -TAO_StructDef_i::type_i (void) +TAO_StructDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_StructDef_i::type_i (void) } CORBA::StructMemberSeq * -TAO_StructDef_i::members (void) +TAO_StructDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -107,7 +107,7 @@ TAO_StructDef_i::members (void) } CORBA::StructMemberSeq * -TAO_StructDef_i::members_i (void) +TAO_StructDef_i::members_i () { ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue; ACE_Unbounded_Queue<ACE_TString> path_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp index 486c5fd408b..27aff95a6a3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp @@ -12,12 +12,12 @@ TAO_TypedefDef_i::TAO_TypedefDef_i (TAO_Repository_i *repo) { } -TAO_TypedefDef_i::~TAO_TypedefDef_i (void) +TAO_TypedefDef_i::~TAO_TypedefDef_i () { } CORBA::Contained::Description * -TAO_TypedefDef_i::describe (void) +TAO_TypedefDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -27,7 +27,7 @@ TAO_TypedefDef_i::describe (void) } CORBA::Contained::Description * -TAO_TypedefDef_i::describe_i (void) +TAO_TypedefDef_i::describe_i () { CORBA::Contained::Description *desc_ptr = 0; ACE_NEW_THROW_EX (desc_ptr, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index e77bcc3742a..99eac21a96a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -20,18 +20,18 @@ TAO_UnionDef_i::TAO_UnionDef_i (TAO_Repository_i *repo) { } -TAO_UnionDef_i::~TAO_UnionDef_i (void) +TAO_UnionDef_i::~TAO_UnionDef_i () { } CORBA::DefinitionKind -TAO_UnionDef_i::def_kind (void) +TAO_UnionDef_i::def_kind () { return CORBA::dk_Union; } void -TAO_UnionDef_i::destroy (void) +TAO_UnionDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -41,7 +41,7 @@ TAO_UnionDef_i::destroy (void) } void -TAO_UnionDef_i::destroy_i (void) +TAO_UnionDef_i::destroy_i () { // Destroy our members. TAO_Container_i::destroy_i (); @@ -51,7 +51,7 @@ TAO_UnionDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::type (void) +TAO_UnionDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -61,7 +61,7 @@ TAO_UnionDef_i::type (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::type_i (void) +TAO_UnionDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -103,7 +103,7 @@ TAO_UnionDef_i::type_i (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type (void) +TAO_UnionDef_i::discriminator_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -113,7 +113,7 @@ TAO_UnionDef_i::discriminator_type (void) } CORBA::TypeCode_ptr -TAO_UnionDef_i::discriminator_type_i (void) +TAO_UnionDef_i::discriminator_type_i () { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -132,7 +132,7 @@ TAO_UnionDef_i::discriminator_type_i (void) } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def (void) +TAO_UnionDef_i::discriminator_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -142,7 +142,7 @@ TAO_UnionDef_i::discriminator_type_def (void) } CORBA::IDLType_ptr -TAO_UnionDef_i::discriminator_type_def_i (void) +TAO_UnionDef_i::discriminator_type_def_i () { ACE_TString disc_path; this->repo_->config ()->get_string_value (this->section_key_, @@ -182,7 +182,7 @@ TAO_UnionDef_i::discriminator_type_def_i ( } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members (void) +TAO_UnionDef_i::members () { TAO_IFR_READ_GUARD_RETURN (0); @@ -192,7 +192,7 @@ TAO_UnionDef_i::members (void) } CORBA::UnionMemberSeq * -TAO_UnionDef_i::members_i (void) +TAO_UnionDef_i::members_i () { ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 7c8b1435634..a872766822f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -13,18 +13,18 @@ TAO_UsesDef_i::TAO_UsesDef_i (TAO_Repository_i *repo) { } -TAO_UsesDef_i::~TAO_UsesDef_i (void) +TAO_UsesDef_i::~TAO_UsesDef_i () { } CORBA::DefinitionKind -TAO_UsesDef_i::def_kind (void) +TAO_UsesDef_i::def_kind () { return CORBA::dk_Uses; } CORBA::Contained::Description * -TAO_UsesDef_i::describe (void) +TAO_UsesDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -34,7 +34,7 @@ TAO_UsesDef_i::describe (void) } CORBA::Contained::Description * -TAO_UsesDef_i::describe_i (void) +TAO_UsesDef_i::describe_i () { CORBA::ComponentIR::UsesDescription ud; TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription, @@ -62,7 +62,7 @@ TAO_UsesDef_i::describe_i (void) } CORBA::InterfaceDef_ptr -TAO_UsesDef_i::interface_type (void) +TAO_UsesDef_i::interface_type () { TAO_IFR_READ_GUARD_RETURN (CORBA::InterfaceDef::_nil ()); @@ -72,7 +72,7 @@ TAO_UsesDef_i::interface_type (void) } CORBA::InterfaceDef_ptr -TAO_UsesDef_i::interface_type_i (void) +TAO_UsesDef_i::interface_type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -135,7 +135,7 @@ TAO_UsesDef_i::interface_type_i ( } CORBA::Boolean -TAO_UsesDef_i::is_multiple (void) +TAO_UsesDef_i::is_multiple () { TAO_IFR_READ_GUARD_RETURN (0); @@ -145,7 +145,7 @@ TAO_UsesDef_i::is_multiple (void) } CORBA::Boolean -TAO_UsesDef_i::is_multiple_i (void) +TAO_UsesDef_i::is_multiple_i () { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp index 178c524cd76..496a915607b 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp @@ -17,18 +17,18 @@ TAO_ValueBoxDef_i::TAO_ValueBoxDef_i ( { } -TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void) +TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i () { } CORBA::DefinitionKind -TAO_ValueBoxDef_i::def_kind (void) +TAO_ValueBoxDef_i::def_kind () { return CORBA::dk_ValueBox; } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type (void) +TAO_ValueBoxDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -38,7 +38,7 @@ TAO_ValueBoxDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueBoxDef_i::type_i (void) +TAO_ValueBoxDef_i::type_i () { ACE_TString id; this->repo_->config ()->get_string_value (this->section_key_, @@ -67,7 +67,7 @@ TAO_ValueBoxDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def (void) +TAO_ValueBoxDef_i::original_type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -77,7 +77,7 @@ TAO_ValueBoxDef_i::original_type_def (void) } CORBA::IDLType_ptr -TAO_ValueBoxDef_i::original_type_def_i (void) +TAO_ValueBoxDef_i::original_type_def_i () { ACE_TString boxed_type_path; this->repo_->config ()->get_string_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index b79502df952..304a998ca67 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -17,18 +17,18 @@ TAO_ValueDef_i::TAO_ValueDef_i (TAO_Repository_i *repo) { } -TAO_ValueDef_i::~TAO_ValueDef_i (void) +TAO_ValueDef_i::~TAO_ValueDef_i () { } CORBA::DefinitionKind -TAO_ValueDef_i::def_kind (void) +TAO_ValueDef_i::def_kind () { return CORBA::dk_Value; } void -TAO_ValueDef_i::destroy (void) +TAO_ValueDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -38,7 +38,7 @@ TAO_ValueDef_i::destroy (void) } void -TAO_ValueDef_i::destroy_i (void) +TAO_ValueDef_i::destroy_i () { this->TAO_Container_i::destroy_i (); @@ -60,7 +60,7 @@ TAO_ValueDef_i::destroy_i (void) } CORBA::Contained::Description * -TAO_ValueDef_i::describe (void) +TAO_ValueDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -70,7 +70,7 @@ TAO_ValueDef_i::describe (void) } CORBA::Contained::Description * -TAO_ValueDef_i::describe_i (void) +TAO_ValueDef_i::describe_i () { CORBA::ValueDescription *vd = 0; ACE_NEW_RETURN (vd, @@ -91,7 +91,7 @@ TAO_ValueDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ValueDef_i::type (void) +TAO_ValueDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -101,7 +101,7 @@ TAO_ValueDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueDef_i::type_i (void) +TAO_ValueDef_i::type_i () { /// Since valuetype type codes may encapsultate the type code of a /// base class, this call could be recursive, with the @@ -113,7 +113,7 @@ TAO_ValueDef_i::type_i (void) } CORBA::InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces (void) +TAO_ValueDef_i::supported_interfaces () { TAO_IFR_READ_GUARD_RETURN (0); @@ -123,7 +123,7 @@ TAO_ValueDef_i::supported_interfaces (void) } CORBA::InterfaceDefSeq * -TAO_ValueDef_i::supported_interfaces_i (void) +TAO_ValueDef_i::supported_interfaces_i () { CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_RETURN (seq, @@ -257,7 +257,7 @@ TAO_ValueDef_i::supported_interfaces_i ( } CORBA::InitializerSeq * -TAO_ValueDef_i::initializers (void) +TAO_ValueDef_i::initializers () { TAO_IFR_READ_GUARD_RETURN (0); @@ -267,7 +267,7 @@ TAO_ValueDef_i::initializers (void) } CORBA::InitializerSeq * -TAO_ValueDef_i::initializers_i (void) +TAO_ValueDef_i::initializers_i () { CORBA::InitializerSeq *iseq = 0; ACE_NEW_RETURN (iseq, @@ -383,7 +383,7 @@ TAO_ValueDef_i::initializers_i (const CORBA::InitializerSeq &initializers) } CORBA::ValueDef_ptr -TAO_ValueDef_i::base_value (void) +TAO_ValueDef_i::base_value () { TAO_IFR_READ_GUARD_RETURN (CORBA::ValueDef::_nil ()); @@ -393,7 +393,7 @@ TAO_ValueDef_i::base_value (void) } CORBA::ValueDef_ptr -TAO_ValueDef_i::base_value_i (void) +TAO_ValueDef_i::base_value_i () { ACE_TString base_path; int status = @@ -458,7 +458,7 @@ TAO_ValueDef_i::base_value_i (CORBA::ValueDef_ptr base_value) } CORBA::ValueDefSeq * -TAO_ValueDef_i::abstract_base_values (void) +TAO_ValueDef_i::abstract_base_values () { TAO_IFR_READ_GUARD_RETURN (0); @@ -468,7 +468,7 @@ TAO_ValueDef_i::abstract_base_values (void) } CORBA::ValueDefSeq * -TAO_ValueDef_i::abstract_base_values_i (void) +TAO_ValueDef_i::abstract_base_values_i () { CORBA::ValueDefSeq *vd_seq = 0; ACE_NEW_RETURN (vd_seq, @@ -585,7 +585,7 @@ TAO_ValueDef_i::abstract_base_values_i ( } CORBA::Boolean -TAO_ValueDef_i::is_abstract (void) +TAO_ValueDef_i::is_abstract () { TAO_IFR_READ_GUARD_RETURN (0); @@ -595,7 +595,7 @@ TAO_ValueDef_i::is_abstract (void) } CORBA::Boolean -TAO_ValueDef_i::is_abstract_i (void) +TAO_ValueDef_i::is_abstract_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -624,7 +624,7 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract) } CORBA::Boolean -TAO_ValueDef_i::is_custom (void) +TAO_ValueDef_i::is_custom () { TAO_IFR_READ_GUARD_RETURN (0); @@ -634,7 +634,7 @@ TAO_ValueDef_i::is_custom (void) } CORBA::Boolean -TAO_ValueDef_i::is_custom_i (void) +TAO_ValueDef_i::is_custom_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -663,7 +663,7 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom) } CORBA::Boolean -TAO_ValueDef_i::is_truncatable (void) +TAO_ValueDef_i::is_truncatable () { TAO_IFR_READ_GUARD_RETURN (0); @@ -673,7 +673,7 @@ TAO_ValueDef_i::is_truncatable (void) } CORBA::Boolean -TAO_ValueDef_i::is_truncatable_i (void) +TAO_ValueDef_i::is_truncatable_i () { CORBA::ULong is_it = 0; this->repo_->config ()->get_integer_value (this->section_key_, @@ -800,7 +800,7 @@ TAO_ValueDef_i::is_a_i (const char *id) } CORBA::ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value (void) +TAO_ValueDef_i::describe_value () { TAO_IFR_READ_GUARD_RETURN (0); @@ -810,7 +810,7 @@ TAO_ValueDef_i::describe_value (void) } CORBA::ValueDef::FullValueDescription * -TAO_ValueDef_i::describe_value_i (void) +TAO_ValueDef_i::describe_value_i () { CORBA::ValueDef::FullValueDescription *fv_desc = 0; ACE_NEW_RETURN (fv_desc, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index d446026e696..332b6004b6c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -14,18 +14,18 @@ TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (TAO_Repository_i *repo) { } -TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void) +TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i () { } CORBA::DefinitionKind -TAO_ValueMemberDef_i::def_kind (void) +TAO_ValueMemberDef_i::def_kind () { return CORBA::dk_ValueMember; } CORBA::Contained::Description * -TAO_ValueMemberDef_i::describe (void) +TAO_ValueMemberDef_i::describe () { TAO_IFR_READ_GUARD_RETURN (0); @@ -35,7 +35,7 @@ TAO_ValueMemberDef_i::describe (void) } CORBA::Contained::Description * -TAO_ValueMemberDef_i::describe_i (void) +TAO_ValueMemberDef_i::describe_i () { CORBA::ValueMember vm; TAO_IFR_Desc_Utils<CORBA::ValueMember, @@ -74,7 +74,7 @@ TAO_ValueMemberDef_i::describe_i (void) } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type (void) +TAO_ValueMemberDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -84,7 +84,7 @@ TAO_ValueMemberDef_i::type (void) } CORBA::TypeCode_ptr -TAO_ValueMemberDef_i::type_i (void) +TAO_ValueMemberDef_i::type_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -97,7 +97,7 @@ TAO_ValueMemberDef_i::type_i (void) } CORBA::IDLType_ptr -TAO_ValueMemberDef_i::type_def (void) +TAO_ValueMemberDef_i::type_def () { TAO_IFR_READ_GUARD_RETURN (CORBA::IDLType::_nil ()); @@ -107,7 +107,7 @@ TAO_ValueMemberDef_i::type_def (void) } CORBA::IDLType_ptr -TAO_ValueMemberDef_i::type_def_i (void) +TAO_ValueMemberDef_i::type_def_i () { ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -140,7 +140,7 @@ TAO_ValueMemberDef_i::type_def_i (CORBA::IDLType_ptr type_def) } CORBA::Visibility -TAO_ValueMemberDef_i::access (void) +TAO_ValueMemberDef_i::access () { TAO_IFR_READ_GUARD_RETURN (0); @@ -150,7 +150,7 @@ TAO_ValueMemberDef_i::access (void) } CORBA::Visibility -TAO_ValueMemberDef_i::access_i (void) +TAO_ValueMemberDef_i::access_i () { CORBA::ULong val = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index 5c1227b73f8..20c871b11fa 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -11,18 +11,18 @@ TAO_WstringDef_i::TAO_WstringDef_i (TAO_Repository_i *repo) { } -TAO_WstringDef_i::~TAO_WstringDef_i (void) +TAO_WstringDef_i::~TAO_WstringDef_i () { } CORBA::DefinitionKind -TAO_WstringDef_i::def_kind (void) +TAO_WstringDef_i::def_kind () { return CORBA::dk_Wstring; } void -TAO_WstringDef_i::destroy (void) +TAO_WstringDef_i::destroy () { TAO_IFR_WRITE_GUARD; @@ -32,7 +32,7 @@ TAO_WstringDef_i::destroy (void) } void -TAO_WstringDef_i::destroy_i (void) +TAO_WstringDef_i::destroy_i () { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, @@ -45,7 +45,7 @@ TAO_WstringDef_i::destroy_i (void) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type (void) +TAO_WstringDef_i::type () { TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ()); @@ -55,14 +55,14 @@ TAO_WstringDef_i::type (void) } CORBA::TypeCode_ptr -TAO_WstringDef_i::type_i (void) +TAO_WstringDef_i::type_i () { CORBA::ULong bound = this->bound_i (); return this->repo_->tc_factory ()->create_wstring_tc (bound); } CORBA::ULong -TAO_WstringDef_i::bound (void) +TAO_WstringDef_i::bound () { TAO_IFR_READ_GUARD_RETURN (0); @@ -73,7 +73,7 @@ TAO_WstringDef_i::bound (void) CORBA::ULong -TAO_WstringDef_i::bound_i (void) +TAO_WstringDef_i::bound_i () { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index 8d99f155162..67d80c65ad3 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_HANDLE -TAO_IOR_Multicast::get_handle (void) const +TAO_IOR_Multicast::get_handle () const { return this->mcast_dgram_.get_handle (); } -TAO_IOR_Multicast::TAO_IOR_Multicast (void) +TAO_IOR_Multicast::TAO_IOR_Multicast () : service_id_ ((TAO_Service_ID) 0) { } @@ -32,7 +32,7 @@ TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior, ACE_TEXT ("TAO_IOR_Multicast"))); } -TAO_IOR_Multicast::~TAO_IOR_Multicast (void) +TAO_IOR_Multicast::~TAO_IOR_Multicast () { if (ior_.length() > 0 && this->mcast_dgram_.leave (this->mcast_addr_) == -1) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index cae9a5df6bf..184f5c13129 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -51,12 +51,12 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( } } -TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void) +TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Load_Average_Monitor::the_location (void) +TAO_LB_CPU_Load_Average_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -71,7 +71,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Load_Average_Monitor::loads (void) +TAO_LB_CPU_Load_Average_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 18568bc60e9..140d1fd5f2d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -double calc_cpu_loading (void) +double calc_cpu_loading () { static char buf[1024]; static unsigned long prev_idle = 0; @@ -100,12 +100,12 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc } } -TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void) +TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Utilization_Monitor::the_location (void) +TAO_LB_CPU_Utilization_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -120,7 +120,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Utilization_Monitor::loads (void) +TAO_LB_CPU_Utilization_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index e8b7ed58bdd..434337ec336 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -13,13 +13,13 @@ TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[]) } int -TAO_LB_ClientComponent::fini (void) +TAO_LB_ClientComponent::fini () { return 0; } int -TAO_LB_ClientComponent::register_orb_initializer (void) +TAO_LB_ClientComponent::register_orb_initializer () { try { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index f0db0d42c80..60aff63da0d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -10,7 +10,7 @@ TAO_LB_ClientRequestInterceptor::name () } void -TAO_LB_ClientRequestInterceptor::destroy (void) +TAO_LB_ClientRequestInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 0094a7f89cb..7346bc1e73e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -84,7 +84,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) } int -TAO_LB_Component::fini (void) +TAO_LB_Component::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index cd1014d001f..daf9dfa2485 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -26,13 +26,13 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( } char * -TAO_LB_IORInterceptor::name (void) +TAO_LB_IORInterceptor::name () { return CORBA::string_dup ("TAO_LB_IORInterceptor"); } void -TAO_LB_IORInterceptor::destroy (void) +TAO_LB_IORInterceptor::destroy () { // Force the LoadManager reference to be released since the ORB's // lifetime is tied to object reference lifetimes. @@ -101,7 +101,7 @@ TAO_LB_IORInterceptor::adapter_state_changed ( } void -TAO_LB_IORInterceptor::register_load_alert (void) +TAO_LB_IORInterceptor::register_load_alert () { { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 7768d687e3f..91e605558eb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -41,20 +41,20 @@ TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void) +TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LeastLoaded::name (void) +TAO_LB_LeastLoaded::name () { return CORBA::string_dup ("LeastLoaded"); } CosLoadBalancing::Properties * -TAO_LB_LeastLoaded::get_properties (void) +TAO_LB_LeastLoaded::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -293,7 +293,7 @@ TAO_LB_LeastLoaded::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LeastLoaded::_default_POA (void) +TAO_LB_LeastLoaded::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index dab05290bac..a1fccfa31cd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -6,18 +6,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert::TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::TAO_LB_LoadAlert () : alerted_ (0), lock_ () { } -TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::~TAO_LB_LoadAlert () { } void -TAO_LB_LoadAlert::enable_alert (void) +TAO_LB_LoadAlert::enable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -25,7 +25,7 @@ TAO_LB_LoadAlert::enable_alert (void) } void -TAO_LB_LoadAlert::disable_alert (void) +TAO_LB_LoadAlert::disable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index fbba4fb425c..d19c4b29ddf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) +TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo () : load_alert (), alerted (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 0492f39e912..7a55a8bf123 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) +TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler () { } void -TAO_LB_LoadAlert_Handler::enable_alert (void) +TAO_LB_LoadAlert_Handler::enable_alert () { } @@ -24,7 +24,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep ( } void -TAO_LB_LoadAlert_Handler::disable_alert (void) +TAO_LB_LoadAlert_Handler::disable_alert () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 506b720ddb1..65b656bdee4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -39,20 +39,20 @@ TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void) +TAO_LB_LoadAverage::~TAO_LB_LoadAverage () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadAverage::name (void) +TAO_LB_LoadAverage::name () { return CORBA::string_dup ("LoadAverage"); } CosLoadBalancing::Properties * -TAO_LB_LoadAverage::get_properties (void) +TAO_LB_LoadAverage::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -320,7 +320,7 @@ TAO_LB_LoadAverage::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadAverage::_default_POA (void) +TAO_LB_LoadAverage::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 93b1d34637b..b5fb4e0a12f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -66,7 +66,7 @@ TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout, // by whatever code instantiates this LoadManager. } -TAO_LB_LoadManager::~TAO_LB_LoadManager (void) +TAO_LB_LoadManager::~TAO_LB_LoadManager () { this->shutdown_ = true; this->validate_condition_.signal (); @@ -1162,7 +1162,7 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) int -TAO_LB_LoadManager::svc (void) +TAO_LB_LoadManager::svc () { while (! this->shutdown_) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 506deccc859..3f09e937742 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -40,20 +40,20 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void) +TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadMinimum::name (void) +TAO_LB_LoadMinimum::name () { return CORBA::string_dup ("LoadMinimum"); } CosLoadBalancing::Properties * -TAO_LB_LoadMinimum::get_properties (void) +TAO_LB_LoadMinimum::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -357,7 +357,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadMinimum::_default_POA (void) +TAO_LB_LoadMinimum::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 90fda5e5db8..31b974fd655 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -47,14 +47,14 @@ TAO_LB_ObjectReferenceFactory::TAO_LB_ObjectReferenceFactory ( } ::CORBA::ValueBase * -TAO_LB_ObjectReferenceFactory::_copy_value (void) +TAO_LB_ObjectReferenceFactory::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented return ret_val; } -TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void) +TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index a84d6345130..6e44f3ce5d6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) +TAO_LB_Pull_Handler::TAO_LB_Pull_Handler () : monitor_map_ (0), load_manager_ (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 96dcc7c5f31..12dc31cc68b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -23,13 +23,13 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) } char * -TAO_LB_Random::name (void) +TAO_LB_Random::name () { return CORBA::string_dup ("Random"); } CosLoadBalancing::Properties * -TAO_LB_Random::get_properties (void) +TAO_LB_Random::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -85,7 +85,7 @@ TAO_LB_Random::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_Random::_default_POA (void) +TAO_LB_Random::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -133,7 +133,7 @@ TAO_LB_Random::_tao_next_member ( } void -TAO_LB_Random::init (void) +TAO_LB_Random::init () { #ifdef ACE_HAS_PTHREADS (void) ::pthread_once (&::tao_lb_once_control, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index cfddac5559a..23ab22f39c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -15,18 +15,18 @@ TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) { } -TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void) +TAO_LB_RoundRobin::~TAO_LB_RoundRobin () { } char * -TAO_LB_RoundRobin::name (void) +TAO_LB_RoundRobin::name () { return CORBA::string_dup ("RoundRobin"); } CosLoadBalancing::Properties * -TAO_LB_RoundRobin::get_properties (void) +TAO_LB_RoundRobin::get_properties () { // There are no RoundRobin properties. Return an empty property // list. @@ -182,7 +182,7 @@ TAO_LB_RoundRobin::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_RoundRobin::_default_POA (void) +TAO_LB_RoundRobin::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index 45b0749eb7e..b3a8dfa4f56 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -12,18 +12,18 @@ TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( { } -TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void) +TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor () { } char * -TAO_LB_ServerRequestInterceptor::name (void) +TAO_LB_ServerRequestInterceptor::name () { return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor"); } void -TAO_LB_ServerRequestInterceptor::destroy (void) +TAO_LB_ServerRequestInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp index 27860277a4f..a7295c933e3 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp @@ -3,11 +3,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void) +TAO_BasicLogFactory_i::TAO_BasicLogFactory_i () { } -TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i (void) +TAO_BasicLogFactory_i::~TAO_BasicLogFactory_i () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index d55c9656420..b0b30c1bf4b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -15,7 +15,7 @@ TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb, // No-Op. } -TAO_BasicLog_i::~TAO_BasicLog_i (void) +TAO_BasicLog_i::~TAO_BasicLog_i () { // No-Op. } @@ -54,7 +54,7 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) } void -TAO_BasicLog_i::destroy (void) +TAO_BasicLog_i::destroy () { // Remove ourselves from the list of logs. this->logmgr_i_.remove (this->logid_); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp index abc0f9e0718..52752db1dff 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp @@ -9,7 +9,7 @@ TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log) { } -TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void) +TAO_Event_LogConsumer::~TAO_Event_LogConsumer () { } @@ -79,7 +79,7 @@ TAO_Event_LogConsumer::push (const CORBA::Any& data) } void -TAO_Event_LogConsumer::disconnect_push_consumer (void) +TAO_Event_LogConsumer::disconnect_push_consumer () { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp index bad86505f10..d2e0a1955cc 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) : +TAO_EventLogFactory_i::TAO_EventLogFactory_i () : impl (0), notifier_ (0) { @@ -33,7 +33,7 @@ TAO_EventLogFactory_i::TAO_EventLogFactory_i (void) : } } -TAO_EventLogFactory_i::~TAO_EventLogFactory_i (void) +TAO_EventLogFactory_i::~TAO_EventLogFactory_i () { // No-Op. } @@ -45,7 +45,7 @@ TAO_EventLogFactory_i::init (PortableServer::POA_ptr /* poa */) CosEventChannelAdmin::EventChannel_var ec_return; - auto_ptr <TAO_CEC_EventChannel> ec (impl); + std::unique_ptr <TAO_CEC_EventChannel> ec (impl); PortableServer::ObjectId_var oid = this->poa_->activate_object (ec.get ()); @@ -186,13 +186,13 @@ TAO_EventLogFactory_i::create_log_servant (DsLogAdmin::LogId id) } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EventLogFactory_i::obtain_push_supplier (void) +TAO_EventLogFactory_i::obtain_push_supplier () { return consumer_admin_->obtain_push_supplier (); } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_EventLogFactory_i::obtain_pull_supplier (void) +TAO_EventLogFactory_i::obtain_pull_supplier () { return consumer_admin_->obtain_pull_supplier (); diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp index 16e8d79994b..624b26e8946 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp @@ -11,13 +11,13 @@ TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventC obtain_proxy_consumer (); } -TAO_EventLogNotification::~TAO_EventLogNotification (void) +TAO_EventLogNotification::~TAO_EventLogNotification () { // No-Op. } void -TAO_EventLogNotification::disconnect_push_supplier (void) +TAO_EventLogNotification::disconnect_push_supplier () { this->consumer_->disconnect_push_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 90bb1ee624d..6ede219f2e6 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -69,7 +69,7 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) void -TAO_EventLog_i::destroy (void) +TAO_EventLog_i::destroy () { // Send event to indicate the log has been deleted. notifier_->object_deletion (logid_); @@ -85,7 +85,7 @@ TAO_EventLog_i::destroy (void) } void -TAO_EventLog_i::activate (void) +TAO_EventLog_i::activate () { CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -97,13 +97,13 @@ TAO_EventLog_i::activate (void) CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_EventLog_i::for_consumers (void) +TAO_EventLog_i::for_consumers () { return this->event_channel_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_EventLog_i::for_suppliers (void) +TAO_EventLog_i::for_suppliers () { return this->event_channel_->for_suppliers (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp index 6ad7296b210..25e6b7d1017 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp @@ -25,7 +25,7 @@ TAO_Hash_Iterator_i::TAO_Hash_Iterator_i ( } -TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i (void) +TAO_Hash_Iterator_i::~TAO_Hash_Iterator_i () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp index 961c2839023..93c5607b08d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp @@ -72,44 +72,44 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore ( log_poa->create_POA(buf, poa_manager.in(), policies); } -TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore (void) +TAO_Hash_LogRecordStore::~TAO_Hash_LogRecordStore () { this->iterator_poa_->destroy (1, 0); } int -TAO_Hash_LogRecordStore::open (void) +TAO_Hash_LogRecordStore::open () { return rec_map_.open (); } int -TAO_Hash_LogRecordStore::close (void) +TAO_Hash_LogRecordStore::close () { // Close the hash return rec_map_.close (); } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_current_size (void) +TAO_Hash_LogRecordStore::get_current_size () { return this->current_size_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_n_records (void) +TAO_Hash_LogRecordStore::get_n_records () { return this->num_records_; } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_gauge (void) +TAO_Hash_LogRecordStore::get_gauge () { return this->gauge_; } void -TAO_Hash_LogRecordStore::reset_gauge (void) +TAO_Hash_LogRecordStore::reset_gauge () { this->gauge_ = 0; } @@ -209,7 +209,7 @@ TAO_Hash_LogRecordStore::remove_i (LOG_RECORD_STORE_ITER iter) } int -TAO_Hash_LogRecordStore::purge_old_records (void) +TAO_Hash_LogRecordStore::purge_old_records () { CORBA::ULongLong num_records_to_purge = this->num_records_ * 5U / 100U; @@ -315,7 +315,7 @@ TAO_Hash_LogRecordStore::get_record_attribute (DsLogAdmin::RecordId id) int -TAO_Hash_LogRecordStore::flush (void) +TAO_Hash_LogRecordStore::flush () { return 0; } @@ -543,7 +543,7 @@ TAO_Hash_LogRecordStore::delete_records_by_id (const DsLogAdmin::RecordIdList &i } CORBA::ULong -TAO_Hash_LogRecordStore::remove_old_records (void) +TAO_Hash_LogRecordStore::remove_old_records () { if (this->max_record_life_ == 0) { return 0; @@ -597,7 +597,7 @@ TAO_Hash_LogRecordStore::check_grammar (const char* grammar) DsLogAdmin::AdministrativeState -TAO_Hash_LogRecordStore::get_administrative_state (void) const +TAO_Hash_LogRecordStore::get_administrative_state () const { return this->admin_state_; } @@ -610,7 +610,7 @@ TAO_Hash_LogRecordStore::set_administrative_state (DsLogAdmin::AdministrativeSta DsLogAdmin::CapacityAlarmThresholdList* -TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds (void) const +TAO_Hash_LogRecordStore::get_capacity_alarm_thresholds () const { DsLogAdmin::CapacityAlarmThresholdList* ret_val; ACE_NEW_THROW_EX (ret_val, @@ -629,7 +629,7 @@ TAO_Hash_LogRecordStore::set_capacity_alarm_thresholds (const DsLogAdmin::Capaci DsLogAdmin::ForwardingState -TAO_Hash_LogRecordStore::get_forwarding_state (void) const +TAO_Hash_LogRecordStore::get_forwarding_state () const { return this->forward_state_; } @@ -641,7 +641,7 @@ TAO_Hash_LogRecordStore::set_forwarding_state (DsLogAdmin::ForwardingState state } DsLogAdmin::TimeInterval -TAO_Hash_LogRecordStore::get_interval (void) const +TAO_Hash_LogRecordStore::get_interval () const { return this->interval_; } @@ -654,7 +654,7 @@ TAO_Hash_LogRecordStore::set_interval (const DsLogAdmin::TimeInterval &interval) DsLogAdmin::LogFullActionType -TAO_Hash_LogRecordStore::get_log_full_action (void) const +TAO_Hash_LogRecordStore::get_log_full_action () const { return this->log_full_action_; } @@ -666,7 +666,7 @@ TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType acti } DsLogAdmin::QoSList * -TAO_Hash_LogRecordStore::get_log_qos (void) const +TAO_Hash_LogRecordStore::get_log_qos () const { DsLogAdmin::QoSList* ret_val = 0; ACE_NEW_THROW_EX (ret_val, @@ -683,7 +683,7 @@ TAO_Hash_LogRecordStore::set_log_qos (const DsLogAdmin::QoSList& qos) } CORBA::ULong -TAO_Hash_LogRecordStore::get_max_record_life (void) const +TAO_Hash_LogRecordStore::get_max_record_life () const { return this->max_record_life_; } @@ -695,7 +695,7 @@ TAO_Hash_LogRecordStore::set_max_record_life (CORBA::ULong max_record_life) } CORBA::ULongLong -TAO_Hash_LogRecordStore::get_max_size (void) const +TAO_Hash_LogRecordStore::get_max_size () const { return this->max_size_; } @@ -707,7 +707,7 @@ TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size) } DsLogAdmin::WeekMask* -TAO_Hash_LogRecordStore::get_week_mask (void) +TAO_Hash_LogRecordStore::get_week_mask () { DsLogAdmin::WeekMask* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index 1cbfed1dc8c..60e527cd359 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -18,7 +18,7 @@ TAO_Hash_LogStore::~TAO_Hash_LogStore() DsLogAdmin::LogList* -TAO_Hash_LogStore::list_logs (void) +TAO_Hash_LogStore::list_logs () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -54,7 +54,7 @@ TAO_Hash_LogStore::list_logs (void) } DsLogAdmin::LogIdList* -TAO_Hash_LogStore::list_logs_by_id (void) +TAO_Hash_LogStore::list_logs_by_id () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -168,7 +168,7 @@ TAO_Hash_LogStore::create(DsLogAdmin::LogFullActionType full_action, ), CORBA::NO_MEMORY ()); - auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); + std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl); if (this->hash_map_.bind (id, recordstore.get ()) != 0) { @@ -205,7 +205,7 @@ TAO_Hash_LogStore::create_with_id (DsLogAdmin::LogId id, ), CORBA::NO_MEMORY ()); - auto_ptr<TAO_Hash_LogRecordStore> recordstore (impl); + std::unique_ptr<TAO_Hash_LogRecordStore> recordstore (impl); if (this->hash_map_.bind (id, recordstore.get ()) != 0) { diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp index 751c18bdf8c..ae82ec30f30 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp @@ -19,7 +19,7 @@ TAO_Iterator_i::TAO_Iterator_i (PortableServer::POA_ptr poa, } -TAO_Iterator_i::~TAO_Iterator_i (void) +TAO_Iterator_i::~TAO_Iterator_i () { // cancel timer if (this->timer_id_ != -1) @@ -30,7 +30,7 @@ TAO_Iterator_i::~TAO_Iterator_i (void) void -TAO_Iterator_i::destroy (void) +TAO_Iterator_i::destroy () { PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index f9db2b037ca..7c5977d684d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -146,14 +146,14 @@ TAO_LogMgr_i::create_log_object (DsLogAdmin::LogId id) } DsLogAdmin::LogList* -TAO_LogMgr_i::list_logs (void) +TAO_LogMgr_i::list_logs () { return this->logstore_->list_logs (); } DsLogAdmin::LogIdList* -TAO_LogMgr_i::list_logs_by_id (void) +TAO_LogMgr_i::list_logs_by_id () { return this->logstore_->list_logs_by_id (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp index 0e49232f712..44054f36974 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LogNotification::TAO_LogNotification (void) +TAO_LogNotification::TAO_LogNotification () { } -TAO_LogNotification::~TAO_LogNotification (void) +TAO_LogNotification::~TAO_LogNotification () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index dd2b50b8f31..cefd5f77fa7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -2,11 +2,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LogRecordStore::TAO_LogRecordStore (void) +TAO_LogRecordStore::TAO_LogRecordStore () { } -TAO_LogRecordStore::~TAO_LogRecordStore (void) +TAO_LogRecordStore::~TAO_LogRecordStore () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp index c6799199f43..2aec6a518ba 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp @@ -24,7 +24,7 @@ TAO_Log_Constraint_Interpreter::TAO_Log_Constraint_Interpreter ( } } -TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter (void) +TAO_Log_Constraint_Interpreter::~TAO_Log_Constraint_Interpreter () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index d3c65eac212..ce5d326a07d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -40,7 +40,7 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb, } void -TAO_Log_i::init (void) +TAO_Log_i::init () { this->log_ = logmgr_i_.create_log_reference (this->logid_); @@ -89,24 +89,24 @@ TAO_Log_i::init (void) this->op_state_ = DsLogAdmin::enabled; } -TAO_Log_i::~TAO_Log_i (void) +TAO_Log_i::~TAO_Log_i () { } DsLogAdmin::LogMgr_ptr -TAO_Log_i::my_factory (void) +TAO_Log_i::my_factory () { return DsLogAdmin::LogMgr::_duplicate (this->factory_.in ()); } DsLogAdmin::LogId -TAO_Log_i::id (void) +TAO_Log_i::id () { return logid_; } DsLogAdmin::QoSList* -TAO_Log_i::get_log_qos (void) +TAO_Log_i::get_log_qos () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -172,7 +172,7 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos) } CORBA::ULong -TAO_Log_i::get_max_record_life (void) +TAO_Log_i::get_max_record_life () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -222,7 +222,7 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life) } CORBA::ULongLong -TAO_Log_i::get_max_size (void) +TAO_Log_i::get_max_size () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -293,7 +293,7 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size) } CORBA::ULongLong -TAO_Log_i::get_current_size (void) +TAO_Log_i::get_current_size () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -304,7 +304,7 @@ TAO_Log_i::get_current_size (void) } CORBA::ULongLong -TAO_Log_i::get_n_records (void) +TAO_Log_i::get_n_records () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -315,7 +315,7 @@ TAO_Log_i::get_n_records (void) } DsLogAdmin::LogFullActionType -TAO_Log_i::get_log_full_action (void) +TAO_Log_i::get_log_full_action () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -379,7 +379,7 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action) } DsLogAdmin::AdministrativeState -TAO_Log_i::get_administrative_state (void) +TAO_Log_i::get_administrative_state () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -422,7 +422,7 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state) } DsLogAdmin::ForwardingState -TAO_Log_i::get_forwarding_state (void) +TAO_Log_i::get_forwarding_state () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -466,7 +466,7 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state) } DsLogAdmin::OperationalState -TAO_Log_i::get_operational_state (void) +TAO_Log_i::get_operational_state () { // No locks are necessary, since op_state_ is set in ::init() and // never changed. @@ -474,7 +474,7 @@ TAO_Log_i::get_operational_state (void) } DsLogAdmin::TimeInterval -TAO_Log_i::get_interval (void) +TAO_Log_i::get_interval () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -536,7 +536,7 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval) } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status (void) +TAO_Log_i::get_availability_status () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -547,7 +547,7 @@ TAO_Log_i::get_availability_status (void) } DsLogAdmin::AvailabilityStatus -TAO_Log_i::get_availability_status_i (void) +TAO_Log_i::get_availability_status_i () { // The log is considered "on duty" if all the following are true: // * operational state is enabled @@ -575,7 +575,7 @@ TAO_Log_i::get_availability_status_i (void) } DsLogAdmin::CapacityAlarmThresholdList* -TAO_Log_i::get_capacity_alarm_thresholds (void) +TAO_Log_i::get_capacity_alarm_thresholds () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -645,7 +645,7 @@ TAO_Log_i::set_capacity_alarm_thresholds (const } DsLogAdmin::WeekMask* -TAO_Log_i::get_week_mask (void) +TAO_Log_i::get_week_mask () { ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -942,14 +942,14 @@ TAO_Log_i::get_record_attribute (DsLogAdmin::RecordId id) } void -TAO_Log_i::flush (void) +TAO_Log_i::flush () { /// XXX locks? this->recordstore_->flush (); } CORBA::Boolean -TAO_Log_i::scheduled (void) +TAO_Log_i::scheduled () { DsLogAdmin::TimeInterval interval = this->recordstore_->get_interval (); @@ -1043,7 +1043,7 @@ TAO_Log_i::copy_attributes (DsLogAdmin::Log_ptr log) } void -TAO_Log_i::remove_old_records (void) +TAO_Log_i::remove_old_records () { ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, guard, @@ -1074,7 +1074,7 @@ TAO_Log_i::remove_old_records (void) } void -TAO_Log_i::check_capacity_alarm_threshold (void) +TAO_Log_i::check_capacity_alarm_threshold () { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); @@ -1135,7 +1135,7 @@ TAO_Log_i::check_capacity_alarm_threshold (void) } void -TAO_Log_i::reset_capacity_alarm_threshold (void) +TAO_Log_i::reset_capacity_alarm_threshold () { const CORBA::ULongLong max_size = this->recordstore_->get_max_size (); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index b9d834eafad..9d46942ca69 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -9,7 +9,7 @@ TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log) { } -TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void) +TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer () { } @@ -38,7 +38,7 @@ TAO_Notify_LogConsumer::connect ( } void -TAO_Notify_LogConsumer::disconnect (void) +TAO_Notify_LogConsumer::disconnect () { this->proxy_supplier_-> disconnect_push_supplier(); @@ -111,7 +111,7 @@ TAO_Notify_LogConsumer::push void TAO_Notify_LogConsumer::disconnect_push_consumer - (void) + () { } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp index ab114d23ada..2b444c1a68b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void) +TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i () { } @@ -172,25 +172,25 @@ TAO_NotifyLogFactory_i::create_log_servant (DsLogAdmin::LogId id) } CosNotifyChannelAdmin::AdminID -TAO_NotifyLogFactory_i::MyID (void) +TAO_NotifyLogFactory_i::MyID () { return consumer_admin_->MyID (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_NotifyLogFactory_i::MyChannel (void) +TAO_NotifyLogFactory_i::MyChannel () { throw CORBA::NO_IMPLEMENT(); } CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_NotifyLogFactory_i::MyOperator (void) +TAO_NotifyLogFactory_i::MyOperator () { return consumer_admin_->MyOperator (); } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::priority_filter (void) +TAO_NotifyLogFactory_i::priority_filter () { return consumer_admin_->priority_filter (); } @@ -202,7 +202,7 @@ TAO_NotifyLogFactory_i::priority_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyFilter::MappingFilter_ptr -TAO_NotifyLogFactory_i::lifetime_filter (void) +TAO_NotifyLogFactory_i::lifetime_filter () { return consumer_admin_->lifetime_filter (); } @@ -214,13 +214,13 @@ TAO_NotifyLogFactory_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr filt } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::pull_suppliers (void) +TAO_NotifyLogFactory_i::pull_suppliers () { return consumer_admin_->pull_suppliers (); } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_NotifyLogFactory_i::push_suppliers (void) +TAO_NotifyLogFactory_i::push_suppliers () { return consumer_admin_->push_suppliers (); } @@ -266,7 +266,7 @@ TAO_NotifyLogFactory_i::obtain_pull_supplier ( } void -TAO_NotifyLogFactory_i::destroy (void) +TAO_NotifyLogFactory_i::destroy () { // No-Op. } @@ -280,7 +280,7 @@ TAO_NotifyLogFactory_i::subscription_change (const CosNotification::EventTypeSeq } CosNotification::QoSProperties* -TAO_NotifyLogFactory_i::get_qos (void) +TAO_NotifyLogFactory_i::get_qos () { return consumer_admin_->get_qos (); } @@ -317,13 +317,13 @@ TAO_NotifyLogFactory_i::get_filter (CosNotifyFilter::FilterID id) } CosNotifyFilter::FilterIDSeq* -TAO_NotifyLogFactory_i::get_all_filters (void) +TAO_NotifyLogFactory_i::get_all_filters () { return consumer_admin_->get_all_filters (); } void -TAO_NotifyLogFactory_i::remove_all_filters (void) +TAO_NotifyLogFactory_i::remove_all_filters () { consumer_admin_->remove_all_filters (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp index 3ebc0c046a5..725c4952af7 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp @@ -35,7 +35,7 @@ TAO_NotifyLogNotification::TAO_NotifyLogNotification ( proxy_consumer_->connect_any_push_supplier (objref.in ()); } -TAO_NotifyLogNotification::~TAO_NotifyLogNotification (void) +TAO_NotifyLogNotification::~TAO_NotifyLogNotification () { // No-Op. } @@ -55,7 +55,7 @@ TAO_NotifyLogNotification::subscription_change } void -TAO_NotifyLogNotification::disconnect_push_supplier (void) +TAO_NotifyLogNotification::disconnect_push_supplier () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index db2aaaf9226..3cf48ab0234 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -75,7 +75,7 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id) void -TAO_NotifyLog_i::destroy (void) +TAO_NotifyLog_i::destroy () { notifier_->object_deletion (logid_); @@ -90,7 +90,7 @@ TAO_NotifyLog_i::destroy (void) } void -TAO_NotifyLog_i::activate (void) +TAO_NotifyLog_i::activate () { CosNotifyChannelAdmin::AdminID adminid = 0; @@ -122,7 +122,7 @@ TAO_NotifyLog_i::activate (void) //IDL to C++ CosNotifyFilter::Filter_ptr -TAO_NotifyLog_i::get_filter (void) +TAO_NotifyLog_i::get_filter () { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); @@ -137,26 +137,26 @@ TAO_NotifyLog_i::set_filter (CosNotifyFilter::Filter_ptr /* filter */) } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_NotifyLog_i::MyFactory (void) +TAO_NotifyLog_i::MyFactory () { //TODO: need to add impl throw CORBA::NO_IMPLEMENT (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::default_consumer_admin (void) +TAO_NotifyLog_i::default_consumer_admin () { return this->event_channel_->default_consumer_admin (); } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_NotifyLog_i::default_supplier_admin (void) +TAO_NotifyLog_i::default_supplier_admin () { return this->event_channel_->default_supplier_admin (); } CosNotifyFilter::FilterFactory_ptr -TAO_NotifyLog_i::default_filter_factory (void) +TAO_NotifyLog_i::default_filter_factory () { return this->event_channel_->default_filter_factory (); } @@ -188,19 +188,19 @@ TAO_NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_consumeradmins (void) +TAO_NotifyLog_i::get_all_consumeradmins () { return this->event_channel_->get_all_consumeradmins (); } CosNotifyChannelAdmin::AdminIDSeq* -TAO_NotifyLog_i::get_all_supplieradmins (void) +TAO_NotifyLog_i::get_all_supplieradmins () { return this->event_channel_->get_all_supplieradmins (); } CosNotification::AdminProperties* -TAO_NotifyLog_i::get_admin (void) +TAO_NotifyLog_i::get_admin () { return this->event_channel_->get_admin (); } @@ -212,7 +212,7 @@ TAO_NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin) } CosNotification::QoSProperties* -TAO_NotifyLog_i::get_qos (void) +TAO_NotifyLog_i::get_qos () { //need to add merging of QoS from Log_i and EventChannel_i throw CORBA::NO_IMPLEMENT (); @@ -236,7 +236,7 @@ TAO_NotifyLog_i::validate_qos ( } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_NotifyLog_i::for_consumers (void) +TAO_NotifyLog_i::for_consumers () { return this->event_channel_->for_consumers(); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp index 1e26e39f1fa..a20179e0a89 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp @@ -20,7 +20,7 @@ TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (TAO_RTEventLog_i *log) { } -TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void) +TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer () { } @@ -52,7 +52,7 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events) } void -TAO_Rtec_LogConsumer::disconnect_push_consumer (void) +TAO_Rtec_LogConsumer::disconnect_push_consumer () { this->supplier_proxy_->disconnect_push_supplier (); } diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index ffe4ebc38af..3b689030332 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i (void) : +TAO_RTEventLogFactory_i::TAO_RTEventLogFactory_i () : impl (0), notifier_ (0) { @@ -46,7 +46,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, TAO_EC_Event_Channel (attr), CORBA::NO_MEMORY ()); - auto_ptr <TAO_EC_Event_Channel> ec (impl); + std::unique_ptr <TAO_EC_Event_Channel> ec (impl); impl->activate (); @@ -69,7 +69,7 @@ TAO_RTEventLogFactory_i::init (CORBA::ORB_ptr orb, } RTEventLogAdmin::EventLogFactory_ptr -TAO_RTEventLogFactory_i::activate (void) +TAO_RTEventLogFactory_i::activate () { RTEventLogAdmin::EventLogFactory_var v_return; diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp index 27929151778..bbcc5c060af 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp @@ -29,19 +29,19 @@ TAO_RTEventLogNotification::TAO_RTEventLogNotification ( obtainProxyConsumer (); } -TAO_RTEventLogNotification::~TAO_RTEventLogNotification (void) +TAO_RTEventLogNotification::~TAO_RTEventLogNotification () { // No-Op. } void -TAO_RTEventLogNotification::disconnect_push_supplier (void) +TAO_RTEventLogNotification::disconnect_push_supplier () { // No-Op. } void -TAO_RTEventLogNotification::obtainProxyConsumer (void) +TAO_RTEventLogNotification::obtainProxyConsumer () { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel_->for_suppliers(); diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp index 08f783e807c..c63d99d4e41 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp @@ -74,7 +74,7 @@ TAO_RTEventLog_i::copy_with_id (DsLogAdmin::LogId id) } void -TAO_RTEventLog_i::destroy (void) +TAO_RTEventLog_i::destroy () { notifier_->object_deletion (logid_); @@ -88,7 +88,7 @@ TAO_RTEventLog_i::destroy (void) } void -TAO_RTEventLog_i::activate (void) +TAO_RTEventLog_i::activate () { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -98,13 +98,13 @@ TAO_RTEventLog_i::activate (void) } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_RTEventLog_i::for_consumers (void) +TAO_RTEventLog_i::for_consumers () { return this->event_channel_->for_consumers(); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_RTEventLog_i::for_suppliers (void) +TAO_RTEventLog_i::for_suppliers () { return this->event_channel_->for_suppliers(); } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp index dfabfd4984b..32020a57daa 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_IntId::TAO_IntId (void) +TAO_IntId::TAO_IntId () : type_ (CosNaming::nobject) { ref_ = CORBA::Object::_nil (); @@ -29,7 +29,7 @@ TAO_IntId::TAO_IntId (const TAO_IntId &rhs) ref_ = CORBA::Object::_duplicate (rhs.ref_); } -TAO_IntId::~TAO_IntId (void) +TAO_IntId::~TAO_IntId () { CORBA::release (ref_); } @@ -47,7 +47,7 @@ TAO_IntId::operator= (const TAO_IntId &rhs) ref_ = CORBA::Object::_duplicate (rhs.ref_); } -TAO_ExtId::TAO_ExtId (void) +TAO_ExtId::TAO_ExtId () : kind_ (), id_ () { @@ -66,18 +66,18 @@ TAO_ExtId::TAO_ExtId (const TAO_ExtId &rhs) kind_ = rhs.kind_; } -TAO_ExtId::~TAO_ExtId (void) +TAO_ExtId::~TAO_ExtId () { } const char * -TAO_ExtId::id (void) +TAO_ExtId::id () { return id_.fast_rep (); } const char * -TAO_ExtId::kind (void) +TAO_ExtId::kind () { return kind_.fast_rep (); } @@ -106,7 +106,7 @@ TAO_ExtId::operator!= (const TAO_ExtId &rhs) const } u_long -TAO_ExtId::hash (void) const +TAO_ExtId::hash () const { ACE_CString temp (id_); temp += kind_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp index 4178727920b..4a3c0bafc58 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp @@ -60,7 +60,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void) +TAO_FT_Naming_Manager::TAO_FT_Naming_Manager () : factory_registry_ ("NamingManager::FactoryRegistry"), group_factory_ (), use_global_ (false), @@ -79,7 +79,7 @@ TAO_FT_Naming_Manager::TAO_FT_Naming_Manager (void) ::FT_Naming::TAO_FT_OBJECT_GROUP_NAME; } -TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager (void) +TAO_FT_Naming_Manager::~TAO_FT_Naming_Manager () { this->object_group_property_name_.length (0); this->built_in_balancing_strategy_name_.length (0); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp index ae540b2cd65..ae18aa384f8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp @@ -87,12 +87,12 @@ TAO_FT_Naming_Replication_Manager::TAO_FT_Naming_Replication_Manager (TAO_FT_Nam { } -TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager(void) +TAO_FT_Naming_Replication_Manager::~TAO_FT_Naming_Replication_Manager() { } void -TAO_FT_Naming_Replication_Manager::init_orb (void) +TAO_FT_Naming_Replication_Manager::init_orb () { int argc = 8; ACE_TCHAR *argv[11]; @@ -132,19 +132,19 @@ TAO_FT_Naming_Replication_Manager::init_orb (void) } char * -TAO_FT_Naming_Replication_Manager::ior (void) +TAO_FT_Naming_Replication_Manager::ior () { return this->orb_->object_to_string (this->me_.in ()); } bool -TAO_FT_Naming_Replication_Manager::peer_available (void) +TAO_FT_Naming_Replication_Manager::peer_available () { return !CORBA::is_nil (this->peer_.in ()); } void -TAO_FT_Naming_Replication_Manager::stop (void) +TAO_FT_Naming_Replication_Manager::stop () { if (this->reactor_ == 0) { @@ -155,7 +155,7 @@ TAO_FT_Naming_Replication_Manager::stop (void) } int -TAO_FT_Naming_Replication_Manager::svc (void) +TAO_FT_Naming_Replication_Manager::svc () { if (this->reactor_ == 0) { @@ -371,7 +371,7 @@ TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs) } bool -TAO_FT_Naming_Replication_Manager::peer_init_i (void) +TAO_FT_Naming_Replication_Manager::peer_init_i () { CORBA::Object_var obj = this->orb_->string_to_object (replica_ior_.c_str()); bool non_exist = true; @@ -421,7 +421,7 @@ TAO_FT_Naming_Replication_Manager::peer_init_i (void) } bool -TAO_FT_Naming_Replication_Manager::update_peer_registration (void) +TAO_FT_Naming_Replication_Manager::update_peer_registration () { FT_Naming::ReplicaInfo info; info.combined = this->send_combos_; @@ -450,7 +450,7 @@ TAO_FT_Naming_Replication_Manager::update_peer_registration (void) bool -TAO_FT_Naming_Replication_Manager::init_peer (void) +TAO_FT_Naming_Replication_Manager::init_peer () { ACE_TString replica_ior_file = this->server_.replica_ior_filename (true); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp index 7d05f927ad1..28445381a2f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp @@ -74,7 +74,7 @@ TAO_FTNS_Notifier::handle_exception (ACE_HANDLE ) } /// Default Constructor. -TAO_FT_Naming_Server::TAO_FT_Naming_Server (void) +TAO_FT_Naming_Server::TAO_FT_Naming_Server () : TAO_Naming_Server (IOR_ARRAY_SIZE), naming_manager_ (), replicator_ (0), @@ -94,7 +94,7 @@ TAO_FT_Naming_Server::TAO_FT_Naming_Server (void) } void -TAO_FT_Naming_Server::update_info_i (void) +TAO_FT_Naming_Server::update_info_i () { while (true) { @@ -140,7 +140,7 @@ TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos) } void -TAO_FT_Naming_Server::update_iors_i (void) +TAO_FT_Naming_Server::update_iors_i () { while (true) { @@ -344,7 +344,7 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O } int -TAO_FT_Naming_Server::init_replicator (void) +TAO_FT_Naming_Server::init_replicator () { if (this->server_role_ == STANDALONE ) return 0; @@ -393,7 +393,7 @@ TAO_FT_Naming_Server::replica_ior_filename (bool peer_ior_file) const } void -TAO_FT_Naming_Server::init_replication_pairing (void) +TAO_FT_Naming_Server::init_replication_pairing () { if (this->server_role_ == STANDALONE) { @@ -620,7 +620,7 @@ TAO_FT_Naming_Server::parse_args (int argc, } int -TAO_FT_Naming_Server::fini (void) +TAO_FT_Naming_Server::fini () { if (this->replicator_ != 0) { @@ -697,7 +697,7 @@ TAO_FT_Naming_Server::storable_naming_context_factory (size_t context_size) } TAO_Persistent_Naming_Context_Factory * -TAO_FT_Naming_Server::persistent_naming_context_factory (void) +TAO_FT_Naming_Server::persistent_naming_context_factory () { #if defined (ACE_HAS_NEW_NOTHROW) return new (ACE_nothrow) TAO_FT_Persistent_Naming_Context_Factory; @@ -708,14 +708,14 @@ TAO_FT_Naming_Server::persistent_naming_context_factory (void) /// Return the IOR for the registered replication manager char* -TAO_FT_Naming_Server::replicator_ior (void) +TAO_FT_Naming_Server::replicator_ior () { return CORBA::string_dup (this->iors_[REPLICATOR].ior_.c_str()); } /// Return the IOR for the registered object group manager char* -TAO_FT_Naming_Server::naming_manager_ior (void) +TAO_FT_Naming_Server::naming_manager_ior () { return CORBA::string_dup (this->iors_[GROUP].ior_.c_str()); } @@ -812,14 +812,14 @@ TAO_FT_Naming_Server::update_naming_context ( } /// Destructor. -TAO_FT_Naming_Server::~TAO_FT_Naming_Server (void) +TAO_FT_Naming_Server::~TAO_FT_Naming_Server () { // Clear out the static naming manager from the persistent naming context TAO_FT_Persistent_Naming_Context::set_naming_manager_impl (0); } CosNaming::NamingContext_ptr -TAO_FT_Naming_Server::my_root_context (void) const +TAO_FT_Naming_Server::my_root_context () const { if (CORBA::is_nil (this->iors_[ROOT].ref_.in())) { @@ -834,7 +834,7 @@ TAO_FT_Naming_Server::my_root_context (void) const } FT_Naming::NamingManager_ptr -TAO_FT_Naming_Server::my_naming_manager (void) const +TAO_FT_Naming_Server::my_naming_manager () const { if (CORBA::is_nil (this->iors_[GROUP].ref_)) { @@ -850,7 +850,7 @@ TAO_FT_Naming_Server::my_naming_manager (void) const } CosNaming::NamingContext_ptr -TAO_FT_Naming_Server::ft_root_context (void) const +TAO_FT_Naming_Server::ft_root_context () const { if (CORBA::is_nil (this->iors_[FT_ROOT].ref_)) { @@ -865,7 +865,7 @@ TAO_FT_Naming_Server::ft_root_context (void) const } FT_Naming::NamingManager_ptr -TAO_FT_Naming_Server::ft_naming_manager (void) const +TAO_FT_Naming_Server::ft_naming_manager () const { if (CORBA::is_nil (this->iors_[FT_GROUP].ref_)) { @@ -881,13 +881,13 @@ TAO_FT_Naming_Server::ft_naming_manager (void) const } const ACE_CString & -TAO_FT_Naming_Server::ft_endpoint (void) +TAO_FT_Naming_Server::ft_endpoint () { return this->ft_endpoint_; } const ACE_Time_Value & -TAO_FT_Naming_Server::ft_update_delay (void) +TAO_FT_Naming_Server::ft_update_delay () { return this->ft_update_delay_; } @@ -955,7 +955,7 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt } int -TAO_FT_Naming_Server::recover_iors (void) +TAO_FT_Naming_Server::recover_iors () { if (this->registered_) { diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp index 6f05c3decc5..97a7f9cf109 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp @@ -52,7 +52,7 @@ TAO::FT_PG_Object_Group_Storable::FT_PG_Object_Group_Storable { } -TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable (void) +TAO::FT_PG_Object_Group_Storable::~FT_PG_Object_Group_Storable () { } @@ -79,7 +79,7 @@ TAO::FT_PG_Object_Group_Storable::propagate_update_notification } void -TAO::FT_PG_Object_Group_Storable::state_written (void) +TAO::FT_PG_Object_Group_Storable::state_written () { FT_Naming::ChangeType change_type; if (!this->file_created_) diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp index 6e1601e8070..5ef67c277eb 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp @@ -31,7 +31,7 @@ TAO_FT_Persistent_Naming_Context::TAO_FT_Persistent_Naming_Context ( } -TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context (void) +TAO_FT_Persistent_Naming_Context::~TAO_FT_Persistent_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp index e2c7b9f0a93..5d0fda3837f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. -TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory (void) +TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Factory () : TAO_Persistent_Naming_Context_Factory () { @@ -12,7 +12,7 @@ TAO_FT_Persistent_Naming_Context_Factory::TAO_FT_Persistent_Naming_Context_Facto /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory (void) +TAO_FT_Persistent_Naming_Context_Factory::~TAO_FT_Persistent_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp index 4ebab318def..7c2cf1a2134 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp @@ -9,11 +9,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Random::TAO_FT_Random (void) +TAO_FT_Random::TAO_FT_Random () { } -TAO_FT_Random::~TAO_FT_Random (void) +TAO_FT_Random::~TAO_FT_Random () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp index ecfae28389a..d4246736ab0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp @@ -9,13 +9,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_FT_Round_Robin::TAO_FT_Round_Robin (void) +TAO_FT_Round_Robin::TAO_FT_Round_Robin () : lock_ (), location_index_map_ (TAO_PG_MAX_OBJECT_GROUPS) { } -TAO_FT_Round_Robin::~TAO_FT_Round_Robin (void) +TAO_FT_Round_Robin::~TAO_FT_Round_Robin () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp index 823990864b3..aaba0319349 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp @@ -35,7 +35,7 @@ TAO_FT_Storable_Naming_Context::TAO_FT_Storable_Naming_Context (CORBA::ORB_ptr o } -TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context (void) +TAO_FT_Storable_Naming_Context::~TAO_FT_Storable_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. } @@ -124,14 +124,14 @@ TAO_FT_Storable_Naming_Context::stale (bool is_stale) bool -TAO_FT_Storable_Naming_Context::stale (void) +TAO_FT_Storable_Naming_Context::stale () { return stale_; } void -TAO_FT_Storable_Naming_Context::context_written (void) +TAO_FT_Storable_Naming_Context::context_written () { FT_Naming::ChangeType change_type; diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp index 65a0e759562..648ec3a7654 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp @@ -24,7 +24,7 @@ TAO_FT_Storable_Naming_Context_Factory (size_t hash_table_size, /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory (void) +TAO_FT_Storable_Naming_Context_Factory::~TAO_FT_Storable_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp index 450be60c4c5..4af5d580395 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp @@ -389,7 +389,7 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path) * Displays all object groups that currently exist in the naming service. */ int -NS_group_svc::group_list (void) +NS_group_svc::group_list () { // KCS: The group list is independent of locations. I created a new operation in the diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 3a7f45ccf79..16ebeaa7b85 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Bindings_Map::~TAO_Bindings_Map (void) +TAO_Bindings_Map::~TAO_Bindings_Map () { } @@ -33,19 +33,19 @@ TAO_Hash_Naming_Context::interface (TAO_Naming_Context *i) this->interface_ = i; } -TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void) +TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context () { delete context_; } TAO_SYNCH_RW_MUTEX& -TAO_Hash_Naming_Context::lock (void) +TAO_Hash_Naming_Context::lock () { return this->lock_; } PortableServer::POA_ptr -TAO_Hash_Naming_Context::_default_POA (void) +TAO_Hash_Naming_Context::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -546,7 +546,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n) } void -TAO_Hash_Naming_Context::destroy (void) +TAO_Hash_Naming_Context::destroy () { // Check to make sure this object didn't have <destroy> method // invoked on it. @@ -579,20 +579,20 @@ TAO_Hash_Naming_Context::destroy (void) } int -TAO_Hash_Naming_Context::root (void) +TAO_Hash_Naming_Context::root () { return (ACE_OS::strcmp (this->poa_id_.fast_rep (), TAO_ROOT_NAMING_CONTEXT) == 0); } int -TAO_Hash_Naming_Context::destroyed (void) +TAO_Hash_Naming_Context::destroyed () { return this->destroyed_; } TAO_Naming_Context * -TAO_Hash_Naming_Context::interface (void) +TAO_Hash_Naming_Context::interface () { return this->interface_; } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp index 92255b51454..c16509e5e0b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CosNaming::NamingContext_ptr -TAO_Naming_Client::operator -> (void) const +TAO_Naming_Client::operator -> () const { return this->naming_context_.ptr (); } CosNaming::NamingContext_ptr -TAO_Naming_Client::get_context (void) const +TAO_Naming_Client::get_context () const { // Must duplicate this pointer so it can be stored in a _var. return CosNaming::NamingContext::_duplicate (this->naming_context_.in ()); @@ -41,12 +41,12 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb, ACE_Time_Value *timeout) return 0; } -TAO_Naming_Client::TAO_Naming_Client (void) +TAO_Naming_Client::TAO_Naming_Client () { // Do nothing } -TAO_Naming_Client::~TAO_Naming_Client (void) +TAO_Naming_Client::~TAO_Naming_Client () { // Do nothing } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp index 4bb6e7c4a8d..11858f0ece8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp @@ -18,7 +18,7 @@ TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl) { } -TAO_Naming_Context::~TAO_Naming_Context (void) +TAO_Naming_Context::~TAO_Naming_Context () { delete impl_; } @@ -68,7 +68,7 @@ TAO_Naming_Context::unbind (const CosNaming::Name &n) } CosNaming::NamingContext_ptr -TAO_Naming_Context::new_context (void) +TAO_Naming_Context::new_context () { return impl_->new_context (); } @@ -80,7 +80,7 @@ TAO_Naming_Context::bind_new_context (const CosNaming::Name &n) } void -TAO_Naming_Context::destroy (void) +TAO_Naming_Context::destroy () { impl_->destroy (); } @@ -463,7 +463,7 @@ TAO_Naming_Context::stale (bool value) this->impl_->stale (value); } -TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void) +TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl () { } @@ -475,7 +475,7 @@ TAO_Naming_Context_Impl::stale (bool value) } bool -TAO_Naming_Context_Impl::stale (void) +TAO_Naming_Context_Impl::stale () { // Default implementation is to reply false return false; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp index b1b7a9da824..31cf92cecab 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp @@ -31,7 +31,7 @@ TAO_Naming_Loader::TAO_Naming_Loader (TAO_Naming_Server *server) ACE_NEW (naming_server_, TAO_Naming_Server); } -TAO_Naming_Loader::~TAO_Naming_Loader (void) +TAO_Naming_Loader::~TAO_Naming_Loader () { // Destroy the naming server that was created delete naming_server_; @@ -65,7 +65,7 @@ TAO_Naming_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Naming_Loader::fini (void) +TAO_Naming_Loader::fini () { // Remove the Naming Service. if (this->naming_server_ == 0) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index a0931cb7edc..448c6100d03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -483,11 +483,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, TAO::Storable_Factory* pf = 0; ACE_CString directory (ACE_TEXT_ALWAYS_CHAR (persistence_location)); ACE_NEW_RETURN (pf, TAO::Storable_FlatFileFactory (directory), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Storable_Factory> persFactory(pf); -#else - auto_ptr<TAO::Storable_Factory> persFactory(pf); -#endif /* ACE_HAS_CPP11 */ // Use an auto_ptr to ensure that we clean up the factory in the case // of a failure in creating and registering the Activator. @@ -495,11 +491,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, this->storable_naming_context_factory (context_size); // Make sure we got a factory if (cf == 0) return -1; -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf); -#else - auto_ptr<TAO_Storable_Naming_Context_Factory> contextFactory (cf); -#endif /* ACE_HAS_CPP11 */ // This instance will either get deleted after recreate all or, // in the case of a servant activator's use, on destruction of the @@ -770,7 +762,7 @@ TAO_Naming_Server::storable_naming_context_factory (size_t context_size) } TAO_Persistent_Naming_Context_Factory * -TAO_Naming_Server::persistent_naming_context_factory (void) +TAO_Naming_Server::persistent_naming_context_factory () { #if defined (ACE_HAS_NEW_NOTHROW) return new (ACE_nothrow) TAO_Persistent_Naming_Context_Factory; @@ -780,7 +772,7 @@ TAO_Naming_Server::persistent_naming_context_factory (void) } int -TAO_Naming_Server::fini (void) +TAO_Naming_Server::fini () { // First get rid of the multi cast handler if (this->ior_multicast_) @@ -852,13 +844,13 @@ TAO_Naming_Server::fini (void) } char* -TAO_Naming_Server::naming_service_ior (void) +TAO_Naming_Server::naming_service_ior () { return CORBA::string_dup (this->iors_[ROOT].ior_.c_str()); } CosNaming::NamingContext_ptr -TAO_Naming_Server::operator-> (void) const +TAO_Naming_Server::operator-> () const { if (CORBA::is_nil (this->iors_[ROOT].ref_)) { @@ -872,7 +864,7 @@ TAO_Naming_Server::operator-> (void) const } -TAO_Naming_Server::~TAO_Naming_Server (void) +TAO_Naming_Server::~TAO_Naming_Server () { delete [] this->iors_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index ad4a4f071ab..896f31bc96f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -92,7 +92,7 @@ TAO_Persistent_Context_Index::TAO_Persistent_Context_Index { } -TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void) +TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index () { delete allocator_; delete context_impl_factory_; @@ -100,19 +100,19 @@ TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void) } ACE_Allocator* -TAO_Persistent_Context_Index::allocator (void) +TAO_Persistent_Context_Index::allocator () { return allocator_; } CosNaming::NamingContext_ptr -TAO_Persistent_Context_Index::root_context (void) +TAO_Persistent_Context_Index::root_context () { return CosNaming::NamingContext::_duplicate (root_context_.in ()); } CORBA::ORB_ptr -TAO_Persistent_Context_Index::orb (void) +TAO_Persistent_Context_Index::orb () { return orb_.in (); } @@ -160,7 +160,7 @@ TAO_Persistent_Context_Index::init (size_t context_size) } int -TAO_Persistent_Context_Index::recreate_all (void) +TAO_Persistent_Context_Index::recreate_all () { CONTEXT_INDEX::ITERATOR *index_iter = 0; @@ -239,7 +239,7 @@ TAO_Persistent_Context_Index::create_naming_context_impl ( } int -TAO_Persistent_Context_Index::create_index (void) +TAO_Persistent_Context_Index::create_index () { // Make sure that the file name is of the legal length. if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN) diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp index ae98a0f2d29..1946a0e3035 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Persistent_IntId::TAO_Persistent_IntId (void) +TAO_Persistent_IntId::TAO_Persistent_IntId () : ref_ (0), type_ (CosNaming::nobject) { @@ -30,7 +30,7 @@ TAO_Persistent_IntId::TAO_Persistent_IntId (const TAO_Persistent_IntId &rhs) type_ = rhs.type_; } -TAO_Persistent_IntId::~TAO_Persistent_IntId (void) +TAO_Persistent_IntId::~TAO_Persistent_IntId () { } @@ -45,7 +45,7 @@ TAO_Persistent_IntId::operator= (const TAO_Persistent_IntId &rhs) ref_ = rhs.ref_; } -TAO_Persistent_ExtId::TAO_Persistent_ExtId (void) +TAO_Persistent_ExtId::TAO_Persistent_ExtId () : id_ (0), kind_ (0) { @@ -65,7 +65,7 @@ TAO_Persistent_ExtId::TAO_Persistent_ExtId (const TAO_Persistent_ExtId &rhs) kind_ = rhs.kind_; } -TAO_Persistent_ExtId::~TAO_Persistent_ExtId (void) +TAO_Persistent_ExtId::~TAO_Persistent_ExtId () { } @@ -95,7 +95,7 @@ TAO_Persistent_ExtId::operator!= (const TAO_Persistent_ExtId &rhs) const } u_long -TAO_Persistent_ExtId::hash (void) const +TAO_Persistent_ExtId::hash () const { ACE_CString temp (id_); temp += kind_; @@ -104,18 +104,18 @@ TAO_Persistent_ExtId::hash (void) const } const char * -TAO_Persistent_ExtId::id (void) +TAO_Persistent_ExtId::id () { return id_; } const char * -TAO_Persistent_ExtId::kind (void) +TAO_Persistent_ExtId::kind () { return kind_; } -TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void) +TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId () : counter_ (0), hash_map_ (0) { @@ -135,7 +135,7 @@ TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (const TAO_Persistent_Ind hash_map_ = rhs.hash_map_; } -TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId (void) +TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId () { } @@ -150,7 +150,7 @@ TAO_Persistent_Index_IntId::operator= (const TAO_Persistent_Index_IntId &rhs) hash_map_ = rhs.hash_map_; } -TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (void) +TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId () : poa_id_ (0) { } @@ -165,7 +165,7 @@ TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (const TAO_Persistent_Ind poa_id_ = rhs.poa_id_; } -TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId (void) +TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId () { } @@ -192,7 +192,7 @@ TAO_Persistent_Index_ExtId::operator!= (const TAO_Persistent_Index_ExtId &rhs) c } u_long -TAO_Persistent_Index_ExtId::hash (void) const +TAO_Persistent_Index_ExtId::hash () const { ACE_CString temp (poa_id_); return temp.hash (); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 8fdbbec5cd4..3dc96efb69f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -70,31 +70,31 @@ TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb) { } -TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void) +TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map () { } void -TAO_Persistent_Bindings_Map::destroy (void) +TAO_Persistent_Bindings_Map::destroy () { this->map_->ACE_Hash_Map_With_Allocator<TAO_Persistent_ExtId, TAO_Persistent_IntId>::~ACE_Hash_Map_With_Allocator (); this->allocator_->free (map_); } TAO_Persistent_Bindings_Map::HASH_MAP * -TAO_Persistent_Bindings_Map::map (void) +TAO_Persistent_Bindings_Map::map () { return this->map_; } size_t -TAO_Persistent_Bindings_Map::total_size (void) +TAO_Persistent_Bindings_Map::total_size () { return this->map_->total_size (); } size_t -TAO_Persistent_Bindings_Map::current_size (void) +TAO_Persistent_Bindings_Map::current_size () { return map_->current_size (); } @@ -260,7 +260,7 @@ TAO_Persistent_Naming_Context::init (size_t hash_table_size) return persistent_context_->open (hash_table_size, index_->allocator ()); } -TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void) +TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context () { // Perform appropriate cleanup based on the destruction level specified. @@ -349,7 +349,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Persistent_Naming_Context::new_context (void) +TAO_Persistent_Naming_Context::new_context () { // Check to make sure this object didn't have <destroy> method // invoked on it. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp index 994acadbd16..8d98362f74f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp @@ -4,14 +4,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Constructor. -TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory (void) +TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory () { } /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory (void) +TAO_Persistent_Naming_Context_Factory::~TAO_Persistent_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 10f8347bf49..9b113af9710 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -19,7 +19,7 @@ ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; ACE_Auto_Ptr<TAO::Storable_Base> TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; -TAO_Storable_IntId::TAO_Storable_IntId (void) +TAO_Storable_IntId::TAO_Storable_IntId () : ref_ (CORBA::string_dup ("")), type_ (CosNaming::nobject) { @@ -38,7 +38,7 @@ TAO_Storable_IntId::TAO_Storable_IntId (const TAO_Storable_IntId &rhs) type_ = rhs.type_; } -TAO_Storable_IntId::~TAO_Storable_IntId (void) +TAO_Storable_IntId::~TAO_Storable_IntId () { } @@ -53,7 +53,7 @@ TAO_Storable_IntId::operator= (const TAO_Storable_IntId &rhs) ref_ = rhs.ref_; } -TAO_Storable_ExtId::TAO_Storable_ExtId (void) +TAO_Storable_ExtId::TAO_Storable_ExtId () : id_ (CORBA::string_dup ("")), kind_ (CORBA::string_dup ("")) { @@ -71,7 +71,7 @@ TAO_Storable_ExtId::TAO_Storable_ExtId (const TAO_Storable_ExtId &rhs) kind_ = rhs.kind_; } -TAO_Storable_ExtId::~TAO_Storable_ExtId (void) +TAO_Storable_ExtId::~TAO_Storable_ExtId () { } @@ -101,7 +101,7 @@ TAO_Storable_ExtId::operator!= (const TAO_Storable_ExtId &rhs) const } u_long -TAO_Storable_ExtId::hash (void) const +TAO_Storable_ExtId::hash () const { // @CJC I wager this could be optimized a bit better, but I'm not // sure how much it's called. At the very least, we could allocate @@ -114,13 +114,13 @@ TAO_Storable_ExtId::hash (void) const } const char * -TAO_Storable_ExtId::id (void) +TAO_Storable_ExtId::id () { return id_.in(); } const char * -TAO_Storable_ExtId::kind (void) +TAO_Storable_ExtId::kind () { return kind_.in(); } @@ -184,27 +184,27 @@ TAO_Storable_Bindings_Map::TAO_Storable_Bindings_Map (size_t hash_table_size, ACE_TRACE("TAO_Storable_Bindings_Map"); } -TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map (void) +TAO_Storable_Bindings_Map::~TAO_Storable_Bindings_Map () { ACE_TRACE("~TAO_Storable_Bindings_Map"); } TAO_Storable_Bindings_Map::HASH_MAP & -TAO_Storable_Bindings_Map::map (void) +TAO_Storable_Bindings_Map::map () { ACE_TRACE("map"); return map_; } size_t -TAO_Storable_Bindings_Map::current_size (void) +TAO_Storable_Bindings_Map::current_size () { ACE_TRACE("current_size"); return map_.current_size (); } size_t -TAO_Storable_Bindings_Map::total_size (void) +TAO_Storable_Bindings_Map::total_size () { ACE_TRACE("total_size"); return map_.total_size (); @@ -305,7 +305,7 @@ File_Open_Lock_and_Check::~File_Open_Lock_and_Check () bool TAO_Storable_Naming_Context:: -File_Open_Lock_and_Check::object_obsolete (void) +File_Open_Lock_and_Check::object_obsolete () { // Query the underlying context if it is obsolete with respect @@ -315,7 +315,7 @@ File_Open_Lock_and_Check::object_obsolete (void) void TAO_Storable_Naming_Context:: -File_Open_Lock_and_Check::mark_object_current (void) +File_Open_Lock_and_Check::mark_object_current () { // Reset the stale flag context_->stale (false); @@ -402,7 +402,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( ACE_TRACE("TAO_Storable_Naming_Context"); } -TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) +TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context () { ACE_TRACE("~TAO_Storable_Naming_Context"); @@ -430,7 +430,7 @@ TAO_Storable_Naming_Context::~TAO_Storable_Naming_Context (void) } void -TAO_Storable_Naming_Context::context_written (void) +TAO_Storable_Naming_Context::context_written () { // No-op. Overridden by derived class. } @@ -445,7 +445,7 @@ TAO_Storable_Naming_Context::is_obsolete (time_t stored_time) } void -TAO_Storable_Naming_Context::verify_not_destroyed (void) +TAO_Storable_Naming_Context::verify_not_destroyed () { File_Open_Lock_and_Check flck (this, SFG::ACCESSOR, false); if (this->destroyed_) @@ -539,7 +539,7 @@ TAO_Storable_Naming_Context::make_new_context ( } CosNaming::NamingContext_ptr -TAO_Storable_Naming_Context::new_context (void) +TAO_Storable_Naming_Context::new_context () { ACE_TRACE ("new_context"); @@ -836,7 +836,7 @@ TAO_Storable_Naming_Context::bind (const CosNaming::Name& n, } void -TAO_Storable_Naming_Context::destroy (void) +TAO_Storable_Naming_Context::destroy () { ACE_TRACE("TAO_Storable_Naming_Context::destroy"); ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX, diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp index e86e2dc1ac3..573f1dc6676 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.cpp @@ -14,7 +14,7 @@ TAO_Storable_Naming_Context_Factory::TAO_Storable_Naming_Context_Factory ( /// Destructor. Does not deallocate the hash map: if an instance of /// this class goes out of scope, its hash_map remains in persistent storage. -TAO_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory (void) +TAO_Storable_Naming_Context_Factory::~TAO_Storable_Naming_Context_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 0e56e61a49b..0836bd43139 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -65,24 +65,24 @@ TAO_Transient_Bindings_Map::TAO_Transient_Bindings_Map (size_t hash_table_size) { } -TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map (void) +TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map () { } TAO_Transient_Bindings_Map::HASH_MAP & -TAO_Transient_Bindings_Map::map (void) +TAO_Transient_Bindings_Map::map () { return map_; } size_t -TAO_Transient_Bindings_Map::current_size (void) +TAO_Transient_Bindings_Map::current_size () { return map_.current_size (); } size_t -TAO_Transient_Bindings_Map::total_size (void) +TAO_Transient_Bindings_Map::total_size () { return map_.total_size (); } @@ -130,7 +130,7 @@ TAO_Transient_Naming_Context::TAO_Transient_Naming_Context (PortableServer::POA_ context_ = transient_context_; } -TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void) +TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context () { } @@ -181,7 +181,7 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa, } CosNaming::NamingContext_ptr -TAO_Transient_Naming_Context::new_context (void) +TAO_Transient_Naming_Context::new_context () { // Generate a POA id for the new context. char poa_id[BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 3dc8a3af5fe..0ad5f026dc3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -99,7 +99,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types) } int -TAO_Notify_Admin::shutdown (void) +TAO_Notify_Admin::shutdown () { if (TAO_Notify_Object::shutdown () == 1) return 1; @@ -209,7 +209,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, } void -TAO_Notify_Admin::reconnect (void) +TAO_Notify_Admin::reconnect () { TAO_Notify::Reconnect_Worker<TAO_Notify_Proxy> wrk; this->proxy_container().collection()->for_each(&wrk); diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp index 542749dcc13..9580d6f82e2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void) +TAO_Notify_AdminProperties::TAO_Notify_AdminProperties () : max_global_queue_length_ (CosNotification::MaxQueueLength, 0) , max_consumers_ (CosNotification::MaxConsumers, 0) , max_suppliers_ (CosNotification::MaxSuppliers, 0) @@ -72,7 +72,7 @@ TAO_Notify_AdminProperties::init () } CORBA::Boolean -TAO_Notify_AdminProperties::queue_full (void) +TAO_Notify_AdminProperties::queue_full () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, 1); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp index 28871268029..598d4616b86 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp @@ -23,7 +23,7 @@ TAO_Notify_AnyEvent_No_Copy::~TAO_Notify_AnyEvent_No_Copy () } const TAO_Notify_EventType& -TAO_Notify_AnyEvent_No_Copy::type (void) const +TAO_Notify_AnyEvent_No_Copy::type () const { return this->event_type_; } @@ -108,7 +108,7 @@ TAO_Notify_AnyEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_AnyEvent_No_Copy::copy (void) const +TAO_Notify_AnyEvent_No_Copy::copy () const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 7f7780af34e..31fb4f2be48 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void) +TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer () { } @@ -18,7 +18,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::~TAO_Notify_CosEC_ProxyPushConsumer () } void -TAO_Notify_CosEC_ProxyPushConsumer::release (void) +TAO_Notify_CosEC_ProxyPushConsumer::release () { delete this; //@@ inform factory @@ -59,14 +59,14 @@ TAO_Notify_CosEC_ProxyPushConsumer::connect_push_supplier (CosEventComm::PushSup } void -TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer (void) +TAO_Notify_CosEC_ProxyPushConsumer::disconnect_push_consumer () { TAO_Notify_CosEC_ProxyPushConsumer::Ptr guard( this ); this->destroy (); } const char * -TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_CosEC_ProxyPushConsumer::get_proxy_type_name () const { return "ec_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index d911c4b2b2d..31456ab5d13 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void) +TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier () { } @@ -14,7 +14,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::~TAO_Notify_CosEC_ProxyPushSupplier () } void -TAO_Notify_CosEC_ProxyPushSupplier::release (void) +TAO_Notify_CosEC_ProxyPushSupplier::release () { delete this; @@ -36,14 +36,14 @@ TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushCon } void -TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier (void) +TAO_Notify_CosEC_ProxyPushSupplier::disconnect_push_supplier () { TAO_Notify_CosEC_ProxyPushSupplier::Ptr guard( this ); this->destroy (); } const char * -TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_CosEC_ProxyPushSupplier::get_proxy_type_name () const { return "ec_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index e0ff8ad2b3f..613c87a9f18 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void) +TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer () { } @@ -17,14 +17,14 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer () } void -TAO_Notify_ProxyPushConsumer::release (void) +TAO_Notify_ProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_ProxyPushConsumer::MyType (void) +TAO_Notify_ProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_ANY; } @@ -61,7 +61,7 @@ TAO_Notify_ProxyPushConsumer::connect_any_push_supplier (CosEventComm::PushSuppl this->self_change (); } -void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void) +void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer () { TAO_Notify_ProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -69,7 +69,7 @@ void TAO_Notify_ProxyPushConsumer::disconnect_push_consumer (void) } const char * -TAO_Notify_ProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_ProxyPushConsumer::get_proxy_type_name () const { return "proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index f30948eae05..a20b22359f3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void) +TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier () { } @@ -15,7 +15,7 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier () } void -TAO_Notify_ProxyPushSupplier::release (void) +TAO_Notify_ProxyPushSupplier::release () { delete this; //@@ inform factory @@ -37,7 +37,7 @@ TAO_Notify_ProxyPushSupplier::connect_any_push_consumer (CosEventComm::PushConsu } void -TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) +TAO_Notify_ProxyPushSupplier::disconnect_push_supplier () { TAO_Notify_ProxyPushSupplier::Ptr guard( this ); this->destroy (); @@ -45,13 +45,13 @@ TAO_Notify_ProxyPushSupplier::disconnect_push_supplier (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_ProxyPushSupplier::MyType (void) +TAO_Notify_ProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_ANY; } const char * -TAO_Notify_ProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_ProxyPushSupplier::get_proxy_type_name () const { return "proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index d130e72d1e3..2f144d30e1e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -88,7 +88,7 @@ TAO_Notify_PushConsumer::init (CosEventComm::PushConsumer_ptr push_consumer) } void -TAO_Notify_PushConsumer::release (void) +TAO_Notify_PushConsumer::release () { delete this; //@@ inform factory @@ -129,7 +129,7 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event) } ACE_CString -TAO_Notify_PushConsumer::get_ior (void) const +TAO_Notify_PushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -156,7 +156,7 @@ TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consu } CORBA::Object_ptr -TAO_Notify_PushConsumer::get_consumer (void) +TAO_Notify_PushConsumer::get_consumer () { return CosEventComm::PushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index 69db801841f..b2edf829cb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -30,14 +30,14 @@ TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier) } void -TAO_Notify_PushSupplier::release (void) +TAO_Notify_PushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_PushSupplier::get_ior (void) const +TAO_Notify_PushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -54,7 +54,7 @@ TAO_Notify_PushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_PushSupplier::get_supplier (void) +TAO_Notify_PushSupplier::get_supplier () { return CosEventComm::PushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index 130e2fe785c..8721836d7e6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -50,7 +50,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties } void -TAO_Notify_Buffering_Strategy::shutdown (void) +TAO_Notify_Buffering_Strategy::shutdown () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_); @@ -67,7 +67,7 @@ TAO_Notify_Buffering_Strategy::shutdown (void) } ACE_Time_Value -TAO_Notify_Buffering_Strategy::oldest_event (void) +TAO_Notify_Buffering_Strategy::oldest_event () { ACE_Time_Value tv (ACE_Time_Value::max_time); ACE_Message_Block* mb = 0; @@ -91,13 +91,13 @@ TAO_Notify_Buffering_Strategy::oldest_event (void) } -TAO_Notify_Buffering_Strategy::Tracker::Tracker (void) +TAO_Notify_Buffering_Strategy::Tracker::Tracker () : child_ (0) { } -TAO_Notify_Buffering_Strategy::Tracker::~Tracker (void) +TAO_Notify_Buffering_Strategy::Tracker::~Tracker () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp index d789e146bbb..4ba1ea9207d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp @@ -151,7 +151,7 @@ typedef TAO_Notify_Proxy_Builder_T<TAO_Notify_CosEC_ProxyPushSupplier , TAO_Notify_ConsumerAdmin> TAO_Notify_CosEC_ProxyPushSupplier_Builder; -TAO_Notify_Builder::TAO_Notify_Builder (void) +TAO_Notify_Builder::TAO_Notify_Builder () { // Init the static members. TAO_Notify_AnyEvent::event_type_ = TAO_Notify_EventType::special (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index c3bf761f86a..ae7f7f43f71 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -58,19 +58,19 @@ TAO_Notify_Consumer::~TAO_Notify_Consumer () } CORBA::ULong -TAO_Notify_Consumer::_incr_refcnt (void) +TAO_Notify_Consumer::_incr_refcnt () { return this->add_reference(); } CORBA::ULong -TAO_Notify_Consumer::_decr_refcnt (void) +TAO_Notify_Consumer::_decr_refcnt () { return this->remove_reference(); } TAO_Notify_Proxy* -TAO_Notify_Consumer::proxy (void) +TAO_Notify_Consumer::proxy () { return this->proxy_supplier (); } @@ -82,7 +82,7 @@ TAO_Notify_Consumer::qos_changed (const TAO_Notify_QoSProperties& qos_properties } void -TAO_Notify_Consumer::resume (void) +TAO_Notify_Consumer::resume () { this->is_suspended_ = 0; @@ -468,7 +468,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) } void -TAO_Notify_Consumer::dispatch_pending (void) +TAO_Notify_Consumer::dispatch_pending () { if (DEBUG_LEVEL > 5) ORBSVCS_DEBUG ((LM_DEBUG, @@ -642,7 +642,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) } void -TAO_Notify_Consumer::cancel_timer (void) +TAO_Notify_Consumer::cancel_timer () { if (this->timer_.isSet() && this->timer_id_ != -1) { @@ -677,7 +677,7 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*) } void -TAO_Notify_Consumer::shutdown (void) +TAO_Notify_Consumer::shutdown () { this->suspend(); if (this->timer_.isSet ()) @@ -701,13 +701,13 @@ TAO_Notify_Consumer::dispatch_updates_i (const CosNotification::EventTypeSeq& ad } TAO_SYNCH_MUTEX* -TAO_Notify_Consumer::proxy_lock (void) +TAO_Notify_Consumer::proxy_lock () { return &this->proxy_->lock_; } TAO_Notify_ProxySupplier* -TAO_Notify_Consumer::proxy_supplier (void) +TAO_Notify_Consumer::proxy_supplier () { return this->proxy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 28e42513918..56b93b5206f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -31,7 +31,7 @@ TAO_Notify_ProxySupplier_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; -TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin (void) +TAO_Notify_ConsumerAdmin::TAO_Notify_ConsumerAdmin () : TAO_Notify_Admin () { } @@ -60,26 +60,26 @@ TAO_Notify_ConsumerAdmin::init (TAO_Notify_EventChannel *ec) } void -TAO_Notify_ConsumerAdmin::_add_ref (void) +TAO_Notify_ConsumerAdmin::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_ConsumerAdmin::_remove_ref (void) +TAO_Notify_ConsumerAdmin::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_ConsumerAdmin::release (void) +TAO_Notify_ConsumerAdmin::release () { delete this; //@@ inform factory } void -TAO_Notify_ConsumerAdmin::destroy (void) +TAO_Notify_ConsumerAdmin::destroy () { this->shutdown (); this->ec_->remove (this); @@ -179,7 +179,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyC } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) +TAO_Notify_ConsumerAdmin::obtain_push_supplier () { CosEventChannelAdmin::ProxyPushSupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -188,25 +188,25 @@ TAO_Notify_ConsumerAdmin::obtain_push_supplier (void) } CosNotifyChannelAdmin::AdminID -TAO_Notify_ConsumerAdmin::MyID (void) +TAO_Notify_ConsumerAdmin::MyID () { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_ConsumerAdmin::MyChannel (void) +TAO_Notify_ConsumerAdmin::MyChannel () { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_ConsumerAdmin::MyOperator (void) +TAO_Notify_ConsumerAdmin::MyOperator () { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin::push_suppliers (void) +TAO_Notify_ConsumerAdmin::push_suppliers () { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -228,7 +228,7 @@ void TAO_Notify_ConsumerAdmin::set_qos (const CosNotification::QoSProperties & q CosNotification::QoSProperties* -TAO_Notify_ConsumerAdmin::get_qos (void) +TAO_Notify_ConsumerAdmin::get_qos () { return this->TAO_Notify_Object::get_qos (); } @@ -275,13 +275,13 @@ TAO_Notify_ConsumerAdmin::get_filter (CosNotifyFilter::FilterID filter) } ::CosNotifyFilter::FilterIDSeq* -TAO_Notify_ConsumerAdmin::get_all_filters (void) +TAO_Notify_ConsumerAdmin::get_all_filters () { return this->filter_admin_.get_all_filters (); } void -TAO_Notify_ConsumerAdmin::remove_all_filters (void) +TAO_Notify_ConsumerAdmin::remove_all_filters () { this->filter_admin_.remove_all_filters (); } @@ -289,7 +289,7 @@ TAO_Notify_ConsumerAdmin::remove_all_filters (void) /************ UNIMPLMENTED METHODS *************************/ CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin::priority_filter (void) +TAO_Notify_ConsumerAdmin::priority_filter () { throw CORBA::NO_IMPLEMENT (); } @@ -302,7 +302,7 @@ TAO_Notify_ConsumerAdmin::priority_filter (CosNotifyFilter::MappingFilter_ptr /* } CosNotifyFilter::MappingFilter_ptr -TAO_Notify_ConsumerAdmin::lifetime_filter (void) +TAO_Notify_ConsumerAdmin::lifetime_filter () { throw CORBA::NO_IMPLEMENT (); @@ -315,7 +315,7 @@ TAO_Notify_ConsumerAdmin::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /* } ::CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_ConsumerAdmin::pull_suppliers (void) +TAO_Notify_ConsumerAdmin::pull_suppliers () { throw CORBA::NO_IMPLEMENT (); } @@ -336,7 +336,7 @@ TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & / } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_Notify_ConsumerAdmin::obtain_pull_supplier (void) +TAO_Notify_ConsumerAdmin::obtain_pull_supplier () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp index 1b1abd51aa4..9b1f56e9c96 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer (void) +TAO_Notify_CosNotify_Initializer::TAO_Notify_CosNotify_Initializer () { ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_CosNotify_Service); ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index 6f79de052cf..f5e9f05863e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -13,11 +13,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_CosNotify_Service::TAO_CosNotify_Service (void) +TAO_CosNotify_Service::TAO_CosNotify_Service () { } -TAO_CosNotify_Service::~TAO_CosNotify_Service (void) +TAO_CosNotify_Service::~TAO_CosNotify_Service () { } @@ -292,7 +292,7 @@ TAO_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int thr } int -TAO_CosNotify_Service::fini (void) +TAO_CosNotify_Service::fini () { if (TAO_Notify_PROPERTIES::instance()->separate_dispatching_orb()) { @@ -449,7 +449,7 @@ TAO_CosNotify_Service::init_i2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_o } TAO_Notify_Factory* -TAO_CosNotify_Service::create_factory (void) +TAO_CosNotify_Service::create_factory () { TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory"); if (factory == 0) @@ -462,7 +462,7 @@ TAO_CosNotify_Service::create_factory (void) } TAO_Notify_Builder* -TAO_CosNotify_Service::create_builder (void) +TAO_CosNotify_Service::create_builder () { TAO_Notify_Builder* builder = 0; ACE_NEW_THROW_EX (builder, @@ -486,14 +486,14 @@ TAO_CosNotify_Service::remove (TAO_Notify_EventChannelFactory* /*ecf*/) } TAO_Notify_Factory& -TAO_CosNotify_Service::factory (void) +TAO_CosNotify_Service::factory () { ACE_ASSERT( this->factory_.get() != 0 ); return *this->factory_; } TAO_Notify_Builder& -TAO_CosNotify_Service::builder (void) +TAO_CosNotify_Service::builder () { ACE_ASSERT( this->builder_.get() != 0 ); return *this->builder_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp index a17a30f6aae..e594cef4ae0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp @@ -37,7 +37,7 @@ public: } }; -TAO_Notify_Default_Factory::TAO_Notify_Default_Factory (void) +TAO_Notify_Default_Factory::TAO_Notify_Default_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index b9a8c147a14..63a375d9120 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr (void) +TAO_Notify_Constraint_Expr::TAO_Notify_Constraint_Expr () { } @@ -86,7 +86,7 @@ TAO_Notify_Constraint_Expr::load_child ( void -TAO_Notify_Constraint_Expr::release (void) +TAO_Notify_Constraint_Expr::release () { delete this; //@@ inform factory @@ -124,7 +124,7 @@ TAO_Notify_ETCL_Filter::~TAO_Notify_ETCL_Filter () } char* -TAO_Notify_ETCL_Filter::constraint_grammar (void) +TAO_Notify_ETCL_Filter::constraint_grammar () { return CORBA::string_dup (this->grammar_.c_str ()); } @@ -147,7 +147,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i (CosNotifyFilter::ConstraintID cnstr_id ACE_NEW_THROW_EX (notify_constr_expr, TAO_Notify_Constraint_Expr (), CORBA::NO_MEMORY ()); - auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); + std::unique_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); if (TAO_debug_level > 1) ORBSVCS_DEBUG ((LM_DEBUG, @@ -172,7 +172,7 @@ TAO_Notify_ETCL_Filter::add_constraint_i ACE_NEW_THROW_EX (notify_constr_expr, TAO_Notify_Constraint_Expr (), CORBA::NO_MEMORY ()); - auto_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); + std::unique_ptr <TAO_Notify_Constraint_Expr> auto_expr (notify_constr_expr); CosNotifyFilter::ConstraintExp const & expr = constraint.constraint_expression; @@ -364,7 +364,7 @@ TAO_Notify_ETCL_Filter::get_constraints ( } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_ETCL_Filter::get_all_constraints (void) +TAO_Notify_ETCL_Filter::get_all_constraints () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -404,7 +404,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (void) } void -TAO_Notify_ETCL_Filter::remove_all_constraints (void) +TAO_Notify_ETCL_Filter::remove_all_constraints () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -413,7 +413,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints (void) } void -TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) +TAO_Notify_ETCL_Filter::remove_all_constraints_i () { CONSTRAINT_EXPR_LIST::ITERATOR iter (this->constraint_expr_list_); CONSTRAINT_EXPR_LIST::ENTRY *entry; @@ -431,7 +431,7 @@ TAO_Notify_ETCL_Filter::remove_all_constraints_i (void) } void -TAO_Notify_ETCL_Filter::destroy (void) +TAO_Notify_ETCL_Filter::destroy () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -507,7 +507,7 @@ TAO_Notify_ETCL_Filter::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_ETCL_Filter::get_callbacks (void) +TAO_Notify_ETCL_Filter::get_callbacks () { throw CORBA::NO_IMPLEMENT (); } @@ -548,7 +548,7 @@ TAO_Notify_ETCL_Filter::save_persistent (TAO_Notify::Topology_Saver& saver) void -TAO_Notify_ETCL_Filter::release (void) +TAO_Notify_ETCL_Filter::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 83223cc25c0..a5daa3611b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) : +TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory () : filter_poa_ (PortableServer::POA::_nil ()) { } @@ -59,7 +59,7 @@ TAO_Notify_ETCL_FilterFactory::create (PortableServer::POA_ptr filter_poa) } void -TAO_Notify_ETCL_FilterFactory::destroy (void) +TAO_Notify_ETCL_FilterFactory::destroy () { if (CORBA::is_nil(this->filter_poa_.in ())) return; @@ -241,7 +241,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, void -TAO_Notify_ETCL_FilterFactory::release (void) +TAO_Notify_ETCL_FilterFactory::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp index 0b75982cd13..d3f7ff5c047 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Event::TAO_Notify_Event (void) +TAO_Notify_Event::TAO_Notify_Event () : priority_ (CosNotification::Priority, CosNotification::DefaultPriority) , timeout_ (CosNotification::Timeout) , reliable_ (CosNotification::EventReliability, true) @@ -32,7 +32,7 @@ TAO_Notify_Event::~TAO_Notify_Event () // ORBSVCS_DEBUG ((LM_DEBUG,"event:%x destroyed\n", this )); } void -TAO_Notify_Event::release (void) +TAO_Notify_Event::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index c0e30c6fe10..35445ee3fcf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -40,7 +40,7 @@ TAO_Notify_SupplierAdmin_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Seq_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Seq_Worker; -TAO_Notify_EventChannel::TAO_Notify_EventChannel (void) +TAO_Notify_EventChannel::TAO_Notify_EventChannel () : ecf_ (0) , ca_container_ (0) , sa_container_ (0) @@ -179,19 +179,19 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent* parent) void -TAO_Notify_EventChannel::_add_ref (void) +TAO_Notify_EventChannel::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_EventChannel::_remove_ref (void) +TAO_Notify_EventChannel::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_EventChannel::release (void) +TAO_Notify_EventChannel::release () { delete this; //@@ inform factory @@ -204,7 +204,7 @@ TAO_Notify_EventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID, } int -TAO_Notify_EventChannel::shutdown (void) +TAO_Notify_EventChannel::shutdown () { int sd_ret = TAO_Notify_Object::shutdown (); @@ -221,7 +221,7 @@ TAO_Notify_EventChannel::shutdown (void) } void -TAO_Notify_EventChannel::destroy (void) +TAO_Notify_EventChannel::destroy () { TAO_Notify_EventChannel::Ptr guard( this ); @@ -260,19 +260,19 @@ TAO_Notify_EventChannel::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_EventChannel::get_qos (void) +TAO_Notify_EventChannel::get_qos () { return this->TAO_Notify_Object::get_qos (); } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannel::MyFactory (void) +TAO_Notify_EventChannel::MyFactory () { return this->ecf_->_this (); } CosNotifyChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel::default_consumer_admin (void) +TAO_Notify_EventChannel::default_consumer_admin () { if (CORBA::is_nil (default_consumer_admin_.in ())) { @@ -299,7 +299,7 @@ TAO_Notify_EventChannel::default_consumer_admin (void) } CosNotifyChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel::default_supplier_admin (void) +TAO_Notify_EventChannel::default_supplier_admin () { if (CORBA::is_nil (default_supplier_admin_.in ())) { @@ -324,7 +324,7 @@ TAO_Notify_EventChannel::default_supplier_admin (void) } ::CosNotifyFilter::FilterFactory_ptr -TAO_Notify_EventChannel::default_filter_factory (void) +TAO_Notify_EventChannel::default_filter_factory () { return CosNotifyFilter::FilterFactory::_duplicate (this->default_filter_factory_.in ()); } @@ -384,7 +384,7 @@ TAO_Notify_EventChannel::get_supplieradmin (CosNotifyChannelAdmin::AdminID id) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel::get_all_consumeradmins (void) +TAO_Notify_EventChannel::get_all_consumeradmins () { TAO_Notify_ConsumerAdmin_Seq_Worker seq_worker; @@ -392,7 +392,7 @@ TAO_Notify_EventChannel::get_all_consumeradmins (void) } CosNotifyChannelAdmin::AdminIDSeq* -TAO_Notify_EventChannel::get_all_supplieradmins (void) +TAO_Notify_EventChannel::get_all_supplieradmins () { TAO_Notify_SupplierAdmin_Seq_Worker seq_worker; @@ -406,7 +406,7 @@ TAO_Notify_EventChannel::set_admin (const CosNotification::AdminProperties & adm } CosNotification::AdminProperties* -TAO_Notify_EventChannel::get_admin (void) +TAO_Notify_EventChannel::get_admin () { CosNotification::AdminProperties_var properties; @@ -420,13 +420,13 @@ TAO_Notify_EventChannel::get_admin (void) } CosEventChannelAdmin::ConsumerAdmin_ptr -TAO_Notify_EventChannel::for_consumers (void) +TAO_Notify_EventChannel::for_consumers () { return this->default_consumer_admin(); } CosEventChannelAdmin::SupplierAdmin_ptr -TAO_Notify_EventChannel::for_suppliers (void) +TAO_Notify_EventChannel::for_suppliers () { return this->default_supplier_admin (); } @@ -592,7 +592,7 @@ TAO_Notify_EventChannel::find_proxy_supplier (TAO_Notify::IdVec & id_path, size_ void -TAO_Notify_EventChannel::reconnect (void) +TAO_Notify_EventChannel::reconnect () { TAO_Notify::Reconnect_Worker<TAO_Notify_ConsumerAdmin> ca_wrk; this->ca_container().collection()->for_each(&ca_wrk); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index a51e3da7ba7..ad4ff082cd8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -45,7 +45,7 @@ TAO_Notify_EventChannel_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_EventChannel> TAO_Notify_EventChannel_Seq_Worker; -TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void) +TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory () : topology_save_seq_ (0) , topology_factory_(0) , reconnect_registry_(*this) @@ -58,7 +58,7 @@ TAO_Notify_EventChannelFactory::~TAO_Notify_EventChannelFactory () } void -TAO_Notify_EventChannelFactory::destroy (void) +TAO_Notify_EventChannelFactory::destroy () { if (this->shutdown () == 1) return; @@ -128,19 +128,19 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa) } void -TAO_Notify_EventChannelFactory::_add_ref (void) +TAO_Notify_EventChannelFactory::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_EventChannelFactory::_remove_ref (void) +TAO_Notify_EventChannelFactory::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_EventChannelFactory::release (void) +TAO_Notify_EventChannelFactory::release () { delete this; //@@ inform factory @@ -154,7 +154,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel) } int -TAO_Notify_EventChannelFactory::shutdown (void) +TAO_Notify_EventChannelFactory::shutdown () { this->stop_validator(); @@ -194,7 +194,7 @@ TAO_Notify_EventChannelFactory::create_named_channel ( } CosNotifyChannelAdmin::ChannelIDSeq* -TAO_Notify_EventChannelFactory::get_all_channels (void) +TAO_Notify_EventChannelFactory::get_all_channels () { TAO_Notify_EventChannel_Seq_Worker seq_worker; @@ -222,13 +222,13 @@ TAO_Notify_EventChannelFactory::set_topology_factory(TAO_Notify::Topology_Factor } void -TAO_Notify_EventChannelFactory::load_topology (void) +TAO_Notify_EventChannelFactory::load_topology () { this->loading_topology_ = true; if (this->topology_factory_ != 0) { // create_loader will open and load the persistence file for validation - auto_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader()); + std::unique_ptr<TAO_Notify::Topology_Loader> tl(this->topology_factory_->create_loader()); if (tl.get () != 0) { tl->load (this); @@ -292,7 +292,7 @@ TAO_Notify_EventChannelFactory::save_persistent (TAO_Notify::Topology_Saver& sav } void -TAO_Notify_EventChannelFactory::load_event_persistence (void) +TAO_Notify_EventChannelFactory::load_event_persistence () { TAO_Notify::Event_Persistence_Strategy * strategy = ACE_Dynamic_Service <TAO_Notify::Event_Persistence_Strategy>::instance ("Event_Persistence"); @@ -334,7 +334,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) } bool -TAO_Notify_EventChannelFactory::change_to_parent (void) +TAO_Notify_EventChannelFactory::change_to_parent () { bool saving = false; if (! this->loading_topology_) @@ -351,7 +351,7 @@ TAO_Notify_EventChannelFactory::change_to_parent (void) ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->topology_save_lock_, CORBA::INTERNAL ()); if (seq == this->topology_save_seq_) { - auto_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver()); + std::unique_ptr<TAO_Notify::Topology_Saver> saver(this->topology_factory_->create_saver()); if (saver.get() != 0) { this->save_persistent(*saver); @@ -396,7 +396,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type, } void -TAO_Notify_EventChannelFactory::reconnect (void) +TAO_Notify_EventChannelFactory::reconnect () { // Reconnect all children first TAO_Notify::Reconnect_Worker<TAO_Notify_EventChannel> wrk; @@ -434,13 +434,13 @@ TAO_Notify_EventChannelFactory::unregister_callback ( } CORBA::Boolean -TAO_Notify_EventChannelFactory::is_alive (void) +TAO_Notify_EventChannelFactory::is_alive () { return CORBA::Boolean (1); } void -TAO_Notify_EventChannelFactory::save_topology (void) +TAO_Notify_EventChannelFactory::save_topology () { this->self_change (); } @@ -497,7 +497,7 @@ TAO_Notify_EventChannelFactory::find_proxy_supplier (TAO_Notify::IdVec & id_path } CosNotifyChannelAdmin::EventChannelFactory_ptr -TAO_Notify_EventChannelFactory::activate_self (void) +TAO_Notify_EventChannelFactory::activate_self () { CORBA::Object_var obj = this->activate (this); this->channel_factory_ diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index 7ee8a94b6b3..cb8d189001d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -13,12 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Notify_EventType -TAO_Notify_EventType::special (void) +TAO_Notify_EventType::special () { return TAO_Notify_EventType ("*", "%ALL"); } -TAO_Notify_EventType::TAO_Notify_EventType (void) +TAO_Notify_EventType::TAO_Notify_EventType () { } @@ -55,7 +55,7 @@ TAO_Notify_EventType::~TAO_Notify_EventType () } void -TAO_Notify_EventType::recompute_hash (void) +TAO_Notify_EventType::recompute_hash () { // @@ Pradeep: this code is bound to crash someday if the strings // are too long.... See if the hash_pjw () function can be modified @@ -112,14 +112,14 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const } CORBA::Boolean -TAO_Notify_EventType::is_special (void) const +TAO_Notify_EventType::is_special () const { return (this->domain_is_wildcard (this->event_type_.domain_name) && this->type_is_wildcard (this->event_type_.type_name)); } void -TAO_Notify_EventType::dump (void) const +TAO_Notify_EventType::dump () const { ORBSVCS_DEBUG ((LM_DEBUG, "(%s,%s)", diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 906e103d2cd..cd98e86503a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void) +TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq () { } @@ -243,7 +243,7 @@ TAO_Notify_EventTypeSeq::intersection (const TAO_Notify_EventTypeSeq& rhs, const } void -TAO_Notify_EventTypeSeq::dump (void) const +TAO_Notify_EventTypeSeq::dump () const { TAO_Notify_EventTypeSeq::CONST_ITERATOR iter (*this); @@ -303,7 +303,7 @@ TAO_Notify_EventTypeSeq::load_child (const ACE_CString &type, CORBA::Long id, } void -TAO_Notify_EventTypeSeq::release (void) +TAO_Notify_EventTypeSeq::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp index 3f279e612ea..0ad3ff2ca33 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp @@ -55,7 +55,7 @@ protected: /********************************************************************************/ -TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (void) +TAO_Notify_Event_Manager::TAO_Notify_Event_Manager () { } @@ -74,7 +74,7 @@ void TAO_Notify_Event_Manager::release() } void -TAO_Notify_Event_Manager::init (void) +TAO_Notify_Event_Manager::init () { ACE_ASSERT (this->consumer_map_.get() == 0); @@ -96,7 +96,7 @@ TAO_Notify_Event_Manager::init (void) } void -TAO_Notify_Event_Manager::shutdown (void) +TAO_Notify_Event_Manager::shutdown () { } @@ -231,27 +231,27 @@ TAO_Notify_Event_Manager::un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, } TAO_Notify_Consumer_Map& -TAO_Notify_Event_Manager::consumer_map (void) +TAO_Notify_Event_Manager::consumer_map () { ACE_ASSERT( this->consumer_map_.get() != 0 ); return *this->consumer_map_; } TAO_Notify_Supplier_Map& -TAO_Notify_Event_Manager::supplier_map (void) +TAO_Notify_Event_Manager::supplier_map () { ACE_ASSERT( this->supplier_map_.get() != 0 ); return *this->supplier_map_; } const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Manager::offered_types (void) const +TAO_Notify_Event_Manager::offered_types () const { return this->supplier_map_->event_types (); } const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Manager::subscription_types (void) const +TAO_Notify_Event_Manager::subscription_types () const { return this->consumer_map_->event_types (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h index db98b1d895f..c9281a4bffd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h @@ -110,12 +110,10 @@ protected: void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq); private: - // Disallow copying and assignment; we don't need them - // and if we let the compiler generate them it needs the - // full declaration of the template arguments for ACE_Auto_Ptr<> - // below. - TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&); - TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&); + TAO_Notify_Event_Manager (const TAO_Notify_Event_Manager&) = delete; + TAO_Notify_Event_Manager& operator= (const TAO_Notify_Event_Manager&) = delete; + TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&&) = delete; + TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&&) = delete; /// Consumer Map ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp index 0bfdbf409ec..3876f8b7463 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory (void) +TAO_Notify::Event_Persistence_Factory::~Event_Persistence_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 441b3d556d0..64d570166d9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -15,13 +15,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor -TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void) +TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin () { } // Implementation skeleton destructor -TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin (void) +TAO_Notify_FilterAdmin::~TAO_Notify_FilterAdmin () { } @@ -71,7 +71,7 @@ TAO_Notify_FilterAdmin::get_filter (CosNotifyFilter::FilterID filter_id) } CosNotifyFilter::FilterIDSeq* -TAO_Notify_FilterAdmin::get_all_filters (void) +TAO_Notify_FilterAdmin::get_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -104,7 +104,7 @@ TAO_Notify_FilterAdmin::get_all_filters (void) } void -TAO_Notify_FilterAdmin::remove_all_filters (void) +TAO_Notify_FilterAdmin::remove_all_filters () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -174,7 +174,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id, } void -TAO_Notify_FilterAdmin::release (void) +TAO_Notify_FilterAdmin::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp index eca1d32f6f3..b6c6ca41364 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ID_Factory::TAO_Notify_ID_Factory (void) +TAO_Notify_ID_Factory::TAO_Notify_ID_Factory () : seed_ (0) { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp index e43bf8d3057..fdcd1075447 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Method_Request::~TAO_Notify_Method_Request (void) +TAO_Notify_Method_Request::~TAO_Notify_Method_Request () { } TAO_Notify_Method_Request_Queueable * -TAO_Notify_Method_Request_Queueable::copy (void) +TAO_Notify_Method_Request_Queueable::copy () { return this; } @@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event* event) } const ACE_Time_Value& -TAO_Notify_Method_Request_Queueable::creation_time (void) const +TAO_Notify_Method_Request_Queueable::creation_time () const { return this->time_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index 3a420766747..f584e725bef 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -57,7 +57,7 @@ TAO_Notify_Method_Request_Dispatch::~TAO_Notify_Method_Request_Dispatch () { } -int TAO_Notify_Method_Request_Dispatch::execute_i (void) +int TAO_Notify_Method_Request_Dispatch::execute_i () { if (this->proxy_supplier_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. @@ -210,7 +210,7 @@ TAO_Notify_Method_Request_Dispatch_Queueable::~TAO_Notify_Method_Request_Dispatc } int -TAO_Notify_Method_Request_Dispatch_Queueable::execute (void) +TAO_Notify_Method_Request_Dispatch_Queueable::execute () { return this->execute_i (); } @@ -231,13 +231,13 @@ TAO_Notify_Method_Request_Dispatch_No_Copy:: ~TAO_Notify_Method_Request_Dispatch } int -TAO_Notify_Method_Request_Dispatch_No_Copy::execute (void) +TAO_Notify_Method_Request_Dispatch_No_Copy::execute () { return this->execute_i (); } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Dispatch_No_Copy::copy (void) +TAO_Notify_Method_Request_Dispatch_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp index 519b1ff0a47..590bbba4ffe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp @@ -83,7 +83,7 @@ TAO_Notify_Method_Request_Event_Queueable::~TAO_Notify_Method_Request_Event_Queu } int -TAO_Notify_Method_Request_Event_Queueable::execute (void) +TAO_Notify_Method_Request_Event_Queueable::execute () { ACE_ASSERT (false); return -1; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 2a3cf610e46..264f4ede97c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -54,7 +54,7 @@ TAO_Notify_Method_Request_Lookup::work ( } } -int TAO_Notify_Method_Request_Lookup::execute_i (void) +int TAO_Notify_Method_Request_Lookup::execute_i () { if (this->proxy_consumer_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. @@ -187,7 +187,7 @@ TAO_Notify_Method_Request_Lookup_Queueable::~TAO_Notify_Method_Request_Lookup_Qu } int -TAO_Notify_Method_Request_Lookup_Queueable::execute (void) +TAO_Notify_Method_Request_Lookup_Queueable::execute () { return this->execute_i (); } @@ -206,13 +206,13 @@ TAO_Notify_Method_Request_Lookup_No_Copy::~TAO_Notify_Method_Request_Lookup_No_C } int -TAO_Notify_Method_Request_Lookup_No_Copy::execute (void) +TAO_Notify_Method_Request_Lookup_No_Copy::execute () { return this->execute_i (); } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Lookup_No_Copy::copy (void) +TAO_Notify_Method_Request_Lookup_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp index 5a25e497aae..847a70616aa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp @@ -13,13 +13,13 @@ TAO_Notify_Method_Request_Shutdown::~TAO_Notify_Method_Request_Shutdown () } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Shutdown::copy (void) +TAO_Notify_Method_Request_Shutdown::copy () { return new TAO_Notify_Method_Request_Shutdown (this->task_); } int -TAO_Notify_Method_Request_Shutdown::execute (void) +TAO_Notify_Method_Request_Shutdown::execute () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp index 14f93d48e73..3b4eee8bb9f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp @@ -15,7 +15,7 @@ TAO_Notify_Method_Request_Updates::~TAO_Notify_Method_Request_Updates () } int -TAO_Notify_Method_Request_Updates::execute (void) +TAO_Notify_Method_Request_Updates::execute () { return this->execute_i (); } @@ -33,7 +33,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::~TAO_Notify_Method_Request_Updates_No } TAO_Notify_Method_Request_Queueable* -TAO_Notify_Method_Request_Updates_No_Copy::copy (void) +TAO_Notify_Method_Request_Updates_No_Copy::copy () { TAO_Notify_Method_Request_Queueable* request = 0; @@ -45,7 +45,7 @@ TAO_Notify_Method_Request_Updates_No_Copy::copy (void) } int -TAO_Notify_Method_Request_Updates_No_Copy::execute (void) +TAO_Notify_Method_Request_Updates_No_Copy::execute () { return this->execute_i (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp index 73e63738be3..7ff8ac5455d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_NS_Control::~TAO_NS_Control (void) +TAO_NS_Control::~TAO_NS_Control () { } @@ -12,7 +12,7 @@ TAO_NS_Control::TAO_NS_Control (const char* name) } const ACE_CString& -TAO_NS_Control::name (void) const +TAO_NS_Control::name () const { return this->name_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp index 2dce7e4ea36..6b767080a8d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Control_Registry* -TAO_Control_Registry::instance (void) +TAO_Control_Registry::instance () { return TAO_Singleton<TAO_Control_Registry, TAO_SYNCH_MUTEX>::instance (); } -TAO_Control_Registry::~TAO_Control_Registry (void) +TAO_Control_Registry::~TAO_Control_Registry () { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_); @@ -67,7 +67,7 @@ TAO_Control_Registry::remove (const ACE_CString& name) } const TAO_Control_Registry::NameList& -TAO_Control_Registry::names (void) +TAO_Control_Registry::names () { if (this->name_cache_.length () == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index cdee710b3d7..0c9a43b1f82 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MonitorManager::TAO_MonitorManager (void) +TAO_MonitorManager::TAO_MonitorManager () : run_ (false) , initialized_ (false) { @@ -93,7 +93,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) } int -TAO_MonitorManager::fini (void) +TAO_MonitorManager::fini () { if (!CORBA::is_nil (this->task_.orb_.in ())) { @@ -110,7 +110,7 @@ TAO_MonitorManager::fini (void) } int -TAO_MonitorManager::run (void) +TAO_MonitorManager::run () { bool activate = false; @@ -152,13 +152,13 @@ TAO_MonitorManager::run (void) } int -TAO_MonitorManager::resume (void) +TAO_MonitorManager::resume () { return this->run (); } void -TAO_MonitorManager::shutdown (void) +TAO_MonitorManager::shutdown () { TAO_MonitorManager* monitor = ACE_Dynamic_Service<TAO_MonitorManager>::instance ( @@ -170,7 +170,7 @@ TAO_MonitorManager::shutdown (void) } } -TAO_MonitorManager::ORBTask::ORBTask (void) +TAO_MonitorManager::ORBTask::ORBTask () : use_name_svc_ (true) , startup_barrier_ (2) // synch the parent with the single child thread , mc_orb_name_ (ACE_TEXT("TAO_MonitorAndControl")) @@ -178,7 +178,7 @@ TAO_MonitorManager::ORBTask::ORBTask (void) } int -TAO_MonitorManager::ORBTask::svc (void) +TAO_MonitorManager::ORBTask::svc () { try { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index 03cbde82aab..e5ca866f620 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -21,7 +21,7 @@ NotificationServiceMonitor_i::NotificationServiceMonitor_i (CORBA::ORB_ptr orb) } Monitor::NameList* -NotificationServiceMonitor_i::get_statistic_names (void) +NotificationServiceMonitor_i::get_statistic_names () { Monitor_Control_Types::NameList name_list = Monitor_Point_Registry::instance ()->names (); @@ -208,7 +208,7 @@ NotificationServiceMonitor_i::send_control_command (const char* name, } void -NotificationServiceMonitor_i::shutdown (void) +NotificationServiceMonitor_i::shutdown () { if (!CORBA::is_nil (this->orb_.in ())) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp index 72063c91920..8994a77cfc0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Notify_Service.cpp @@ -13,12 +13,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MC_Notify_Service::~TAO_MC_Notify_Service (void) +TAO_MC_Notify_Service::~TAO_MC_Notify_Service () { } TAO_Notify_Factory* -TAO_MC_Notify_Service::create_factory (void) +TAO_MC_Notify_Service::create_factory () { TAO_MC_Default_Factory* factory = 0; ACE_NEW_THROW_EX (factory, diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 6847580b12d..5d9275a1412 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -51,7 +51,7 @@ private: CosNotifyChannelAdmin::AdminID id_; }; -TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void) +TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin () : stat_name_ (), control_name_ (), queue_size_ (0), @@ -59,7 +59,7 @@ TAO_MonitorConsumerAdmin::TAO_MonitorConsumerAdmin (void) { } -TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin (void) +TAO_MonitorConsumerAdmin::~TAO_MonitorConsumerAdmin () { this->remove (); // The registry also manages this refcount. The pointer itself @@ -205,7 +205,7 @@ TAO_MonitorConsumerAdmin::count_queue_overflow ( } TAO_MonitorEventChannel * -TAO_MonitorConsumerAdmin::get_ec (void) const +TAO_MonitorConsumerAdmin::get_ec () const { TAO_MonitorEventChannel* ec = dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ()); if (ec == 0) @@ -214,21 +214,21 @@ TAO_MonitorConsumerAdmin::get_ec (void) const } const ACE_CString & -TAO_MonitorConsumerAdmin::stat_name (void)const +TAO_MonitorConsumerAdmin::stat_name ()const { return stat_name_; } void -TAO_MonitorConsumerAdmin::destroy (void) +TAO_MonitorConsumerAdmin::destroy () { this->remove (); this->TAO_Notify_ConsumerAdmin::destroy (); } void -TAO_MonitorConsumerAdmin::remove (void) +TAO_MonitorConsumerAdmin::remove () { // First, make sure we can get down to the real ec type TAO_MonitorEventChannel* ec = diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index 5b9b6f9470b..92e23ce07d6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -39,7 +39,7 @@ public: { } - virtual void update (void) { + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { Monitor_Control_Types::NameList list; @@ -75,7 +75,7 @@ public: { } - virtual void update (void) { + virtual void update () { Monitor_Control_Types::NameList list; this->interf_->get_timedout_consumers (&list); this->receive (list); @@ -97,7 +97,7 @@ public: { } - virtual void update (void) + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { @@ -146,7 +146,7 @@ public: { } - virtual void update (void) + virtual void update () { this->receive (this->interf_->calculate_queue_size (this->count_)); } @@ -168,7 +168,7 @@ public: { } - virtual void update (void) + virtual void update () { this->receive (this->interf_->get_oldest_event ()); } @@ -187,7 +187,7 @@ public: { } - virtual void update (void) + virtual void update () { Monitor_Control_Types::NameList list; this->interf_->determine_slowest_consumer (&list); @@ -296,7 +296,7 @@ TAO_MonitorEventChannel::TAO_MonitorEventChannel (const char* name) this->add_stats (); } -TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) +TAO_MonitorEventChannel::~TAO_MonitorEventChannel () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); @@ -318,7 +318,7 @@ TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) } const ACE_CString& -TAO_MonitorEventChannel::name (void) const +TAO_MonitorEventChannel::name () const { return this->name_; } @@ -1288,7 +1288,7 @@ TAO_MonitorEventChannel::determine_slowest_consumer ( } double -TAO_MonitorEventChannel::get_oldest_event (void) +TAO_MonitorEventChannel::get_oldest_event () { CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp index d3de46ab273..753ace26855 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp @@ -30,7 +30,7 @@ public: { } - virtual void update (void) + virtual void update () { if (this->type () == Monitor_Control_Types::MC_LIST) { @@ -151,7 +151,7 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( } } -TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory (void) +TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory () { Monitor_Point_Registry* instance = Monitor_Point_Registry::instance (); size_t size = this->stat_names_.size (); @@ -418,7 +418,7 @@ TAO_MonitorEventChannelFactory::Unbinder::Unbinder ( { } -TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void) +TAO_MonitorEventChannelFactory::Unbinder::~Unbinder () { if (!this->released_) { @@ -427,7 +427,7 @@ TAO_MonitorEventChannelFactory::Unbinder::~Unbinder (void) } void -TAO_MonitorEventChannelFactory::Unbinder::release (void) +TAO_MonitorEventChannelFactory::Unbinder::release () { this->released_ = true; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp index b1e55e19a79..ffa6e2bb0e1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorSupplierAdmin.cpp @@ -41,11 +41,11 @@ private: CosNotifyChannelAdmin::AdminID id_; }; -TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin (void) +TAO_MonitorSupplierAdmin::TAO_MonitorSupplierAdmin () { } -TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin (void) +TAO_MonitorSupplierAdmin::~TAO_MonitorSupplierAdmin () { // First, make sure we can get down to the real ec type TAO_MonitorEventChannel* ec = diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp index e0f0a0a8b38..c255704f3df 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp @@ -6,11 +6,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter (void) +TAO_Notify_Constraint_Interpreter::TAO_Notify_Constraint_Interpreter () { } -TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void) +TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index eb1e3c4e429..f26b3719927 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) +TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor () : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY), implicit_ids_(implicit_ids_size_), filterable_data_(filterable_data_size_), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp index f0af71d982c..f9ca1b251e8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_CO_Factory::init_svc (void) +TAO_Notify_Default_CO_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp index 21421e091e7..cf3fdb6e5d8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_Collection_Factory::init_svc (void) +TAO_Notify_Default_Collection_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp index 44687d95c71..f8020100558 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_EMO_Factory::init_svc (void) +TAO_Notify_Default_EMO_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp index 6648d5e5ffd..c80e8358626 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Notify_Default_POA_Factory::init_svc (void) +TAO_Notify_Default_POA_Factory::init_svc () { // NOP. return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index adb740a2803..3fe20a72ab3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Object::TAO_Notify_Object (void) +TAO_Notify_Object::TAO_Notify_Object () : poa_ (0) , proxy_poa_ (0) , own_proxy_poa_ (false) @@ -82,7 +82,7 @@ TAO_Notify_Object::activate ( void -TAO_Notify_Object::deactivate (void) +TAO_Notify_Object::deactivate () { try { @@ -100,7 +100,7 @@ TAO_Notify_Object::deactivate (void) } int -TAO_Notify_Object::shutdown (void) +TAO_Notify_Object::shutdown () { { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1); @@ -119,13 +119,13 @@ TAO_Notify_Object::shutdown (void) } CORBA::Object_ptr -TAO_Notify_Object::ref (void) +TAO_Notify_Object::ref () { return this->poa_->id_to_reference (this->id_); } void -TAO_Notify_Object::shutdown_worker_task (void) +TAO_Notify_Object::shutdown_worker_task () { // Only do this if we are the owner. TAO_Notify_Worker_Task::Ptr task( this->worker_task_ ); @@ -140,7 +140,7 @@ TAO_Notify_Object::shutdown_worker_task (void) } void -TAO_Notify_Object::destroy_proxy_poa (void) +TAO_Notify_Object::destroy_proxy_poa () { if (this->proxy_poa_ != 0) { @@ -166,7 +166,7 @@ TAO_Notify_Object::destroy_proxy_poa (void) } void -TAO_Notify_Object::destroy_object_poa (void) +TAO_Notify_Object::destroy_object_poa () { if (this->object_poa_ != 0) { @@ -192,7 +192,7 @@ TAO_Notify_Object::destroy_object_poa (void) } /// Shutdown the current poa. -void TAO_Notify_Object::destroy_poa (void) +void TAO_Notify_Object::destroy_poa () { this->poa_ = 0; } @@ -280,7 +280,7 @@ TAO_Notify_Object::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_Object::get_qos (void) +TAO_Notify_Object::get_qos () { CosNotification::QoSProperties_var properties; @@ -311,7 +311,7 @@ TAO_Notify_Object::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties } TAO_Notify_Timer* -TAO_Notify_Object::timer (void) +TAO_Notify_Object::timer () { ACE_ASSERT (worker_task_.get() != 0); return this->worker_task_->timer (); @@ -355,7 +355,7 @@ TAO_Notify_Object::load_attrs(const TAO_Notify::NVPList& attrs) } TAO_Notify_Worker_Task* -TAO_Notify_Object::get_worker_task (void) +TAO_Notify_Object::get_worker_task () { return this->worker_task_.get (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index b81da9bd7dc..ddf7d362ecc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -13,16 +13,16 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_POA_Helper::TAO_Notify_POA_Helper (void) +TAO_Notify_POA_Helper::TAO_Notify_POA_Helper () { } -TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper (void) +TAO_Notify_POA_Helper::~TAO_Notify_POA_Helper () { } ACE_CString -TAO_Notify_POA_Helper::get_unique_id (void) +TAO_Notify_POA_Helper::get_unique_id () { /// Factory for generating unique ids for the POAs. static TAO_Notify_ID_Factory poa_id_factory; @@ -234,7 +234,7 @@ TAO_Notify_POA_Helper::servant_to_reference ( void -TAO_Notify_POA_Helper::destroy (void) +TAO_Notify_POA_Helper::destroy () { poa_->destroy (true, false); // The <wait_for_completion> flag = 0 diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp index d76ad81625d..894e03dc65a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Peer::TAO_Notify_Peer (void) +TAO_Notify_Peer::TAO_Notify_Peer () { } @@ -19,13 +19,13 @@ TAO_Notify_Peer::qos_changed (const TAO_Notify_QoSProperties& /*qos_properties*/ } void -TAO_Notify_Peer::shutdown (void) +TAO_Notify_Peer::shutdown () { // NOP. } void -TAO_Notify_Peer::handle_dispatch_exception (void) +TAO_Notify_Peer::handle_dispatch_exception () { // Sever all association when a remote client misbehaves. Other strategies like reties are possible but not implemented. this->proxy ()->destroy (); @@ -100,13 +100,13 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const } CORBA::ULong -TAO_Notify_Peer::_incr_refcnt (void) +TAO_Notify_Peer::_incr_refcnt () { return this->proxy ()->_incr_refcnt (); } CORBA::ULong -TAO_Notify_Peer::_decr_refcnt (void) +TAO_Notify_Peer::_decr_refcnt () { return this->proxy ()->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp index 73262ca1adc..fd1938022b2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Properties::TAO_Notify_Properties (void) +TAO_Notify_Properties::TAO_Notify_Properties () : factory_ (0) , builder_ (0) , orb_(0) @@ -39,14 +39,14 @@ TAO_Notify_Properties::~TAO_Notify_Properties () } TAO_Notify_Properties * -TAO_Notify_Properties::instance (void) +TAO_Notify_Properties::instance () { return ACE_Unmanaged_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::instance (); } void -TAO_Notify_Properties::close (void) +TAO_Notify_Properties::close () { ACE_Unmanaged_Singleton<TAO_Notify_Properties, TAO_SYNCH_MUTEX>::close (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp index 27d5d57ae16..77d76160bad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void) +TAO_Notify_PropertySeq::TAO_Notify_PropertySeq () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp index a82555e7620..ca6b2956649 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Proxy::TAO_Notify_Proxy (void) +TAO_Notify_Proxy::TAO_Notify_Proxy () : updates_off_ (0) { } @@ -41,7 +41,7 @@ TAO_Notify_Proxy::activate (PortableServer::Servant servant, } void -TAO_Notify_Proxy::deactivate (void) +TAO_Notify_Proxy::deactivate () { ACE_ASSERT (this->proxy_poa() != 0 ); this->proxy_poa()->deactivate (this->id()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 483546e7e7e..533dcced502 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -26,7 +26,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer (void) +TAO_Notify_ProxyConsumer::TAO_Notify_ProxyConsumer () : supplier_admin_ (0) { } @@ -36,7 +36,7 @@ TAO_Notify_ProxyConsumer::~TAO_Notify_ProxyConsumer () } TAO_Notify_Peer* -TAO_Notify_ProxyConsumer::peer (void) +TAO_Notify_ProxyConsumer::peer () { return this->supplier (); } @@ -145,7 +145,7 @@ TAO_Notify_ProxyConsumer::supports_reliable_events () const } void -TAO_Notify_ProxyConsumer::disconnect (void) +TAO_Notify_ProxyConsumer::disconnect () { TAO_Notify_EventTypeSeq added; @@ -158,7 +158,7 @@ TAO_Notify_ProxyConsumer::disconnect (void) } int -TAO_Notify_ProxyConsumer::shutdown (void) +TAO_Notify_ProxyConsumer::shutdown () { if (this->TAO_Notify_Object::shutdown () == 1) return 1; @@ -174,7 +174,7 @@ TAO_Notify_ProxyConsumer::shutdown (void) } void -TAO_Notify_ProxyConsumer::destroy (void) +TAO_Notify_ProxyConsumer::destroy () { this->shutdown (); this->supplier_admin_->cleanup_proxy (this, false, false); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp index 46b2740b2e3..f655b71fada 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void) +TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier () : consumer_admin_ (0) { } @@ -47,7 +47,7 @@ TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin) } TAO_Notify_Peer* -TAO_Notify_ProxySupplier:: peer (void) +TAO_Notify_ProxySupplier:: peer () { return this->consumer (); } @@ -99,7 +99,7 @@ TAO_Notify_ProxySupplier::connect (TAO_Notify_Consumer *consumer) } void -TAO_Notify_ProxySupplier::disconnect (void) +TAO_Notify_ProxySupplier::disconnect () { TAO_Notify_EventTypeSeq added; @@ -112,7 +112,7 @@ TAO_Notify_ProxySupplier::disconnect (void) } int -TAO_Notify_ProxySupplier::shutdown (void) +TAO_Notify_ProxySupplier::shutdown () { if (this->TAO_Notify_Object::shutdown () == 1) return 1; @@ -128,7 +128,7 @@ TAO_Notify_ProxySupplier::shutdown (void) } void -TAO_Notify_ProxySupplier::destroy (void) +TAO_Notify_ProxySupplier::destroy () { this->destroy (false); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp index 4a5e67a70c4..959ce7bd878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_QoSProperties::TAO_Notify_QoSProperties (void) +TAO_Notify_QoSProperties::TAO_Notify_QoSProperties () : event_reliability_(CosNotification::EventReliability) , connection_reliability_(CosNotification::ConnectionReliability) , priority_ (CosNotification::Priority) diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp index 4437626e758..b9efd07001e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void) +TAO_Notify_RT_Builder::TAO_Notify_RT_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp index 70a45839531..bb30c4bd9e9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Factory::TAO_Notify_RT_Factory (void) +TAO_Notify_RT_Factory::TAO_Notify_RT_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp index 575205e48a4..17d3befb962 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RT_Notify_Service::TAO_RT_Notify_Service (void) +TAO_RT_Notify_Service::TAO_RT_Notify_Service () { } @@ -53,7 +53,7 @@ TAO_RT_Notify_Service::init_i (CORBA::ORB_ptr orb) } TAO_Notify_Factory* -TAO_RT_Notify_Service::create_factory (void) +TAO_RT_Notify_Service::create_factory () { TAO_Notify_Factory* factory = ACE_Dynamic_Service<TAO_Notify_Factory>::instance ("TAO_Notify_Factory"); @@ -68,7 +68,7 @@ TAO_RT_Notify_Service::create_factory (void) } TAO_Notify_Builder* -TAO_RT_Notify_Service::create_builder (void) +TAO_RT_Notify_Service::create_builder () { TAO_Notify_Builder* builder = 0; ACE_NEW_THROW_EX (builder, diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp index 8967dd68fa3..3f718315949 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_Properties::TAO_Notify_RT_Properties (void) +TAO_Notify_RT_Properties::TAO_Notify_RT_Properties () { } @@ -16,7 +16,7 @@ TAO_Notify_RT_Properties::~TAO_Notify_RT_Properties () } TAO_Notify_RT_Properties * -TAO_Notify_RT_Properties::instance (void) +TAO_Notify_RT_Properties::instance () { // Hide the template instantiation to prevent multiple instances // from being created. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp index c23841d19cd..29217f504e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void) +TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task () :timer_ (0) { } @@ -18,7 +18,7 @@ TAO_Notify_Reactive_Task::~TAO_Notify_Reactive_Task () } void -TAO_Notify_Reactive_Task::init (void) +TAO_Notify_Reactive_Task::init () { ACE_ASSERT (this->timer_.get() == 0); @@ -30,13 +30,13 @@ TAO_Notify_Reactive_Task::init (void) } void -TAO_Notify_Reactive_Task::release (void) +TAO_Notify_Reactive_Task::release () { delete this; //TODO: Release via factory. } void -TAO_Notify_Reactive_Task::shutdown (void) +TAO_Notify_Reactive_Task::shutdown () { } @@ -47,7 +47,7 @@ TAO_Notify_Reactive_Task::execute (TAO_Notify_Method_Request& method_request) } TAO_Notify_Timer* -TAO_Notify_Reactive_Task::timer (void) +TAO_Notify_Reactive_Task::timer () { return this->timer_.get(); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index f1ffc62b480..6a8f3972cb4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -87,7 +87,7 @@ namespace TAO_Notify } CORBA::Boolean - Reconnection_Registry::is_alive (void) + Reconnection_Registry::is_alive () { return CORBA::Boolean(1); } @@ -231,7 +231,7 @@ namespace TAO_Notify } void - Reconnection_Registry::release (void) + Reconnection_Registry::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index d0d55f7050e..a57cd230a60 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -62,7 +62,7 @@ TAO_Notify_Refcountable::diagnostic_dump( const char* title ) #endif /* TAO_NOTIFY_REFCOUNT_DIAGNOSTICS */ -TAO_Notify_Refcountable::TAO_Notify_Refcountable (void) +TAO_Notify_Refcountable::TAO_Notify_Refcountable () { } @@ -90,7 +90,7 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable () CORBA::ULong -TAO_Notify_Refcountable::_incr_refcnt (void) +TAO_Notify_Refcountable::_incr_refcnt () { CORBA::Long refcount = ++this->refcount_; if (TAO_debug_level > 1 ) @@ -110,7 +110,7 @@ TAO_Notify_Refcountable::_incr_refcnt (void) } CORBA::ULong -TAO_Notify_Refcountable::_decr_refcnt (void) +TAO_Notify_Refcountable::_decr_refcnt () { CORBA::Long refcount = --this->refcount_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 86134043cd8..b6e665a3f91 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -902,7 +902,7 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr } void -Routing_Slip::reconnect (void) +Routing_Slip::reconnect () { Routing_Slip_Guard guard (this->internals_); enter_state_saved (guard); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 820ba315d17..7d76533d46b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -277,7 +277,7 @@ Routing_Slip_Persistence_Manager::Block_Header::Block_Header(Header_Type type) , data_size(0) { } -Routing_Slip_Persistence_Manager::Block_Header::~Block_Header (void) +Routing_Slip_Persistence_Manager::Block_Header::~Block_Header () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index b5e9fc336b3..74076bc8ecf 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void) +TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer () :pacing_interval_ (CosNotification::PacingInterval) { } @@ -18,14 +18,14 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer () } void -TAO_Notify_SequenceProxyPushConsumer::release (void) +TAO_Notify_SequenceProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_SequenceProxyPushConsumer::MyType (void) +TAO_Notify_SequenceProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } @@ -67,7 +67,7 @@ TAO_Notify_SequenceProxyPushConsumer::push_structured_events (const CosNotificat } void -TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void) +TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer () { TAO_Notify_SequenceProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushConsumer::disconnect_sequence_push_consumer (void) } const char * -TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_SequenceProxyPushConsumer::get_proxy_type_name () const { return "sequence_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index faf990d3aca..14db624738b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void) +TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier () { } @@ -15,7 +15,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier () } void -TAO_Notify_SequenceProxyPushSupplier::release (void) +TAO_Notify_SequenceProxyPushSupplier::release () { delete this; //@@ inform factory @@ -37,7 +37,7 @@ TAO_Notify_SequenceProxyPushSupplier::connect_sequence_push_consumer (CosNotifyC } void -TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) +TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier () { TAO_Notify_SequenceProxyPushSupplier::Ptr guard( this ); @@ -46,13 +46,13 @@ TAO_Notify_SequenceProxyPushSupplier::disconnect_sequence_push_supplier (void) } CosNotifyChannelAdmin::ProxyType -TAO_Notify_SequenceProxyPushSupplier::MyType (void) +TAO_Notify_SequenceProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_SEQUENCE; } const char * -TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_SequenceProxyPushSupplier::get_proxy_type_name () const { return "sequence_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index 00a8f1805d0..212e85435c1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -86,7 +86,7 @@ TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr p } void -TAO_Notify_SequencePushConsumer::release (void) +TAO_Notify_SequencePushConsumer::release () { delete this; //@@ inform factory @@ -309,7 +309,7 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_ } ACE_CString -TAO_Notify_SequencePushConsumer::get_ior (void) const +TAO_Notify_SequencePushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance ()->orb (); @@ -335,7 +335,7 @@ TAO_Notify_SequencePushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* o } CORBA::Object_ptr -TAO_Notify_SequencePushConsumer::get_consumer (void) +TAO_Notify_SequencePushConsumer::get_consumer () { return CosNotifyComm::SequencePushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index 227d634859e..ef090ec4db5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -22,14 +22,14 @@ TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr p } void -TAO_Notify_SequencePushSupplier::release (void) +TAO_Notify_SequencePushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_SequencePushSupplier::get_ior (void) const +TAO_Notify_SequencePushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -46,7 +46,7 @@ TAO_Notify_SequencePushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_SequencePushSupplier::get_supplier (void) +TAO_Notify_SequencePushSupplier::get_supplier () { return CosNotifyComm::SequencePushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp index 42288ac9f09..04276d9b291 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp @@ -3,12 +3,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Service::~TAO_Notify_Service (void) +TAO_Notify_Service::~TAO_Notify_Service () { } TAO_Notify_Service* -TAO_Notify_Service::load_default (void) +TAO_Notify_Service::load_default () { static const char* services[] = { TAO_MC_NOTIFICATION_SERVICE_NAME, TAO_NOTIFICATION_SERVICE_NAME, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp index ea0aa2940e0..31230f40288 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void) +TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp index c321d27da66..e882ee26710 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp @@ -22,7 +22,7 @@ TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const Co } const TAO_Notify_EventType& -TAO_Notify_StructuredEvent_No_Copy::type (void) const +TAO_Notify_StructuredEvent_No_Copy::type () const { return this->type_; } @@ -53,7 +53,7 @@ TAO_Notify_StructuredEvent_No_Copy::unmarshal (TAO_InputCDR & cdr) } TAO_Notify_Event * -TAO_Notify_StructuredEvent_No_Copy::copy (void) const +TAO_Notify_StructuredEvent_No_Copy::copy () const { TAO_Notify_Event * new_event; ACE_NEW_THROW_EX (new_event, diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index dbfe3ba3127..8836af68ee3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void) +TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer () { } @@ -19,14 +19,14 @@ TAO_Notify_StructuredProxyPushConsumer::~TAO_Notify_StructuredProxyPushConsumer } void -TAO_Notify_StructuredProxyPushConsumer::release (void) +TAO_Notify_StructuredProxyPushConsumer::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushConsumer::MyType (void) +TAO_Notify_StructuredProxyPushConsumer::MyType () { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } @@ -63,7 +63,7 @@ TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotifica } void -TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (void) +TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer () { TAO_Notify_StructuredProxyPushConsumer::Ptr guard( this ); this->destroy (); @@ -71,7 +71,7 @@ TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (voi } const char * -TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name (void) const +TAO_Notify_StructuredProxyPushConsumer::get_proxy_type_name () const { return "structured_proxy_push_consumer"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index 4cf50ad0d2f..367c25f3ae5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void) +TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier () { } @@ -18,14 +18,14 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier } void -TAO_Notify_StructuredProxyPushSupplier::release (void) +TAO_Notify_StructuredProxyPushSupplier::release () { delete this; //@@ inform factory } CosNotifyChannelAdmin::ProxyType -TAO_Notify_StructuredProxyPushSupplier::MyType (void) +TAO_Notify_StructuredProxyPushSupplier::MyType () { return CosNotifyChannelAdmin::PUSH_STRUCTURED; } @@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNot } void -TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (void) +TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier () { TAO_Notify_StructuredProxyPushSupplier::Ptr guard( this ); @@ -55,7 +55,7 @@ TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (voi } const char * -TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name (void) const +TAO_Notify_StructuredProxyPushSupplier::get_proxy_type_name () const { return "structured_proxy_push_supplier"; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 69d2a6334a3..cfd6d7b1246 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -73,7 +73,7 @@ TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_p } void -TAO_Notify_StructuredPushConsumer::release (void) +TAO_Notify_StructuredPushConsumer::release () { delete this; //@@ inform factory @@ -161,7 +161,7 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* } ACE_CString -TAO_Notify_StructuredPushConsumer::get_ior (void) const +TAO_Notify_StructuredPushConsumer::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -178,7 +178,7 @@ TAO_Notify_StructuredPushConsumer::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_StructuredPushConsumer::get_consumer (void) +TAO_Notify_StructuredPushConsumer::get_consumer () { return CosNotifyComm::StructuredPushConsumer::_duplicate (this->push_consumer_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 92ab7846873..4eba099e25b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -22,14 +22,14 @@ TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_p } void -TAO_Notify_StructuredPushSupplier::release (void) +TAO_Notify_StructuredPushSupplier::release () { delete this; //@@ inform factory } ACE_CString -TAO_Notify_StructuredPushSupplier::get_ior (void) const +TAO_Notify_StructuredPushSupplier::get_ior () const { ACE_CString result; CORBA::ORB_var orb = TAO_Notify_PROPERTIES::instance()->orb(); @@ -46,7 +46,7 @@ TAO_Notify_StructuredPushSupplier::get_ior (void) const } CORBA::Object_ptr -TAO_Notify_StructuredPushSupplier::get_supplier (void) +TAO_Notify_StructuredPushSupplier::get_supplier () { return CosNotifyComm::StructuredPushSupplier::_duplicate (this->push_supplier_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 98d4536a3ea..dca10de0f28 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -28,7 +28,7 @@ TAO_Notify_Supplier::~TAO_Notify_Supplier () } TAO_Notify_Proxy* -TAO_Notify_Supplier::proxy (void) +TAO_Notify_Supplier::proxy () { return this->proxy_consumer (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 30406d7453a..cb20f513368 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -27,7 +27,7 @@ TAO_Notify_ProxyConsumer_Find_Worker; typedef TAO_Notify_Seq_Worker_T<TAO_Notify_Proxy> TAO_Notify_Proxy_Seq_Worker; -TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin (void) +TAO_Notify_SupplierAdmin::TAO_Notify_SupplierAdmin () : TAO_Notify_Admin () { } @@ -54,26 +54,26 @@ TAO_Notify_SupplierAdmin::init (TAO_Notify_EventChannel *ec) } void -TAO_Notify_SupplierAdmin::_add_ref (void) +TAO_Notify_SupplierAdmin::_add_ref () { this->_incr_refcnt (); } void -TAO_Notify_SupplierAdmin::_remove_ref (void) +TAO_Notify_SupplierAdmin::_remove_ref () { this->_decr_refcnt (); } void -TAO_Notify_SupplierAdmin::release (void) +TAO_Notify_SupplierAdmin::release () { delete this; //@@ inform factory } void -TAO_Notify_SupplierAdmin::destroy (void) +TAO_Notify_SupplierAdmin::destroy () { this->shutdown (); this->ec_->remove (this); @@ -140,7 +140,7 @@ TAO_Notify_SupplierAdmin::set_qos (const CosNotification::QoSProperties & qos) } CosNotification::QoSProperties* -TAO_Notify_SupplierAdmin::get_qos (void) +TAO_Notify_SupplierAdmin::get_qos () { return this->TAO_Notify_Object::get_qos (); } @@ -177,7 +177,7 @@ TAO_Notify_SupplierAdmin::obtain_notification_push_consumer_with_qos (CosNotifyC CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_Notify_SupplierAdmin::obtain_push_consumer (void) +TAO_Notify_SupplierAdmin::obtain_push_consumer () { CosEventChannelAdmin::ProxyPushConsumer_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this); @@ -186,25 +186,25 @@ TAO_Notify_SupplierAdmin::obtain_push_consumer (void) } CosNotifyChannelAdmin::AdminID -TAO_Notify_SupplierAdmin::MyID (void) +TAO_Notify_SupplierAdmin::MyID () { return this->id (); } CosNotifyChannelAdmin::EventChannel_ptr -TAO_Notify_SupplierAdmin::MyChannel (void) +TAO_Notify_SupplierAdmin::MyChannel () { return this->ec_->_this (); } ::CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_SupplierAdmin::MyOperator (void) +TAO_Notify_SupplierAdmin::MyOperator () { return this->filter_operator_; } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin::push_consumers (void) +TAO_Notify_SupplierAdmin::push_consumers () { TAO_Notify_Proxy_Seq_Worker seq_worker; @@ -261,13 +261,13 @@ TAO_Notify_SupplierAdmin::get_filter (CosNotifyFilter::FilterID filter) } ::CosNotifyFilter::FilterIDSeq* -TAO_Notify_SupplierAdmin::get_all_filters (void) +TAO_Notify_SupplierAdmin::get_all_filters () { return this->filter_admin_.get_all_filters (); } void -TAO_Notify_SupplierAdmin::remove_all_filters (void) +TAO_Notify_SupplierAdmin::remove_all_filters () { this->filter_admin_.remove_all_filters (); } @@ -291,13 +291,13 @@ TAO_Notify_SupplierAdmin::find_proxy_consumer ( /************** UNIMPLEMENTED METHODS ***************/ CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_Notify_SupplierAdmin::obtain_pull_consumer (void) +TAO_Notify_SupplierAdmin::obtain_pull_consumer () { throw CORBA::NO_IMPLEMENT (); } CosNotifyChannelAdmin::ProxyIDSeq* -TAO_Notify_SupplierAdmin::pull_consumers (void) +TAO_Notify_SupplierAdmin::pull_consumers () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp index eebc10e0b92..7af192a0761 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void) +TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task () : shutdown_ (false) { } @@ -27,13 +27,13 @@ TAO_Notify_ThreadPool_Task::init (int argc, ACE_TCHAR **argv) } TAO_Notify_Timer* -TAO_Notify_ThreadPool_Task::timer (void) +TAO_Notify_ThreadPool_Task::timer () { return this->timer_.get(); } TAO_Notify_Buffering_Strategy* -TAO_Notify_ThreadPool_Task::buffering_strategy (void) +TAO_Notify_ThreadPool_Task::buffering_strategy () { return this->buffering_strategy_.get (); } @@ -116,7 +116,7 @@ TAO_Notify_ThreadPool_Task::execute (TAO_Notify_Method_Request& method_request) } int -TAO_Notify_ThreadPool_Task::svc (void) +TAO_Notify_ThreadPool_Task::svc () { TAO_Notify_Method_Request_Queueable* method_request = 0; @@ -163,7 +163,7 @@ TAO_Notify_ThreadPool_Task::svc (void) } void -TAO_Notify_ThreadPool_Task::shutdown (void) +TAO_Notify_ThreadPool_Task::shutdown () { if (this->shutdown_) { @@ -176,7 +176,7 @@ TAO_Notify_ThreadPool_Task::shutdown (void) } void -TAO_Notify_ThreadPool_Task::release (void) +TAO_Notify_ThreadPool_Task::release () { delete this; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp index ed37ea1caca..a31eefeea3b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue (void) +TAO_Notify_Timer_Queue::TAO_Notify_Timer_Queue () { } @@ -11,7 +11,7 @@ TAO_Notify_Timer_Queue::~TAO_Notify_Timer_Queue () } void -TAO_Notify_Timer_Queue::release (void) +TAO_Notify_Timer_Queue::release () { delete this; //@@ inform factory @@ -36,7 +36,7 @@ TAO_Notify_Timer_Queue::cancel_timer (long timer_id) } ACE_Timer_Queue& -TAO_Notify_Timer_Queue::impl (void) +TAO_Notify_Timer_Queue::impl () { return this->timer_queue_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp index ef42a417287..ad7e3990a49 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor (void) +TAO_Notify_Timer_Reactor::TAO_Notify_Timer_Reactor () :reactor_ (0) { // Get the ORB @@ -20,7 +20,7 @@ TAO_Notify_Timer_Reactor::~TAO_Notify_Timer_Reactor () } void -TAO_Notify_Timer_Reactor::release (void) +TAO_Notify_Timer_Reactor::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp index d061c815db5..66433ff114b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp @@ -11,7 +11,7 @@ TAO_Notify::Topology_Loader::~Topology_Loader () } void -TAO_Notify::Topology_Loader::close (void) +TAO_Notify::Topology_Loader::close () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index ec88590b269..a330f413c38 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -15,12 +15,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { - Topology_Savable::~Topology_Savable (void) + Topology_Savable::~Topology_Savable () { } void - Topology_Savable::reconnect (void) + Topology_Savable::reconnect () { } @@ -76,14 +76,14 @@ namespace TAO_Notify } bool - Topology_Object::self_change (void) + Topology_Object::self_change () { this->self_changed_ = true; return send_change (); } bool - Topology_Object::send_change (void) + Topology_Object::send_change () { bool saving = false; if (is_persistent ()) @@ -107,7 +107,7 @@ namespace TAO_Notify } bool - Topology_Object::send_deletion_change (void) + Topology_Object::send_deletion_change () { bool saving = false; if (is_persistent ()) @@ -120,7 +120,7 @@ namespace TAO_Notify } bool - Topology_Object::change_to_parent (void) + Topology_Object::change_to_parent () { bool result = false; Topology_Parent * parent = this->topology_parent(); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp index f8ba3dd7751..fc251d262a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp @@ -7,7 +7,7 @@ TAO_Notify::Topology_Saver::~Topology_Saver () } void -TAO_Notify::Topology_Saver::close (void) +TAO_Notify::Topology_Saver::close () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp index 861ebfd7ef5..9a448d90ba1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.cpp @@ -27,13 +27,13 @@ TAO_Notify_validate_client_Task:: } -TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task (void) +TAO_Notify_validate_client_Task::~TAO_Notify_validate_client_Task () { } int -TAO_Notify_validate_client_Task::svc (void) +TAO_Notify_validate_client_Task::svc () { ACE_Time_Value due = ACE_OS::gettimeofday () + this->delay_; while (! this->shutdown_) @@ -74,7 +74,7 @@ TAO_Notify_validate_client_Task::svc (void) void -TAO_Notify_validate_client_Task::shutdown (void) +TAO_Notify_validate_client_Task::shutdown () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *(this->condition_.mutex())); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp index c9fdfc61130..2042dc05389 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Notify_Worker_Task::TAO_Notify_Worker_Task (void) +TAO_Notify_Worker_Task::TAO_Notify_Worker_Task () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp index 5285d07672b..a0c4b0c7f22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp @@ -77,7 +77,7 @@ namespace TAO_Notify if (result) { this->live_ = false; - auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream); + std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream); // xml input source will take ownership if (fstm->open (this->file_name_.c_str ()) == 0) @@ -127,7 +127,7 @@ namespace TAO_Notify ACE_ASSERT (root != 0); this->live_ = true; - auto_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream); + std::unique_ptr<ACEXML_FileCharStream> fstm (new ACEXML_FileCharStream); // xml input source will take ownership if (fstm->open (this->file_name_.c_str ()) == 0) diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp index 4f7207d4118..881c2be3515 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp @@ -41,7 +41,7 @@ namespace TAO_Notify } void - XML_Saver::close (void) + XML_Saver::close () { if (this->close_out_ && this->output_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp index 456032c58ab..56258982147 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp @@ -70,7 +70,7 @@ namespace namespace TAO_PG { - Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy (void) + Fragments_Cleanup_Strategy::~Fragments_Cleanup_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 22845604ce4..a409ee0873c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -82,7 +82,7 @@ TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name, { } -TAO_GOA::~TAO_GOA (void) +TAO_GOA::~TAO_GOA () { } @@ -211,7 +211,7 @@ TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPoli #endif /* TAO_HAS_MINIMUM_POA == 0 */ char * -TAO_GOA::the_name (void) +TAO_GOA::the_name () { char * name = this->TAO_Regular_POA::the_name (); @@ -219,7 +219,7 @@ TAO_GOA::the_name (void) } PortableServer::POA_ptr -TAO_GOA::the_parent (void) +TAO_GOA::the_parent () { PortableServer::POA_ptr parent = this->TAO_Regular_POA::the_parent (); @@ -227,7 +227,7 @@ TAO_GOA::the_parent (void) } PortableServer::POAList * -TAO_GOA::the_children (void) +TAO_GOA::the_children () { PortableServer::POAList *children = this->TAO_Regular_POA::the_children (); @@ -235,7 +235,7 @@ TAO_GOA::the_children (void) } PortableServer::POAManager_ptr -TAO_GOA::the_POAManager (void) +TAO_GOA::the_POAManager () { PortableServer::POAManager_ptr poa_manager = this->TAO_Regular_POA::the_POAManager (); @@ -246,7 +246,7 @@ TAO_GOA::the_POAManager (void) #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::AdapterActivator_ptr -TAO_GOA::the_activator (void) +TAO_GOA::the_activator () { PortableServer::AdapterActivator_ptr activator = this->TAO_Regular_POA::the_activator (); @@ -260,7 +260,7 @@ TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator) } PortableServer::ServantManager_ptr -TAO_GOA::get_servant_manager (void) +TAO_GOA::get_servant_manager () { PortableServer::ServantManager_ptr servant_manager = this->TAO_Regular_POA::get_servant_manager (); @@ -274,7 +274,7 @@ TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr) } PortableServer::Servant -TAO_GOA::get_servant (void) +TAO_GOA::get_servant () { PortableServer::Servant servant = this->TAO_Regular_POA::get_servant (); @@ -378,7 +378,7 @@ TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid) } CORBA::OctetSeq * -TAO_GOA::id (void) +TAO_GOA::id () { return this->TAO_Regular_POA::id (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp index 444629713cc..3522317ef20 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { /*static*/ int - MIOP_Loader::Initializer (void) + MIOP_Loader::Initializer () { ACE_Service_Config::process_directive ( ace_svc_desc_TAO_PortableGroup_Loader); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp index d5d09e51d8e..92743a6b5b8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) +TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator () : membership_ (1), factories_ (1) { @@ -14,7 +14,7 @@ TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void) this->factories_[0].id = CORBA::string_dup ("org.omg.PortableGroup.Factories"); } -TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator (void) +TAO_PG_Default_Property_Validator::~TAO_PG_Default_Property_Validator () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 87f2526b88c..8be0a079531 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -56,7 +56,7 @@ TAO::PG_FactoryRegistry::PG_FactoryRegistry (const char * name) { } -TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void) +TAO::PG_FactoryRegistry::~PG_FactoryRegistry () { } @@ -111,7 +111,7 @@ const char * TAO::PG_FactoryRegistry::identity () const return this->identity_.c_str(); } -void TAO::PG_FactoryRegistry::_remove_ref (void) +void TAO::PG_FactoryRegistry::_remove_ref () { this->quit_state_ = GONE; } @@ -135,7 +135,7 @@ int TAO::PG_FactoryRegistry::idle (int & result) } -int TAO::PG_FactoryRegistry::fini (void) +int TAO::PG_FactoryRegistry::fini () { if (this->ior_output_file_ != 0) { @@ -284,7 +284,7 @@ void TAO::PG_FactoryRegistry::register_factory ( METHOD_ENTRY(TAO::PG_FactoryRegistry::register_factory); RoleInfo * role_info = 0; - auto_ptr<RoleInfo> safe_entry; + std::unique_ptr<RoleInfo> safe_entry; if (this->registry_.find(role, role_info) != 0) { ORBSVCS_DEBUG(( LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index d4f2fdc2541..78225419532 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -24,7 +24,7 @@ TAO_PG_GenericFactory::TAO_PG_GenericFactory ( this->object_group_manager_.generic_factory (this); } -TAO_PG_GenericFactory::~TAO_PG_GenericFactory (void) +TAO_PG_GenericFactory::~TAO_PG_GenericFactory () { TAO_PG_Factory_Map::iterator end = this->factory_map_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index 4d5b68919d8..7d9d138d90e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -59,7 +59,7 @@ TAO::PG_Group_Factory::PG_Group_Factory () { } -TAO::PG_Group_Factory::~PG_Group_Factory (void) +TAO::PG_Group_Factory::~PG_Group_Factory () { for (Group_Map_Iterator it = this->group_map_.begin (); it != this->group_map_.end (); @@ -325,7 +325,7 @@ TAO::PG_Group_Factory::groups_at_location ( } PortableGroup::ObjectGroups * -TAO::PG_Group_Factory::all_groups (void) +TAO::PG_Group_Factory::all_groups () { Group_Map & group_map = this->get_group_map (); CORBA::ULong const upper_limit = static_cast<CORBA::ULong> (group_map.current_size ()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp index 9ec99126a3c..66d40b0fe15 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp @@ -19,7 +19,7 @@ TAO_PG_Group_Guard::TAO_PG_Group_Guard ( { } -TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void) +TAO_PG_Group_Guard::~TAO_PG_Group_Guard () { if (!this->released_) { @@ -41,7 +41,7 @@ TAO_PG_Group_Guard::~TAO_PG_Group_Guard (void) } void -TAO_PG_Group_Guard::release (void) +TAO_PG_Group_Guard::release () { this->released_ = true; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index b1705e94a87..72065e982b1 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) +TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager () : poa_ (), object_group_map_ (TAO_PG_MAX_OBJECT_GROUPS), location_map_ (TAO_PG_MAX_LOCATIONS), @@ -21,7 +21,7 @@ TAO_PG_ObjectGroupManager::TAO_PG_ObjectGroupManager (void) { } -TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager (void) +TAO_PG_ObjectGroupManager::~TAO_PG_ObjectGroupManager () { for (TAO_PG_Location_Map::iterator i = this->location_map_.begin (); i != this->location_map_.end (); @@ -171,7 +171,7 @@ TAO_PG_ObjectGroupManager::add_member_i ( ENOMEM), CORBA::COMPLETED_NO)); - auto_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups); + std::unique_ptr<TAO_PG_ObjectGroup_Array> safe_groups (groups); // This should not fail! if (this->location_map_.bind (the_location, groups) != 0) @@ -490,7 +490,7 @@ TAO_PG_ObjectGroupManager::create_object_group ( ENOMEM), CORBA::COMPLETED_NO)); - auto_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry); + std::unique_ptr<TAO_PG_ObjectGroup_Map_Entry> safe_group_entry (group_entry); // Set the RepositoryId associated with the created ObjectGroup_Map // entry. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp index 4586255f5d4..3e660dde88e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void) +TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 3b2a7dfc988..802d3f6f1f9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -41,7 +41,7 @@ TAO::PG_Object_Group::MemberInfo::MemberInfo ( { } -TAO::PG_Object_Group::MemberInfo::~MemberInfo (void) +TAO::PG_Object_Group::MemberInfo::~MemberInfo () { if( ! CORBA::is_nil (this->factory_.in())) { @@ -103,7 +103,7 @@ TAO::PG_Object_Group::PG_Object_Group ( { } -TAO::PG_Object_Group::~PG_Object_Group (void) +TAO::PG_Object_Group::~PG_Object_Group () { if (TAO_debug_level > 3) ORBSVCS_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ dump_ior (const char * base, #endif // may want this again someday PortableGroup::ObjectGroup_ptr -TAO::PG_Object_Group::reference (void) const +TAO::PG_Object_Group::reference () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -155,7 +155,7 @@ TAO::PG_Object_Group::get_group_specific_factories ( } const PortableGroup::Location & -TAO::PG_Object_Group::get_primary_location (void) +TAO::PG_Object_Group::get_primary_location () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -450,7 +450,7 @@ TAO::PG_Object_Group::remove_member ( PortableGroup::ObjectGroupId -TAO::PG_Object_Group::get_object_group_id (void) const +TAO::PG_Object_Group::get_object_group_id () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -480,7 +480,7 @@ TAO::PG_Object_Group::get_properties ( PortableGroup::TypeId -TAO::PG_Object_Group::get_type_id (void) const +TAO::PG_Object_Group::get_type_id () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -494,7 +494,7 @@ TAO::PG_Object_Group::get_type_id (void) const // Internal method int -TAO::PG_Object_Group::increment_version (void) +TAO::PG_Object_Group::increment_version () { // assume internals is locked int result = 0; @@ -520,7 +520,7 @@ TAO::PG_Object_Group::increment_version (void) ////////////////// // Internal method void -TAO::PG_Object_Group::distribute_iogr (void) +TAO::PG_Object_Group::distribute_iogr () { // Check if the object group is configured to distribute if (!this->distribute_) @@ -584,7 +584,7 @@ TAO::PG_Object_Group::distribute_iogr (void) } PortableGroup::Locations * -TAO::PG_Object_Group::locations_of_members (void) +TAO::PG_Object_Group::locations_of_members () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -640,7 +640,7 @@ TAO::PG_Object_Group::get_member_reference ( PortableGroup::MembershipStyleValue -TAO::PG_Object_Group::get_membership_style (void) const +TAO::PG_Object_Group::get_membership_style () const { PortableGroup::MembershipStyleValue membership_style = 0; if (!TAO::find (properties_, @@ -654,7 +654,7 @@ TAO::PG_Object_Group::get_membership_style (void) const PortableGroup::MinimumNumberMembersValue -TAO::PG_Object_Group::get_minimum_number_members (void) const +TAO::PG_Object_Group::get_minimum_number_members () const { PortableGroup::MinimumNumberMembersValue minimum_number_members = 0; if (!TAO::find (properties_, @@ -667,7 +667,7 @@ TAO::PG_Object_Group::get_minimum_number_members (void) const } PortableGroup::InitialNumberMembersValue -TAO::PG_Object_Group::get_initial_number_members (void) const +TAO::PG_Object_Group::get_initial_number_members () const { PortableGroup::InitialNumberMembersValue initial_number_members = 0; if (!TAO::find (properties_, @@ -859,7 +859,7 @@ TAO::PG_Object_Group::create_members (size_t count) } void -TAO::PG_Object_Group::initial_populate (void) +TAO::PG_Object_Group::initial_populate () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -876,7 +876,7 @@ TAO::PG_Object_Group::initial_populate (void) } void -TAO::PG_Object_Group::minimum_populate (void) +TAO::PG_Object_Group::minimum_populate () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); @@ -913,13 +913,13 @@ TAO::PG_Object_Group::set_name (const char* group_name) } const char* -TAO::PG_Object_Group::get_name (void) +TAO::PG_Object_Group::get_name () { return group_name_; } void -TAO::PG_Object_Group::clear_members_map (void) +TAO::PG_Object_Group::clear_members_map () { for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp index e27cc9adfbb..a1822362dce 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp @@ -307,7 +307,7 @@ TAO::PG_Object_Group_Storable::PG_Object_Group_Storable ( } } -TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable (void) +TAO::PG_Object_Group_Storable::~PG_Object_Group_Storable () { if (destroyed_) { @@ -330,7 +330,7 @@ TAO::PG_Object_Group_Storable::set_destroyed (bool destroyed) } const PortableGroup::Location & -TAO::PG_Object_Group_Storable::get_primary_location (void) +TAO::PG_Object_Group_Storable::get_primary_location () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return TAO::PG_Object_Group::get_primary_location (); @@ -369,7 +369,7 @@ TAO::PG_Object_Group_Storable::remove_member ( PortableGroup::Locations * -TAO::PG_Object_Group_Storable::locations_of_members (void) +TAO::PG_Object_Group_Storable::locations_of_members () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return PG_Object_Group::locations_of_members (); @@ -397,14 +397,14 @@ TAO::PG_Object_Group_Storable::set_name (const char* group_name) } const char* -TAO::PG_Object_Group_Storable::get_name (void) +TAO::PG_Object_Group_Storable::get_name () { Object_Group_File_Guard fg (*this, SFG::ACCESSOR); return PG_Object_Group::get_name (); } void -TAO::PG_Object_Group_Storable::initial_populate (void) +TAO::PG_Object_Group_Storable::initial_populate () { Object_Group_File_Guard fg (*this, SFG::MUTATOR); PG_Object_Group::initial_populate (); @@ -412,7 +412,7 @@ TAO::PG_Object_Group_Storable::initial_populate (void) } void -TAO::PG_Object_Group_Storable::minimum_populate (void) +TAO::PG_Object_Group_Storable::minimum_populate () { Object_Group_File_Guard fg (*this, SFG::MUTATOR); PG_Object_Group::minimum_populate (); @@ -650,7 +650,7 @@ TAO::PG_Object_Group_Storable::stale () } void -TAO::PG_Object_Group_Storable::state_written (void) +TAO::PG_Object_Group_Storable::state_written () { // No-op. Overridden by derived class. } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 4e73825d981..80a0e8106a7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) +TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index e3555148867..8b73a3b75d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -12,11 +12,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void) +TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry () { } -TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void) +TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry () { // Free the memory for the endpoints. Entry *entry; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp index 4fd1aabc5d6..94e4938aae6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp @@ -8,7 +8,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void) +TAO_PortableGroup_Loader::TAO_PortableGroup_Loader () { } @@ -47,7 +47,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/, } int -TAO_PortableGroup_Loader::Initializer (void) +TAO_PortableGroup_Loader::Initializer () { ACE_Service_Config::process_directive (ace_svc_desc_TAO_PortableGroup_Loader); ACE_Service_Config::process_directive (ace_svc_desc_TAO_MIOP_Resource_Factory); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp index ed7036f2259..4e2c4c5dfe6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void) +PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher () { } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 225346a2fa5..8d40234ec16 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -11,7 +11,7 @@ TAO_Portable_Group_Map::TAO_Portable_Group_Map () } /// Destructor. -TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void) +TAO_Portable_Group_Map::~TAO_Portable_Group_Map () { for (Iterator i = this->map_.begin (); i != this->map_.end (); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index 451189b1a2c..914c86dad84 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -28,7 +28,7 @@ TAO_UIPMC_Acceptor::TAO_UIPMC_Acceptor ( { } -TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor (void) +TAO_UIPMC_Acceptor::~TAO_UIPMC_Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -70,7 +70,7 @@ TAO_UIPMC_Acceptor::is_collocated (const TAO_Endpoint *) } int -TAO_UIPMC_Acceptor::close (void) +TAO_UIPMC_Acceptor::close () { return 0; } @@ -363,7 +363,7 @@ TAO_UIPMC_Acceptor::dotted_decimal_address ( } CORBA::ULong -TAO_UIPMC_Acceptor::endpoint_count (void) +TAO_UIPMC_Acceptor::endpoint_count () { return this->endpoint_count_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp index 8a4113bcbdd..600caa4254e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp @@ -46,7 +46,7 @@ TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (TAO_ORB_Core *orb_co this->transport (specific_transport); } -TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void) +TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler () { delete this->transport (); int const result = @@ -62,7 +62,7 @@ TAO_UIPMC_Connection_Handler::~TAO_UIPMC_Connection_Handler (void) } const ACE_INET_Addr & -TAO_UIPMC_Connection_Handler::addr (void) const +TAO_UIPMC_Connection_Handler::addr () const { return this->addr_; } @@ -74,7 +74,7 @@ TAO_UIPMC_Connection_Handler::addr (const ACE_INET_Addr &addr) } const ACE_INET_Addr & -TAO_UIPMC_Connection_Handler::local_addr (void) const +TAO_UIPMC_Connection_Handler::local_addr () const { return this->local_addr_; } @@ -86,7 +86,7 @@ TAO_UIPMC_Connection_Handler::local_addr (const ACE_INET_Addr &addr) } u_long -TAO_UIPMC_Connection_Handler::send_hi_water_mark (void) const +TAO_UIPMC_Connection_Handler::send_hi_water_mark () const { return this->send_hi_water_mark_; } @@ -321,13 +321,13 @@ TAO_UIPMC_Connection_Handler::open (void*) } int -TAO_UIPMC_Connection_Handler::resume_handler (void) +TAO_UIPMC_Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO_UIPMC_Connection_Handler::close_connection (void) +TAO_UIPMC_Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -395,13 +395,13 @@ TAO_UIPMC_Connection_Handler::close (u_long flags) } int -TAO_UIPMC_Connection_Handler::release_os_resources (void) +TAO_UIPMC_Connection_Handler::release_os_resources () { return this->peer ().close (); } int -TAO_UIPMC_Connection_Handler::add_transport_to_cache (void) +TAO_UIPMC_Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 0f810879769..7dfe87e1e95 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -16,12 +16,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Connector::TAO_UIPMC_Connector (void) +TAO_UIPMC_Connector::TAO_UIPMC_Connector () : TAO_Connector (IOP::TAG_UIPMC) { } -TAO_UIPMC_Connector::~TAO_UIPMC_Connector (void) +TAO_UIPMC_Connector::~TAO_UIPMC_Connector () { } @@ -38,7 +38,7 @@ TAO_UIPMC_Connector::open (TAO_ORB_Core *orb_core) } int -TAO_UIPMC_Connector::close (void) +TAO_UIPMC_Connector::close () { return 0; } @@ -293,7 +293,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO_UIPMC_Connector::make_profile (void) +TAO_UIPMC_Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -336,7 +336,7 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint) } char -TAO_UIPMC_Connector::object_key_delimiter (void) const +TAO_UIPMC_Connector::object_key_delimiter () const { return TAO_UIPMC_Profile::object_key_delimiter_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index a2eeaa473e3..24d0573bb7d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (void) +TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint () : TAO_Endpoint (IOP::TAG_UIPMC), host_ (), port_ (0), @@ -55,7 +55,7 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], this->update_object_addr (); } -TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint (void) +TAO_UIPMC_Endpoint::~TAO_UIPMC_Endpoint () { delete this->next_; } @@ -72,7 +72,7 @@ TAO_UIPMC_Endpoint::object_addr (const ACE_INET_Addr &addr) } const char * -TAO_UIPMC_Endpoint::host (void) const +TAO_UIPMC_Endpoint::host () const { return this->host_.in (); } @@ -112,13 +112,13 @@ TAO_UIPMC_Endpoint::addr_to_string (char *buffer, size_t length) } TAO_Endpoint * -TAO_UIPMC_Endpoint::next (void) +TAO_UIPMC_Endpoint::next () { return this->next_; } TAO_Endpoint * -TAO_UIPMC_Endpoint::duplicate (void) +TAO_UIPMC_Endpoint::duplicate () { TAO_UIPMC_Endpoint *endpoint = 0; @@ -144,7 +144,7 @@ TAO_UIPMC_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } CORBA::ULong -TAO_UIPMC_Endpoint::hash (void) +TAO_UIPMC_Endpoint::hash () { if (this->hash_val_ != 0) return this->hash_val_; @@ -239,14 +239,14 @@ TAO_UIPMC_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } bool -TAO_UIPMC_Endpoint::is_preferred_network (void) const +TAO_UIPMC_Endpoint::is_preferred_network () const { return (this->preferred_path_.host.in () != 0 && this->preferred_path_.host.in ()[0] != 0); } const char * -TAO_UIPMC_Endpoint::preferred_network (void) const +TAO_UIPMC_Endpoint::preferred_network () const { return this->preferred_path_.host.in (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 465b82b3e27..a520483be08 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -12,7 +12,7 @@ static const char the_prefix[] = "uipmc"; TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) +TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory () : TAO_Protocol_Factory (IOP::TAG_UIPMC), // major_ (TAO_DEF_GIOP_MAJOR), // minor_ (TAO_DEF_GIOP_MINOR), @@ -21,7 +21,7 @@ TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void) { } -TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory (void) +TAO_UIPMC_Protocol_Factory::~TAO_UIPMC_Protocol_Factory () { } @@ -33,19 +33,19 @@ TAO_UIPMC_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_UIPMC_Protocol_Factory::prefix (void) const +TAO_UIPMC_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_UIPMC_Protocol_Factory::options_delimiter (void) const +TAO_UIPMC_Protocol_Factory::options_delimiter () const { return '/'; } TAO_Acceptor * -TAO_UIPMC_Protocol_Factory::make_acceptor (void) +TAO_UIPMC_Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; ACE_NEW_RETURN (acceptor, @@ -127,7 +127,7 @@ TAO_UIPMC_Protocol_Factory::init (int argc, } TAO_Connector * -TAO_UIPMC_Protocol_Factory::make_connector (void) +TAO_UIPMC_Protocol_Factory::make_connector () { // This is done only once when the library is loaded and // only on the client side. @@ -141,7 +141,7 @@ TAO_UIPMC_Protocol_Factory::make_connector (void) } int -TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_UIPMC_Protocol_Factory::requires_explicit_endpoint () const { // A multicast endpoint can't be picked automatically in the // pluggable protocol framework. It must be determined from diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index ada29cd487f..23535a98d17 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -56,7 +56,7 @@ TAO_UIPMC_Mcast_Connection_Handler::TAO_UIPMC_Mcast_Connection_Handler ( this->transport (specific_transport); } -TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void) +TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler () { delete this->transport (); int const result = @@ -72,7 +72,7 @@ TAO_UIPMC_Mcast_Connection_Handler::~TAO_UIPMC_Mcast_Connection_Handler (void) } const ACE_INET_Addr & -TAO_UIPMC_Mcast_Connection_Handler::addr (void) const +TAO_UIPMC_Mcast_Connection_Handler::addr () const { return this->addr_; } @@ -84,7 +84,7 @@ TAO_UIPMC_Mcast_Connection_Handler::addr (const ACE_INET_Addr &addr) } const ACE_INET_Addr & -TAO_UIPMC_Mcast_Connection_Handler::local_addr (void) const +TAO_UIPMC_Mcast_Connection_Handler::local_addr () const { return this->local_addr_; } @@ -239,13 +239,13 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) } int -TAO_UIPMC_Mcast_Connection_Handler::resume_handler (void) +TAO_UIPMC_Mcast_Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO_UIPMC_Mcast_Connection_Handler::close_connection (void) +TAO_UIPMC_Mcast_Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -314,13 +314,13 @@ TAO_UIPMC_Mcast_Connection_Handler::close (u_long flags) } int -TAO_UIPMC_Mcast_Connection_Handler::release_os_resources (void) +TAO_UIPMC_Mcast_Connection_Handler::release_os_resources () { return this->peer ().close (); } int -TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache (void) +TAO_UIPMC_Mcast_Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp index 71de66ca660..942408b46c3 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp @@ -29,7 +29,7 @@ TAO_UIPMC_Mcast_Transport::TAO_UIPMC_Mcast_Transport ( TAO_UIPMC_Wait_Never (this)); } -TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport (void) +TAO_UIPMC_Mcast_Transport::~TAO_UIPMC_Mcast_Transport () { // Cleanup all packets. this->cleanup_packets (false); @@ -88,13 +88,13 @@ TAO_UIPMC_Mcast_Transport::cleanup_packets (bool expired_only) } ACE_Event_Handler * -TAO_UIPMC_Mcast_Transport::event_handler_i (void) +TAO_UIPMC_Mcast_Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO_UIPMC_Mcast_Transport::connection_handler_i (void) +TAO_UIPMC_Mcast_Transport::connection_handler_i () { return this->connection_handler_; } @@ -605,7 +605,7 @@ TAO_UIPMC_Mcast_Transport::handle_input ( } int -TAO_UIPMC_Mcast_Transport::register_handler (void) +TAO_UIPMC_Mcast_Transport::register_handler () { // We never register the handler with the reactor // as we never need to be informed about any incoming data, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 5090520c7c5..3724b0ab006 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_UIPMC_Profile::object_key_delimiter_ = '/'; char -TAO_UIPMC_Profile::object_key_delimiter (void) const +TAO_UIPMC_Profile::object_key_delimiter () const { return TAO_UIPMC_Profile::object_key_delimiter_; } @@ -85,7 +85,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4], this->addressing_mode_ = default_addressing_mode_; } -TAO_UIPMC_Profile::~TAO_UIPMC_Profile (void) +TAO_UIPMC_Profile::~TAO_UIPMC_Profile () { } @@ -157,7 +157,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr) } int -TAO_UIPMC_Profile::decode_endpoints (void) +TAO_UIPMC_Profile::decode_endpoints () { ACE_NOTSUP_RETURN (-1); } @@ -528,25 +528,25 @@ TAO_UIPMC_Profile::hash (CORBA::ULong max) } TAO_Endpoint* -TAO_UIPMC_Profile::endpoint (void) +TAO_UIPMC_Profile::endpoint () { return &this->endpoint_; } int -TAO_UIPMC_Profile::encode_endpoints (void) +TAO_UIPMC_Profile::encode_endpoints () { return 1; } CORBA::ULong -TAO_UIPMC_Profile::endpoint_count (void) const +TAO_UIPMC_Profile::endpoint_count () const { return 1; } char * -TAO_UIPMC_Profile::to_string (void) const +TAO_UIPMC_Profile::to_string () const { // corbaloc:miop:1.0@1.0-group_id-1-1/host:port @@ -617,13 +617,13 @@ TAO_UIPMC_Profile::to_string (void) const } const char * -TAO_UIPMC_Profile::prefix (void) +TAO_UIPMC_Profile::prefix () { return ::the_prefix; } IOP::TaggedProfile & -TAO_UIPMC_Profile::create_tagged_profile (void) +TAO_UIPMC_Profile::create_tagged_profile () { // Check whether we have already created the TaggedProfile if (this->tagged_profile_.profile_data.length () == 0) @@ -695,7 +695,7 @@ TAO_UIPMC_Profile::set_group_info ( } void -TAO_UIPMC_Profile::update_cached_group_component (void) +TAO_UIPMC_Profile::update_cached_group_component () { PortableGroup::TagGroupTaggedComponent group; @@ -770,7 +770,7 @@ TAO_UIPMC_Profile::request_target_specifier ( } int -TAO_UIPMC_Profile::supports_multicast (void) const +TAO_UIPMC_Profile::supports_multicast () const { // Yes! We support multicast! return 1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index e156ec4c373..d7a8006d3df 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -35,18 +35,18 @@ TAO_UIPMC_Transport::TAO_UIPMC_Transport ( this->uuid_hash_ = uuid.to_string ()->hash (); } -TAO_UIPMC_Transport::~TAO_UIPMC_Transport (void) +TAO_UIPMC_Transport::~TAO_UIPMC_Transport () { } ACE_Event_Handler * -TAO_UIPMC_Transport::event_handler_i (void) +TAO_UIPMC_Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO_UIPMC_Transport::connection_handler_i (void) +TAO_UIPMC_Transport::connection_handler_i () { return this->connection_handler_; } @@ -421,7 +421,7 @@ TAO_UIPMC_Transport::recv ( } int -TAO_UIPMC_Transport::register_handler (void) +TAO_UIPMC_Transport::register_handler () { // We never register the handler with the reactor // as we never need to be informed about any incoming data, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp index c72f45795f1..c0d9b19aa45 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.cpp @@ -16,20 +16,20 @@ namespace TAO_PG { } - UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard (void) + UIPMC_Recv_Packet_Cleanup_Guard::~UIPMC_Recv_Packet_Cleanup_Guard () { // Cleanup only expired packets. this->transport_->cleanup_packets (true); } - UIPMC_Recv_Packet::UIPMC_Recv_Packet (void) + UIPMC_Recv_Packet::UIPMC_Recv_Packet () : last_fragment_id_ (0) , data_length_ (0) , started_ (ACE_OS::gettimeofday ()) { } - UIPMC_Recv_Packet::~UIPMC_Recv_Packet (void) + UIPMC_Recv_Packet::~UIPMC_Recv_Packet () { for (Fragments_Map::iterator iter = this->fragments_.begin (); iter != this->fragments_.end (); @@ -100,13 +100,13 @@ namespace TAO_PG } ACE_Time_Value const & - UIPMC_Recv_Packet::started (void) const + UIPMC_Recv_Packet::started () const { return this->started_; } CORBA::ULong - UIPMC_Recv_Packet::data_length (void) const + UIPMC_Recv_Packet::data_length () const { return this->data_length_; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp index a539bfecc1d..1c6f19f8f98 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp @@ -10,24 +10,24 @@ TAO_UIPMC_Wait_Never::TAO_UIPMC_Wait_Never (TAO_Transport *transport) { } -TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never (void) +TAO_UIPMC_Wait_Never::~TAO_UIPMC_Wait_Never () { } int -TAO_UIPMC_Wait_Never::register_handler (void) +TAO_UIPMC_Wait_Never::register_handler () { return -1; } bool -TAO_UIPMC_Wait_Never::non_blocking (void) const +TAO_UIPMC_Wait_Never::non_blocking () const { return true; } bool -TAO_UIPMC_Wait_Never::can_process_upcalls (void) const +TAO_UIPMC_Wait_Never::can_process_upcalls () const { return true; } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp index c9ae98313b7..7cf473067bf 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/miop_resource.cpp @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void) +TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory () : fragments_cleanup_strategy_type_ (TAO_MIOP_CLEANUP_TIME_BOUND) , fragments_cleanup_bound_ (-1) , fragments_cleanup_strategy_ (0) @@ -24,7 +24,7 @@ TAO_MIOP_Resource_Factory::TAO_MIOP_Resource_Factory (void) { } -TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory (void) +TAO_MIOP_Resource_Factory::~TAO_MIOP_Resource_Factory () { delete this->fragments_cleanup_strategy_; } @@ -284,7 +284,7 @@ TAO_MIOP_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) } TAO_PG::Fragments_Cleanup_Strategy * -TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const +TAO_MIOP_Resource_Factory::fragments_cleanup_strategy () const { if (this->fragments_cleanup_strategy_ == 0) { @@ -330,19 +330,19 @@ TAO_MIOP_Resource_Factory::fragments_cleanup_strategy (void) const } u_long -TAO_MIOP_Resource_Factory::max_fragment_size (void) const +TAO_MIOP_Resource_Factory::max_fragment_size () const { return this->max_fragment_size_; } u_long -TAO_MIOP_Resource_Factory::max_fragments (void) const +TAO_MIOP_Resource_Factory::max_fragments () const { return this->max_fragments_; } u_long -TAO_MIOP_Resource_Factory::max_fragment_rate (void) const +TAO_MIOP_Resource_Factory::max_fragment_rate () const { // If "max_fragment_rate_" is not specified (i.e. zero) // use the same value as "max_fragment_size_". @@ -352,31 +352,31 @@ TAO_MIOP_Resource_Factory::max_fragment_rate (void) const } u_long -TAO_MIOP_Resource_Factory::send_hi_water_mark (void) const +TAO_MIOP_Resource_Factory::send_hi_water_mark () const { return this->send_hi_water_mark_; } u_long -TAO_MIOP_Resource_Factory::send_buffer_size (void) const +TAO_MIOP_Resource_Factory::send_buffer_size () const { return send_buffer_size_; } u_long -TAO_MIOP_Resource_Factory::receive_buffer_size (void) const +TAO_MIOP_Resource_Factory::receive_buffer_size () const { return receive_buffer_size_; } bool -TAO_MIOP_Resource_Factory::enable_throttling (void) const +TAO_MIOP_Resource_Factory::enable_throttling () const { return enable_throttling_; } bool -TAO_MIOP_Resource_Factory::enable_eager_dequeue (void) const +TAO_MIOP_Resource_Factory::enable_eager_dequeue () const { return enable_eager_dequeue_; } diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index 2cba0dcae08..6a639dd6394 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // = Methods to deal with ACE_Hash_Map_Manager. -CosProperty_Hash_Key::CosProperty_Hash_Key (void) +CosProperty_Hash_Key::CosProperty_Hash_Key () { } @@ -47,20 +47,20 @@ CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const } u_long -CosProperty_Hash_Key::hash (void) const +CosProperty_Hash_Key::hash () const { u_long ret = ACE::hash_pjw (this->pname_); return ret; } -CosProperty_Hash_Key::~CosProperty_Hash_Key (void) +CosProperty_Hash_Key::~CosProperty_Hash_Key () { } //====================================================================== -CosProperty_Hash_Value::CosProperty_Hash_Value (void) +CosProperty_Hash_Value::CosProperty_Hash_Value () { } @@ -77,19 +77,19 @@ CosProperty_Hash_Value::CosProperty_Hash_Value (const CosProperty_Hash_Value &sr { } -CosProperty_Hash_Value::~CosProperty_Hash_Value (void) +CosProperty_Hash_Value::~CosProperty_Hash_Value () { } //====================================================================== // Constructor. -TAO_PropertySetFactory::TAO_PropertySetFactory (void) +TAO_PropertySetFactory::TAO_PropertySetFactory () { } // Destructor. -TAO_PropertySetFactory::~TAO_PropertySetFactory (void) +TAO_PropertySetFactory::~TAO_PropertySetFactory () { } @@ -99,7 +99,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void) // things. CosPropertyService::PropertySet_ptr -TAO_PropertySetFactory::create_propertyset (void) +TAO_PropertySetFactory::create_propertyset () { // New a TAO_PropertySet. TAO_PropertySet *new_set; @@ -201,7 +201,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr } // Destructor. -TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void) +TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory () { // Release all the new'ed products. for (CORBA::ULong pi = 0; @@ -213,7 +213,7 @@ TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void) //====================================================================== // Constrctor. -TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) +TAO_PropertySetDefFactory::TAO_PropertySetDefFactory () { } @@ -223,7 +223,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void) // delete all these New'ed things. CosPropertyService::PropertySetDef_ptr -TAO_PropertySetDefFactory::create_propertysetdef (void) +TAO_PropertySetDefFactory::create_propertysetdef () { // New a TAO_PropertySetDef. TAO_PropertySetDef *new_set; @@ -330,7 +330,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi // Makes default sized hash_table_. All the sequences are set the max // length as 0. -TAO_PropertySet::TAO_PropertySet (void) +TAO_PropertySet::TAO_PropertySet () { } @@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_p // Destructor. All sequences will be deleted. -TAO_PropertySet::~TAO_PropertySet (void) +TAO_PropertySet::~TAO_PropertySet () { } @@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope CORBA::ULong -TAO_PropertySet::get_number_of_properties (void) +TAO_PropertySet::get_number_of_properties () { return static_cast<CORBA::ULong> (this->hash_table_.current_size ()); } @@ -990,7 +990,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro CORBA::Boolean -TAO_PropertySet::delete_all_properties (void) +TAO_PropertySet::delete_all_properties () { // Get all the property names in a names' sequence. CosPropertyService::PropertyNames *names_ptr = 0; @@ -1043,7 +1043,7 @@ TAO_PropertySet::operator= (const TAO_PropertySet &) // Makes default sized hash_table_. -TAO_PropertySetDef::TAO_PropertySetDef (void) +TAO_PropertySetDef::TAO_PropertySetDef () { } @@ -1082,7 +1082,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs i // Destructor. -TAO_PropertySetDef::~TAO_PropertySetDef (void) +TAO_PropertySetDef::~TAO_PropertySetDef () { } @@ -1521,7 +1521,7 @@ TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_ // Destructor. -TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) +TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator () { } @@ -1529,7 +1529,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void) // one exists. void -TAO_PropertyNamesIterator::reset (void) +TAO_PropertyNamesIterator::reset () { this->iterator_ = this->iterator_.map ().begin (); } @@ -1589,7 +1589,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertyNamesIterator::destroy (void) +TAO_PropertyNamesIterator::destroy () { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests @@ -1609,12 +1609,12 @@ TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set) { } -TAO_PropertiesIterator::~TAO_PropertiesIterator (void) +TAO_PropertiesIterator::~TAO_PropertiesIterator () { } void -TAO_PropertiesIterator::reset (void) +TAO_PropertiesIterator::reset () { this->iterator_ = this->iterator_.map ().begin (); } @@ -1681,7 +1681,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, } void -TAO_PropertiesIterator::destroy (void) +TAO_PropertiesIterator::destroy () { // Remove self from POA. Because of reference counting, the POA // will automatically delete the servant when all pending requests diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index f90a7ee5404..5538284fe7f 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -422,7 +422,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit // to the number returned, inclusive. RtecScheduler::Preemption_Priority_t -ACE_Runtime_Scheduler::last_scheduled_priority (void) +ACE_Runtime_Scheduler::last_scheduled_priority () { // throw an exception if a valid schedule has not been loaded if (config_count_ <= 0) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp index a22952b17a2..4ab2c1e9f72 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void) +TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor () : TAO_IIOP_Acceptor (), base_acceptor_ (), creation_strategy_ (0), @@ -13,7 +13,7 @@ TAO::IIOP_SSL_Acceptor::IIOP_SSL_Acceptor (void) { } -TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void) +TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -25,7 +25,7 @@ TAO::IIOP_SSL_Acceptor::~IIOP_SSL_Acceptor (void) } int -TAO::IIOP_SSL_Acceptor::close (void) +TAO::IIOP_SSL_Acceptor::close () { return this->base_acceptor_.close (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp index 4622a9ac7a8..0b01d3824f8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp @@ -74,7 +74,7 @@ TAO::IIOP_SSL_Connection_Handler::IIOP_SSL_Connection_Handler ( this->transport (specific_transport); } -TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler (void) +TAO::IIOP_SSL_Connection_Handler::~IIOP_SSL_Connection_Handler () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index 3029c05c3e5..d2023356c48 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -15,14 +15,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::IIOP_SSL_Connector::IIOP_SSL_Connector (void) +TAO::IIOP_SSL_Connector::IIOP_SSL_Connector () : TAO_IIOP_Connector (), connect_strategy_ (), base_connector_ (0) { } -TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector (void) +TAO::IIOP_SSL_Connector::~IIOP_SSL_Connector () { } @@ -58,7 +58,7 @@ TAO::IIOP_SSL_Connector::open (TAO_ORB_Core *orb_core) } int -TAO::IIOP_SSL_Connector::close (void) +TAO::IIOP_SSL_Connector::close () { delete this->base_connector_.creation_strategy (); delete this->base_connector_.concurrency_strategy (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp index 353c0b82c9d..2e2c03fbe04 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp @@ -18,7 +18,7 @@ TAO::IIOP_SSL_Transport::IIOP_SSL_Transport ( TAO::SSLIOP::Util::current (orb_core); } -TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport (void) +TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp index f4eee04b4de..c89130859f2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp @@ -82,7 +82,7 @@ TAO::SSLIOP::Acceptor::Acceptor (::Security::QOP qop, CSIIOP::NoProtection); } -TAO::SSLIOP::Acceptor::~Acceptor (void) +TAO::SSLIOP::Acceptor::~Acceptor () { // Make sure we are closed before we start destroying the // strategies. @@ -351,7 +351,7 @@ TAO::SSLIOP::Acceptor::is_collocated (const TAO_Endpoint *endpoint) } int -TAO::SSLIOP::Acceptor::close (void) +TAO::SSLIOP::Acceptor::close () { int r = this->ssl_acceptor_.close (); if (this->IIOP_SSL_Acceptor::close () != 0) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp index e8842aa4a16..1486707d257 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp @@ -12,24 +12,24 @@ TAO::SSLIOP::ClientCredentials::ClientCredentials ( { } -TAO::SSLIOP::ClientCredentials::~ClientCredentials (void) +TAO::SSLIOP::ClientCredentials::~ClientCredentials () { } SecurityLevel3::CredentialsType -TAO::SSLIOP::ClientCredentials::creds_type (void) +TAO::SSLIOP::ClientCredentials::creds_type () { return SecurityLevel3::CT_ClientCredentials; } char * -TAO::SSLIOP::ClientCredentials::context_id (void) +TAO::SSLIOP::ClientCredentials::context_id () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * -TAO::SSLIOP::ClientCredentials::client_principal (void) +TAO::SSLIOP::ClientCredentials::client_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -47,7 +47,7 @@ TAO::SSLIOP::ClientCredentials::client_restricted_resources () } SecurityLevel3::Principal * -TAO::SSLIOP::ClientCredentials::target_principal (void) +TAO::SSLIOP::ClientCredentials::target_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -65,7 +65,7 @@ TAO::SSLIOP::ClientCredentials::target_restricted_resources () } SecurityLevel3::OwnCredentials_ptr -TAO::SSLIOP::ClientCredentials::parent_credentials (void) +TAO::SSLIOP::ClientCredentials::parent_credentials () { SecurityLevel3::OwnCredentials_ptr creds = SecurityLevel3::OwnCredentials::_nil (); @@ -92,19 +92,19 @@ TAO::SSLIOP::ClientCredentials::client_authentication () } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::target_authentication (void) +TAO::SSLIOP::ClientCredentials::target_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::confidentiality (void) +TAO::SSLIOP::ClientCredentials::confidentiality () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::ClientCredentials::integrity (void) +TAO::SSLIOP::ClientCredentials::integrity () { // TAO's SSLIOP pluggable transport always provides integrity. Note // that if we diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp index f37b77c9682..2244fb35e51 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp @@ -51,7 +51,7 @@ TAO::SSLIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core) this->transport (specific_transport); } -TAO::SSLIOP::Connection_Handler::~Connection_Handler (void) +TAO::SSLIOP::Connection_Handler::~Connection_Handler () { delete this->transport (); int const result = @@ -245,13 +245,13 @@ TAO::SSLIOP::Connection_Handler::open (void *) } int -TAO::SSLIOP::Connection_Handler::resume_handler (void) +TAO::SSLIOP::Connection_Handler::resume_handler () { return ACE_Event_Handler::ACE_APPLICATION_RESUMES_HANDLER; } int -TAO::SSLIOP::Connection_Handler::close_connection (void) +TAO::SSLIOP::Connection_Handler::close_connection () { return this->close_connection_eh (this); } @@ -313,7 +313,7 @@ TAO::SSLIOP::Connection_Handler::close (u_long flags) } int -TAO::SSLIOP::Connection_Handler::release_os_resources (void) +TAO::SSLIOP::Connection_Handler::release_os_resources () { return this->peer().close (); } @@ -326,7 +326,7 @@ TAO::SSLIOP::Connection_Handler::pos_io_hook (int & return_value) } int -TAO::SSLIOP::Connection_Handler::add_transport_to_cache (void) +TAO::SSLIOP::Connection_Handler::add_transport_to_cache () { ACE_INET_Addr addr; @@ -459,7 +459,7 @@ TAO::SSLIOP::Connection_Handler::handle_write_ready (const ACE_Time_Value *t) } bool -TAO::SSLIOP::Connection_Handler::check_host (void) +TAO::SSLIOP::Connection_Handler::check_host () { ACE_SSL_Context *ssl_ctx = ACE_SSL_Context::instance (); ACE_INET_Addr remote_addr; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 6aebd8005d2..458198a14c7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -70,7 +70,7 @@ TAO::SSLIOP::Connector::open (TAO_ORB_Core *orb_core) } int -TAO::SSLIOP::Connector::close (void) +TAO::SSLIOP::Connector::close () { (void) this->TAO::IIOP_SSL_Connector::close (); @@ -214,7 +214,7 @@ TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr) } TAO_Profile * -TAO::SSLIOP::Connector::make_profile (void) +TAO::SSLIOP::Connector::make_profile () { // The endpoint should be of the form: // N.n@host:port/object_key @@ -236,7 +236,7 @@ TAO::SSLIOP::Connector::make_profile (void) TAO_Profile * -TAO::SSLIOP::Connector::make_secure_profile (void) +TAO::SSLIOP::Connector::make_secure_profile () { // The endpoint should be of the form: // N.n@host:port/object_key diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index ea8462ccf68..20e4069f82a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -70,30 +70,30 @@ TAO::SSLIOP_Credentials::SSLIOP_Credentials (::X509 *cert, ::EVP_PKEY *evp) } } -TAO::SSLIOP_Credentials::~SSLIOP_Credentials (void) +TAO::SSLIOP_Credentials::~SSLIOP_Credentials () { } char * -TAO::SSLIOP_Credentials::creds_id (void) +TAO::SSLIOP_Credentials::creds_id () { return CORBA::string_dup (this->id_.in ()); } SecurityLevel3::CredentialsUsage -TAO::SSLIOP_Credentials::creds_usage (void) +TAO::SSLIOP_Credentials::creds_usage () { return SecurityLevel3::CU_Indefinite; } TimeBase::UtcT -TAO::SSLIOP_Credentials::expiry_time (void) +TAO::SSLIOP_Credentials::expiry_time () { return this->expiry_time_; } SecurityLevel3::CredentialsState -TAO::SSLIOP_Credentials::creds_state (void) +TAO::SSLIOP_Credentials::creds_state () { const ::X509 *x = this->x509_.in (); @@ -181,7 +181,7 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs) } CORBA::ULong -TAO::SSLIOP_Credentials::hash (void) const +TAO::SSLIOP_Credentials::hash () const { ::X509 * x509 = this->x509_.in (); @@ -219,7 +219,7 @@ tao_TAO_SSLIOP_Credentials_release (TAO::SSLIOP::Credentials_ptr p) } TAO::SSLIOP::Credentials_ptr -tao_TAO_SSLIOP_Credentials_nil (void) +tao_TAO_SSLIOP_Credentials_nil () { return TAO::SSLIOP_Credentials::_nil (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp index 0528fe63f03..e9821f0c25a 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp @@ -76,12 +76,12 @@ TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer ( { } -TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer (void) +TAO::SSLIOP::CredentialsAcquirer::~CredentialsAcquirer () { } char * -TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) +TAO::SSLIOP::CredentialsAcquirer::acquisition_method () { this->check_validity (); @@ -89,7 +89,7 @@ TAO::SSLIOP::CredentialsAcquirer::acquisition_method (void) } SecurityLevel3::AcquisitionStatus -TAO::SSLIOP::CredentialsAcquirer::current_status (void) +TAO::SSLIOP::CredentialsAcquirer::current_status () { this->check_validity (); @@ -97,7 +97,7 @@ TAO::SSLIOP::CredentialsAcquirer::current_status (void) } CORBA::ULong -TAO::SSLIOP::CredentialsAcquirer::nth_iteration (void) +TAO::SSLIOP::CredentialsAcquirer::nth_iteration () { this->check_validity (); @@ -170,7 +170,7 @@ TAO::SSLIOP::CredentialsAcquirer::get_credentials (CORBA::Boolean on_list) } void -TAO::SSLIOP::CredentialsAcquirer::destroy (void) +TAO::SSLIOP::CredentialsAcquirer::destroy () { this->check_validity (); @@ -188,7 +188,7 @@ TAO::SSLIOP::CredentialsAcquirer::destroy (void) } void -TAO::SSLIOP::CredentialsAcquirer::check_validity (void) +TAO::SSLIOP::CredentialsAcquirer::check_validity () { ACE_GUARD (TAO_SYNCH_MUTEX, guard, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index c0141239c3f..32e419fd1ce 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -13,7 +13,7 @@ TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core) { } -TAO::SSLIOP::Current::~Current (void) +TAO::SSLIOP::Current::~Current () { } @@ -78,7 +78,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain () } CORBA::Boolean -TAO::SSLIOP::Current::no_context (void) +TAO::SSLIOP::Current::no_context () { return (this->implementation () == 0 ? true : false); } @@ -127,7 +127,7 @@ TAO::SSLIOP::Current::_duplicate (TAO::SSLIOP::Current_ptr obj) } const char * -TAO::SSLIOP::Current::_interface_repository_id (void) const +TAO::SSLIOP::Current::_interface_repository_id () const { return "IDL:TAO/SSLIOP/Current:1.0"; } @@ -147,7 +147,7 @@ tao_TAO_SSLIOP_Current_release (TAO::SSLIOP::Current_ptr p) } TAO::SSLIOP::Current_ptr -tao_TAO_SSLIOP_Current_nil (void) +tao_TAO_SSLIOP_Current_nil () { return TAO::SSLIOP::Current::_nil (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 00a811a558b..672bc44fcd5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SSLIOP::Current_Impl::~Current_Impl (void) +TAO::SSLIOP::Current_Impl::~Current_Impl () { } @@ -43,7 +43,7 @@ TAO::SSLIOP::Current_Impl::client_credentials () } CORBA::Boolean -TAO::SSLIOP::Current_Impl::request_is_local (void) +TAO::SSLIOP::Current_Impl::request_is_local () { throw CORBA::NO_IMPLEMENT (); } @@ -115,7 +115,7 @@ TAO::SSLIOP::Current_Impl::get_peer_certificate_chain ( } CORBA::ULong -TAO::SSLIOP::Current_Impl::tag (void) const +TAO::SSLIOP::Current_Impl::tag () const { return ::SSLIOP::TAG_SSL_SEC_TRANS; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 077725fc096..ac09e5b1cab 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -97,7 +97,7 @@ TAO_SSLIOP_Endpoint::operator= (const TAO_SSLIOP_Endpoint &other) return *this; } -TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint (void) +TAO_SSLIOP_Endpoint::~TAO_SSLIOP_Endpoint () { if (this->destroy_iiop_endpoint_) delete this->iiop_endpoint_; @@ -125,7 +125,7 @@ TAO_SSLIOP_Endpoint::addr_to_string (char *buffer, size_t length) TAO_Endpoint * -TAO_SSLIOP_Endpoint::next (void) +TAO_SSLIOP_Endpoint::next () { return this->next_; } @@ -170,7 +170,7 @@ TAO_SSLIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) } TAO_Endpoint * -TAO_SSLIOP_Endpoint::duplicate (void) +TAO_SSLIOP_Endpoint::duplicate () { TAO_SSLIOP_Endpoint *endpoint = 0; @@ -190,7 +190,7 @@ TAO_SSLIOP_Endpoint::duplicate (void) } CORBA::ULong -TAO_SSLIOP_Endpoint::hash (void) +TAO_SSLIOP_Endpoint::hash () { // there is actually the potential for a race of the inverse case, // since setting the security attributes will reset the hash_val_, @@ -230,7 +230,7 @@ TAO_SSLIOP_Endpoint::hash (void) const ACE_INET_Addr & -TAO_SSLIOP_Endpoint::object_addr (void) const +TAO_SSLIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -345,7 +345,7 @@ TAO_SSLIOP_Synthetic_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint } TAO_Endpoint * -TAO_SSLIOP_Synthetic_Endpoint::duplicate (void) +TAO_SSLIOP_Synthetic_Endpoint::duplicate () { TAO_SSLIOP_Synthetic_Endpoint *endpoint = 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp index 907e7246983..9f42eb0efb2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp @@ -230,7 +230,7 @@ TAO::SSLIOP::Protocol_Factory::pem_passwd_cb (char *buf, int size, int , void *t return len; } -TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void) +TAO::SSLIOP::Protocol_Factory::Protocol_Factory () : TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP), qop_ (::Security::SecQOPIntegrityAndConfidentiality), timeout_ (TAO::SSLIOP::ACCEPT_TIMEOUT), @@ -238,7 +238,7 @@ TAO::SSLIOP::Protocol_Factory::Protocol_Factory (void) { } -TAO::SSLIOP::Protocol_Factory::~Protocol_Factory (void) +TAO::SSLIOP::Protocol_Factory::~Protocol_Factory () { } @@ -251,7 +251,7 @@ TAO::SSLIOP::Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO::SSLIOP::Protocol_Factory::prefix (void) const +TAO::SSLIOP::Protocol_Factory::prefix () const { // Note: This method doesn't seem to be used anywhere. Moreover, // keeping it may make things more confusing - a Factory can @@ -261,13 +261,13 @@ TAO::SSLIOP::Protocol_Factory::prefix (void) const } char -TAO::SSLIOP::Protocol_Factory::options_delimiter (void) const +TAO::SSLIOP::Protocol_Factory::options_delimiter () const { return '/'; } TAO_Acceptor * -TAO::SSLIOP::Protocol_Factory::make_acceptor (void) +TAO::SSLIOP::Protocol_Factory::make_acceptor () { TAO_Acceptor *acceptor = 0; @@ -797,7 +797,7 @@ TAO::SSLIOP::Protocol_Factory::init (int argc, ACE_TCHAR* argv[]) } int -TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void) +TAO::SSLIOP::Protocol_Factory::register_orb_initializer () { try { @@ -853,7 +853,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (void) TAO_Connector * -TAO::SSLIOP::Protocol_Factory::make_connector (void) +TAO::SSLIOP::Protocol_Factory::make_connector () { TAO::SSLIOP::Connector *connector = 0; @@ -864,7 +864,7 @@ TAO::SSLIOP::Protocol_Factory::make_connector (void) } int -TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint (void) const +TAO::SSLIOP::Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 4e0324ffd9a..12496c1adf8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -47,7 +47,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor ( this->sec2manager_ = SecurityLevel2::SecurityManager::_narrow (obj.in ()); } -TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor (void) +TAO::SSLIOP::Server_Invocation_Interceptor::~Server_Invocation_Interceptor () { } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp index 58d9e0e5078..a4fefe04827 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp @@ -169,7 +169,7 @@ TAO::SSLIOP::ORBInitializer::post_init ( TAO::SSLIOP::CredentialsAcquirerFactory, CORBA::NO_MEMORY ()); - auto_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory; + std::unique_ptr<TAO::SSLIOP::CredentialsAcquirerFactory> safe_factory; tao_curator->register_acquirer_factory ("SL3TLS", factory); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index 8604d6ba2cb..be7540ea0a6 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -7,7 +7,7 @@ TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp) { } -TAO::SSLIOP::OwnCredentials::~OwnCredentials (void) +TAO::SSLIOP::OwnCredentials::~OwnCredentials () { } @@ -28,26 +28,26 @@ TAO::SSLIOP::OwnCredentials::_narrow (CORBA::Object_ptr obj) } TAO::SSLIOP::OwnCredentials_ptr -TAO::SSLIOP::OwnCredentials::_nil (void) +TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; } SecurityLevel3::CredentialsType -TAO::SSLIOP::OwnCredentials::creds_type (void) +TAO::SSLIOP::OwnCredentials::creds_type () { return SecurityLevel3::CT_OwnCredentials; } SecurityLevel3::CredsInitiator_ptr -TAO::SSLIOP::OwnCredentials::creds_initiator (void) +TAO::SSLIOP::OwnCredentials::creds_initiator () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::CredsAcceptor_ptr -TAO::SSLIOP::OwnCredentials::creds_acceptor (void) +TAO::SSLIOP::OwnCredentials::creds_acceptor () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp index dcca6d01808..91ebb0db443 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp @@ -56,7 +56,7 @@ TAO_SSLIOP_Profile::TAO_SSLIOP_Profile (TAO_ORB_Core * orb_core, int ssl_only) this->ssl_endpoint_.iiop_endpoint (&this->endpoint_, true); } -TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile (void) +TAO_SSLIOP_Profile::~TAO_SSLIOP_Profile () { // Clean up the list of endpoints since we own it. // Skip the head, since it is not dynamically allocated. @@ -190,7 +190,7 @@ TAO_SSLIOP_Profile::do_is_equivalent (const TAO_Profile * other_profile) } TAO_Endpoint* -TAO_SSLIOP_Profile::endpoint (void) +TAO_SSLIOP_Profile::endpoint () { return &this->ssl_endpoint_; } @@ -209,7 +209,7 @@ TAO_SSLIOP_Profile::add_endpoint (TAO_SSLIOP_Endpoint * endp) } int -TAO_SSLIOP_Profile::encode_endpoints (void) +TAO_SSLIOP_Profile::encode_endpoints () { // If we have more than one endpoint, we encode info about others // into a tagged component for wire transfer. @@ -266,7 +266,7 @@ TAO_SSLIOP_Profile::encode_endpoints (void) } int -TAO_SSLIOP_Profile::decode_tagged_endpoints (void) +TAO_SSLIOP_Profile::decode_tagged_endpoints () { IOP::TaggedComponent tagged_component; tagged_component.tag = TAO::TAG_SSL_ENDPOINTS; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index fff54f524b9..c203fdc7d5e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -10,19 +10,19 @@ TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert, SecurityLevel3::CredentialsType -TAO::SSLIOP::TargetCredentials::creds_type (void) +TAO::SSLIOP::TargetCredentials::creds_type () { return SecurityLevel3::CT_TargetCredentials; } char * -TAO::SSLIOP::TargetCredentials::context_id (void) +TAO::SSLIOP::TargetCredentials::context_id () { throw CORBA::NO_IMPLEMENT (); } SecurityLevel3::Principal * -TAO::SSLIOP::TargetCredentials::client_principal (void) +TAO::SSLIOP::TargetCredentials::client_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -40,7 +40,7 @@ TAO::SSLIOP::TargetCredentials::client_restricted_resources () } SecurityLevel3::Principal * -TAO::SSLIOP::TargetCredentials::target_principal (void) +TAO::SSLIOP::TargetCredentials::target_principal () { throw CORBA::NO_IMPLEMENT (); } @@ -58,49 +58,49 @@ TAO::SSLIOP::TargetCredentials::target_restricted_resources () } SecurityLevel3::OwnCredentials_ptr -TAO::SSLIOP::TargetCredentials::parent_credentials (void) +TAO::SSLIOP::TargetCredentials::parent_credentials () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::client_authentication (void) +TAO::SSLIOP::TargetCredentials::client_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_authentication (void) +TAO::SSLIOP::TargetCredentials::target_authentication () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::confidentiality (void) +TAO::SSLIOP::TargetCredentials::confidentiality () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::integrity (void) +TAO::SSLIOP::TargetCredentials::integrity () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_embodied (void) +TAO::SSLIOP::TargetCredentials::target_embodied () { throw CORBA::NO_IMPLEMENT (); } CORBA::Boolean -TAO::SSLIOP::TargetCredentials::target_endorsed (void) +TAO::SSLIOP::TargetCredentials::target_endorsed () { throw CORBA::NO_IMPLEMENT (); } void -TAO::SSLIOP::TargetCredentials::release (void) +TAO::SSLIOP::TargetCredentials::release () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 3a123c382f7..e9df6979bb0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -27,18 +27,18 @@ TAO::SSLIOP::Transport::Transport ( { } -TAO::SSLIOP::Transport::~Transport (void) +TAO::SSLIOP::Transport::~Transport () { } ACE_Event_Handler * -TAO::SSLIOP::Transport::event_handler_i (void) +TAO::SSLIOP::Transport::event_handler_i () { return this->connection_handler_; } TAO_Connection_Handler * -TAO::SSLIOP::Transport::connection_handler_i (void) +TAO::SSLIOP::Transport::connection_handler_i () { return this->connection_handler_; } diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index da9d83b8e5d..f80cd66be75 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Config_Scheduler::ACE_Config_Scheduler (void) +ACE_Config_Scheduler::ACE_Config_Scheduler () #if defined (TAO_USES_STRATEGY_SCHEDULER) : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t> (TAO_MIN_CRITICAL_PRIORITY)) , impl (new ACE_Strategy_Scheduler (scheduler_strategy_)) @@ -22,7 +22,7 @@ ACE_Config_Scheduler::ACE_Config_Scheduler (void) // impl->output_level (10); } -ACE_Config_Scheduler::~ACE_Config_Scheduler (void) +ACE_Config_Scheduler::~ACE_Config_Scheduler () { delete impl; } @@ -438,7 +438,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri RtecScheduler::Preemption_Priority_t -ACE_Config_Scheduler::last_scheduled_priority (void) +ACE_Config_Scheduler::last_scheduled_priority () { RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue (); diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 3cdc82216da..f1844bed135 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -1237,7 +1237,7 @@ ACE_DynScheduler::propagate_dispatches ( ACE_DynScheduler::status_t -ACE_DynScheduler::calculate_utilization_params (void) +ACE_DynScheduler::calculate_utilization_params () { critical_set_frame_size_ = 0; utilization_ = 0.0; @@ -1307,7 +1307,7 @@ ACE_DynScheduler::update_priority_level_params () } ACE_DynScheduler::status_t -ACE_DynScheduler::setup_task_entries (void) +ACE_DynScheduler::setup_task_entries () { // store number of tasks, based on registrations tasks (static_cast<u_int> (rt_info_entries_.size ())); @@ -1384,7 +1384,7 @@ ACE_DynScheduler::setup_task_entries (void) } ACE_DynScheduler::status_t -ACE_DynScheduler::relate_task_entries (void) +ACE_DynScheduler::relate_task_entries () { status_t status = SUCCEEDED; @@ -1584,7 +1584,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals, } ACE_DynScheduler::status_t -ACE_DynScheduler::check_dependency_cycles (void) +ACE_DynScheduler::check_dependency_cycles () { status_t return_status = SUCCEEDED; @@ -1748,7 +1748,7 @@ ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduli // calls internal dispatch scheduling method. ACE_DynScheduler::status_t -ACE_DynScheduler::store_assigned_info (void) +ACE_DynScheduler::store_assigned_info () { for (u_int i = 0; i < dispatch_entry_count_; ++i) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index 4bf6aede47c..b50d9381218 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -705,7 +705,7 @@ effective_exec_multiplier (CORBA::Long l) /////////////////////////// -TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor (void) +TAO_Reconfig_Sched_Entry_Visitor::~TAO_Reconfig_Sched_Entry_Visitor () { } @@ -910,7 +910,7 @@ enabled_state (RtecScheduler::RT_Info_Enabled_Type_t et) //////////////////////////////////////////// -TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor (void) +TAO_RT_Info_Tuple_Visitor::~TAO_RT_Info_Tuple_Visitor () { } diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp index 8f851f9b415..9cfb8e0b5da 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Task_Entry::Task_Entry (void) +Task_Entry::Task_Entry () : rt_info_ (0), effective_period_(0), dfs_status_ (NOT_VISITED), @@ -35,7 +35,7 @@ Task_Entry::Task_Entry (void) { } -Task_Entry::~Task_Entry (void) +Task_Entry::~Task_Entry () { // Zero out the task entry ACT in the corresponding rt_info rt_info_->volatile_token = 0; @@ -758,7 +758,7 @@ Dispatch_Proxy_Iterator::first (u_int sub_frame) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::last (void) +Dispatch_Proxy_Iterator::last () { // use the last call current_call_ = number_of_calls_ - 1; @@ -775,7 +775,7 @@ Dispatch_Proxy_Iterator::last (void) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::advance (void) +Dispatch_Proxy_Iterator::advance () { int result = 1; @@ -814,7 +814,7 @@ Dispatch_Proxy_Iterator::advance (void) // and -1 if an error occurred. int -Dispatch_Proxy_Iterator::retreat (void) +Dispatch_Proxy_Iterator::retreat () { int result = 1; @@ -851,7 +851,7 @@ Dispatch_Proxy_Iterator::retreat (void) // returns the adjusted arrival time of the virtual entry RtecScheduler::Time -Dispatch_Proxy_Iterator::arrival (void) const +Dispatch_Proxy_Iterator::arrival () const { Dispatch_Entry_Link *link; if (iter_.done () @@ -868,7 +868,7 @@ Dispatch_Proxy_Iterator::arrival (void) const // returns the adjusted deadline time of the virtual entry RtecScheduler::Time -Dispatch_Proxy_Iterator::deadline (void) const +Dispatch_Proxy_Iterator::deadline () const { Dispatch_Entry_Link *link; if (iter_.done () @@ -885,7 +885,7 @@ Dispatch_Proxy_Iterator::deadline (void) const // returns the scheduler priority of the virtual entry Dispatch_Proxy_Iterator::Preemption_Priority -Dispatch_Proxy_Iterator::priority (void) const +Dispatch_Proxy_Iterator::priority () const { Dispatch_Entry_Link *link; @@ -900,7 +900,7 @@ Dispatch_Proxy_Iterator::priority (void) const // returns the OS priority of the virtual entry Dispatch_Proxy_Iterator::OS_Priority -Dispatch_Proxy_Iterator::OS_priority (void) const +Dispatch_Proxy_Iterator::OS_priority () const { Dispatch_Entry_Link *link; if (iter_.done () diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index d301b963454..c1bb16f71c5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -613,7 +613,7 @@ ACE_Scheduler_Strategy::ACE_Scheduler_Strategy ( { } -ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy (void) +ACE_Scheduler_Strategy::~ACE_Scheduler_Strategy () { } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 1190037fc93..8d1618b975b 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -105,7 +105,7 @@ struct ACE_Scheduler_Factory_Data // applications; must be set by either the application or Event // Channel. - ACE_Scheduler_Factory_Data (void) + ACE_Scheduler_Factory_Data () : scheduler_ (TAO_SF_config_count, TAO_SF_config_info, TAO_SF_entry_count, @@ -140,7 +140,7 @@ int ACE_Scheduler_Factory::use_runtime (int cc, } static RtecScheduler::Scheduler_ptr -static_server (void) +static_server () { RtecScheduler::Scheduler_ptr server_ = 0; @@ -221,7 +221,7 @@ ACE_Scheduler_Factory::server (RtecScheduler::Scheduler_ptr sptr) } RtecScheduler::Scheduler_ptr -ACE_Scheduler_Factory::server (void) +ACE_Scheduler_Factory::server () { if (server_ == 0 && TAO_SF_entry_count != -1) server_ = static_server (); @@ -730,7 +730,7 @@ ACE_Scheduler_Factory::log_scheduling_tuples( #endif /* HPUX && !g++ */ RtecScheduler::Preemption_Priority_t -ACE_Scheduler_Factory::preemption_priority (void) +ACE_Scheduler_Factory::preemption_priority () { // Return whatever we've got. The application or Event Channel is // responsible for making sure that it was set. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 99e681eb61a..09273977362 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -10,7 +10,7 @@ TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy ( { } -TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void) +TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy () { } @@ -21,7 +21,7 @@ TAO::Security::EstablishTrustPolicy::policy_type () } CORBA::Policy_ptr -TAO::Security::EstablishTrustPolicy::copy (void) +TAO::Security::EstablishTrustPolicy::copy () { TAO::Security::EstablishTrustPolicy *policy = 0; ACE_NEW_THROW_EX (policy, @@ -36,12 +36,12 @@ TAO::Security::EstablishTrustPolicy::copy (void) } void -TAO::Security::EstablishTrustPolicy::destroy (void) +TAO::Security::EstablishTrustPolicy::destroy () { } ::Security::EstablishTrust -TAO::Security::EstablishTrustPolicy::trust (void) +TAO::Security::EstablishTrustPolicy::trust () { return this->trust_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp index 9d41415ebd2..6fac5016428 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp @@ -9,18 +9,18 @@ TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop) { } -TAO::Security::QOPPolicy::~QOPPolicy (void) +TAO::Security::QOPPolicy::~QOPPolicy () { } CORBA::PolicyType -TAO::Security::QOPPolicy::policy_type (void) +TAO::Security::QOPPolicy::policy_type () { return ::Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO::Security::QOPPolicy::copy (void) +TAO::Security::QOPPolicy::copy () { TAO::Security::QOPPolicy * policy = 0; ACE_NEW_THROW_EX (policy, @@ -35,12 +35,12 @@ TAO::Security::QOPPolicy::copy (void) } void -TAO::Security::QOPPolicy::destroy (void) +TAO::Security::QOPPolicy::destroy () { } Security::QOP -TAO::Security::QOPPolicy::qop (void) +TAO::Security::QOPPolicy::qop () { return this->qop_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 0dfb18dcc59..6590858dfe5 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -27,7 +27,7 @@ TAO::Security::SecurityManager::SecurityManager (/* unknown */) this->access_decision_ = ad; } -TAO::Security::SecurityManager::~SecurityManager (void) +TAO::Security::SecurityManager::~SecurityManager () { } @@ -315,7 +315,7 @@ TAO::Security::AccessDecision::remove_object } CORBA::Boolean -TAO::Security::AccessDecision::default_decision (void) +TAO::Security::AccessDecision::default_decision () { return this->default_allowance_decision_; } @@ -327,7 +327,7 @@ TAO::Security::AccessDecision::default_decision (CORBA::Boolean d) } CORBA::Boolean -TAO::Security::AccessDecision::default_collocated_decision (void) +TAO::Security::AccessDecision::default_collocated_decision () { return this->default_collocated_decision_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index 525dcf71228..9f1af843b94 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -18,7 +18,7 @@ TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy ( { } -TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void) +TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy () { } @@ -29,7 +29,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive () } SecurityLevel3::OwnCredentialsList * -TAO::SL3::ContextEstablishmentPolicy::creds_list (void) +TAO::SL3::ContextEstablishmentPolicy::creds_list () { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -71,7 +71,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type () } CORBA::Policy_ptr -TAO::SL3::ContextEstablishmentPolicy::copy (void) +TAO::SL3::ContextEstablishmentPolicy::copy () { CORBA::Policy_ptr p = CORBA::Policy_ptr (); ACE_NEW_THROW_EX (p, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp index 3cd971c403d..37104fb3940 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void) +TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index 82d65bfe788..a1f9556ebb6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -11,14 +11,14 @@ namespace TAO } } -TAO::SL3::CredentialsCurator::CredentialsCurator (void) +TAO::SL3::CredentialsCurator::CredentialsCurator () : lock_ (), acquirer_factories_ (), credentials_table_ (TAO::SL3::CREDENTIALS_TABLE_SIZE) { } -TAO::SL3::CredentialsCurator::~CredentialsCurator (void) +TAO::SL3::CredentialsCurator::~CredentialsCurator () { const Factory_Iterator fend = this->acquirer_factories_.end (); for (Factory_Iterator i = this->acquirer_factories_.begin (); @@ -62,13 +62,13 @@ TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj) } TAO::SL3::CredentialsCurator_ptr -TAO::SL3::CredentialsCurator::_nil (void) +TAO::SL3::CredentialsCurator::_nil () { return (CredentialsCurator *) 0; } SecurityLevel3::AcquisitionMethodList * -TAO::SL3::CredentialsCurator::supported_methods (void) +TAO::SL3::CredentialsCurator::supported_methods () { SecurityLevel3::AcquisitionMethodList * list; ACE_NEW_THROW_EX (list, @@ -115,7 +115,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } SecurityLevel3::OwnCredentialsList * -TAO::SL3::CredentialsCurator::default_creds_list (void) +TAO::SL3::CredentialsCurator::default_creds_list () { SecurityLevel3::OwnCredentialsList * list; ACE_NEW_THROW_EX (list, @@ -146,7 +146,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (void) } SecurityLevel3::CredentialsIdList * -TAO::SL3::CredentialsCurator::default_creds_ids (void) +TAO::SL3::CredentialsCurator::default_creds_ids () { SecurityLevel3::CredentialsIdList * list; ACE_NEW_THROW_EX (list, diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index f8f99982eff..ddda19ce6e9 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -8,12 +8,12 @@ TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy ( { } -TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void) +TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy () { } SecurityLevel3::OwnCredentialsList * -TAO::SL3::ObjectCredentialsPolicy::creds_list (void) +TAO::SL3::ObjectCredentialsPolicy::creds_list () { SecurityLevel3::OwnCredentialsList * creds = 0; @@ -31,7 +31,7 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type () } CORBA::Policy_ptr -TAO::SL3::ObjectCredentialsPolicy::copy (void) +TAO::SL3::ObjectCredentialsPolicy::copy () { CORBA::Policy_ptr p = CORBA::Policy_ptr (); ACE_NEW_THROW_EX (p, @@ -42,7 +42,7 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void) } void -TAO::SL3::ObjectCredentialsPolicy::destroy (void) +TAO::SL3::ObjectCredentialsPolicy::destroy () { this->creds_list_.length (0); } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp index 582564c8aee..95bc274c937 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp @@ -14,12 +14,12 @@ TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot, } -TAO::SL3::SecurityCurrent::~SecurityCurrent (void) +TAO::SL3::SecurityCurrent::~SecurityCurrent () { } SecurityLevel3::ClientCredentials_ptr -TAO::SL3::SecurityCurrent::client_credentials (void) +TAO::SL3::SecurityCurrent::client_credentials () { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); @@ -33,7 +33,7 @@ TAO::SL3::SecurityCurrent::client_credentials (void) } CORBA::Boolean -TAO::SL3::SecurityCurrent::request_is_local (void) +TAO::SL3::SecurityCurrent::request_is_local () { TAO::SL3::SecurityCurrent_Impl * impl = this->implementation (); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp index 2dfaeb1645f..e9518af55ba 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void) +TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index a0cc037bf31..9e1e1850e0a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -10,7 +10,7 @@ TAO::SL3::SecurityManager::SecurityManager ( { } -TAO::SL3::SecurityManager::~SecurityManager (void) +TAO::SL3::SecurityManager::~SecurityManager () { } diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 8ea7bb61737..2cde77f2465 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -16,7 +16,7 @@ TAO_Security_Current::TAO_Security_Current (size_t tss_slot, { } -TAO_Security_Current::~TAO_Security_Current (void) +TAO_Security_Current::~TAO_Security_Current () { } @@ -50,7 +50,7 @@ TAO_Security_Current::received_credentials () } int -TAO_Security_Current::init (void) +TAO_Security_Current::init () { int result = 0; diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp index 0a6350f675f..75c6442c097 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Security::Current_Impl::~Current_Impl (void) +TAO::Security::Current_Impl::~Current_Impl () { } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp index 6336278865f..aeb74e75716 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp @@ -11,14 +11,14 @@ TAO_TIO::TAO_TIO (TimeBase::TimeT lower, } // Destructor. -TAO_TIO::~TAO_TIO (void) +TAO_TIO::~TAO_TIO () { } // This is the get method for the attribute time interval. TimeBase::IntervalT -TAO_TIO::time_interval (void) +TAO_TIO::time_interval () { return attr_time_interval; } @@ -234,7 +234,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio, } CosTime::UTO_ptr -TAO_TIO::time (void) +TAO_TIO::time () { TAO_UTO *uto = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index a87bc724459..ee81b1d322f 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -32,7 +32,7 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value, // Destructor. -TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) +TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk () { } @@ -40,7 +40,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void) // in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Clerk::universal_time (void) +TAO_Time_Service_Clerk::universal_time () { TAO_UTO *uto = 0; @@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (void) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Clerk::secure_universal_time (void) +TAO_Time_Service_Clerk::secure_universal_time () { throw CORBA::NO_IMPLEMENT (); } @@ -120,7 +120,7 @@ TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower, } CORBA::ULongLong -TAO_Time_Service_Clerk::get_time (void) +TAO_Time_Service_Clerk::get_time () { // Globally sync. time is the latest global time plus the time // elapsed since last updation was done. @@ -137,7 +137,7 @@ TAO_Time_Service_Clerk::get_time (void) // Returns the time displacement factor in minutes. // This is displacement from the GMT. CORBA::Short -TAO_Time_Service_Clerk::time_displacement_factor (void) +TAO_Time_Service_Clerk::time_displacement_factor () { return time_displacement_factor_; } @@ -151,7 +151,7 @@ TAO_Time_Service_Clerk::time_displacement_factor (CORBA::Short tdf) // GET method for inaccuracy. TimeBase::InaccuracyT -TAO_Time_Service_Clerk::inaccuracy (void) +TAO_Time_Service_Clerk::inaccuracy () { return this->inaccuracy_; } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index d9fdf300e57..1433cac6262 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -11,12 +11,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Constructor. -TAO_Time_Service_Server::TAO_Time_Service_Server (void) +TAO_Time_Service_Server::TAO_Time_Service_Server () { } // Destructor. -TAO_Time_Service_Server::~TAO_Time_Service_Server (void) +TAO_Time_Service_Server::~TAO_Time_Service_Server () { } @@ -24,7 +24,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void) // inaccuracy in a UTO. CosTime::UTO_ptr -TAO_Time_Service_Server::universal_time (void) +TAO_Time_Service_Server::universal_time () { TAO_UTO *uto = 0; @@ -51,7 +51,7 @@ TAO_Time_Service_Server::universal_time (void) // implemented currently. CosTime::UTO_ptr -TAO_Time_Service_Server::secure_universal_time (void) +TAO_Time_Service_Server::secure_universal_time () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index 11461266cf6..73007d9845b 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -24,14 +24,14 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, // Destructor. -TAO_UTO::~TAO_UTO (void) +TAO_UTO::~TAO_UTO () { } // Get Method for the readonly attribute time. TimeBase::TimeT -TAO_UTO::time (void) +TAO_UTO::time () { return attr_utc_time_.time; } @@ -39,7 +39,7 @@ TAO_UTO::time (void) // Get method for the readonly attribute inaccuracy. TimeBase::InaccuracyT -TAO_UTO::inaccuracy (void) +TAO_UTO::inaccuracy () { // Construct the Inaccuracy from the // inacchi and inacclo. @@ -53,7 +53,7 @@ TAO_UTO::inaccuracy (void) // Get method for the readonly attribute tdf. TimeBase::TdfT -TAO_UTO::tdf (void) +TAO_UTO::tdf () { return attr_utc_time_.tdf; } @@ -61,7 +61,7 @@ TAO_UTO::tdf (void) // Get method for the readonly attribute utc_time. TimeBase::UtcT -TAO_UTO::utc_time (void) +TAO_UTO::utc_time () { return attr_utc_time_; } @@ -70,7 +70,7 @@ TAO_UTO::utc_time (void) // the Base Time, UTC and Distributed Time Sync. Algos. [3]. CosTime::UTO_ptr -TAO_UTO::absolute_time (void) +TAO_UTO::absolute_time () { return CosTime::UTO::_nil (); } @@ -176,7 +176,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto) // time value in the UTO. CosTime::TIO_ptr -TAO_UTO::interval (void) +TAO_UTO::interval () { TAO_TIO *tio = 0; diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 3264a707ddd..2dfdaaf37df 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Timer_Helper::Timer_Helper (void) +Timer_Helper::Timer_Helper () : clerk_ (0) { } @@ -21,7 +21,7 @@ Timer_Helper::Timer_Helper (TAO_Time_Service_Clerk *clerk) } -Timer_Helper::~Timer_Helper (void) +Timer_Helper::~Timer_Helper () { } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 5205633818b..b48aa8e55f7 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -51,7 +51,7 @@ TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator, } } -TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter (void) +TAO_Constraint_Interpreter::~TAO_Constraint_Interpreter () { } @@ -225,7 +225,7 @@ remove_offer (CosTrading::Offer*& offer) size_t -TAO_Preference_Interpreter::num_offers (void) +TAO_Preference_Interpreter::num_offers () { return this->offers_.size (); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h index 521827604cc..6905df54a60 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h @@ -134,9 +134,10 @@ public: typedef ACE_Unbounded_Queue<Preference_Info> Ordered_Offers; private: - /// Disallow copying. - TAO_Preference_Interpreter (const TAO_Preference_Interpreter&); - TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&); + TAO_Preference_Interpreter (const TAO_Preference_Interpreter&) = delete; + TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&) = delete; + TAO_Preference_Interpreter (TAO_Preference_Interpreter&&) = delete; + TAO_Preference_Interpreter& operator= (TAO_Preference_Interpreter&&) = delete; /// The ordered list of offers. Ordered_Offers offers_; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index 8ea8c4946c2..3d20afdd2bd 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -37,7 +37,7 @@ TAO_Binary_Constraint (TAO_Expression_Type op_type, { } -TAO_Binary_Constraint::~TAO_Binary_Constraint (void) +TAO_Binary_Constraint::~TAO_Binary_Constraint () { delete left_; delete right_; @@ -194,13 +194,13 @@ visit_in (TAO_Constraint_Visitor* visitor, TAO_Constraint* -TAO_Binary_Constraint::left_operand (void) const +TAO_Binary_Constraint::left_operand () const { return this->left_; } TAO_Constraint* -TAO_Binary_Constraint::right_operand (void) const +TAO_Binary_Constraint::right_operand () const { return this->right_; } @@ -213,7 +213,7 @@ TAO_Unary_Constraint (TAO_Expression_Type op_type, { } -TAO_Unary_Constraint::~TAO_Unary_Constraint (void) +TAO_Unary_Constraint::~TAO_Unary_Constraint () { delete operand_; } @@ -254,7 +254,7 @@ TAO_Unary_Constraint::accept (TAO_Constraint_Visitor* visitor) } TAO_Constraint* -TAO_Unary_Constraint::operand (void) +TAO_Unary_Constraint::operand () { return this->operand_; } @@ -265,7 +265,7 @@ TAO_Property_Constraint (const char* name) { } -TAO_Property_Constraint::~TAO_Property_Constraint (void) +TAO_Property_Constraint::~TAO_Property_Constraint () { CORBA::string_free (this->name_); } @@ -277,18 +277,18 @@ TAO_Property_Constraint::accept (TAO_Constraint_Visitor* visitor) } TAO_Expression_Type -TAO_Property_Constraint::expr_type (void) const +TAO_Property_Constraint::expr_type () const { return TAO_IDENT; } const char* -TAO_Property_Constraint::name (void) const +TAO_Property_Constraint::name () const { return name_; } -TAO_Literal_Constraint::TAO_Literal_Constraint (void) +TAO_Literal_Constraint::TAO_Literal_Constraint () : type_ (TAO_UNKNOWN) { } @@ -415,7 +415,7 @@ TAO_Literal_Constraint::TAO_Literal_Constraint (const char* str) this->op_.str_ = CORBA::string_dup (str); } -TAO_Literal_Constraint::~TAO_Literal_Constraint (void) +TAO_Literal_Constraint::~TAO_Literal_Constraint () { if (this->type_ == TAO_STRING) CORBA::string_free (this->op_.str_); @@ -433,12 +433,12 @@ TAO_Literal_Constraint::operator= (const TAO_Literal_Constraint& co) this->copy (co); } -TAO_Literal_Constraint::operator CORBA::Boolean (void) const +TAO_Literal_Constraint::operator CORBA::Boolean () const { return (this->type_ == TAO_BOOLEAN) ? this->op_.bool_ : 0; } -TAO_Literal_Constraint::operator CORBA::ULongLong (void) const +TAO_Literal_Constraint::operator CORBA::ULongLong () const { CORBA::ULongLong return_value = 0; @@ -458,7 +458,7 @@ TAO_Literal_Constraint::operator CORBA::ULongLong (void) const return return_value; } -TAO_Literal_Constraint::operator CORBA::LongLong (void) const +TAO_Literal_Constraint::operator CORBA::LongLong () const { CORBA::LongLong return_value = 0; @@ -481,7 +481,7 @@ TAO_Literal_Constraint::operator CORBA::LongLong (void) const return return_value; } -TAO_Literal_Constraint::operator CORBA::Double (void) const +TAO_Literal_Constraint::operator CORBA::Double () const { CORBA::Double return_value = 0.0; @@ -495,12 +495,12 @@ TAO_Literal_Constraint::operator CORBA::Double (void) const return return_value; } -TAO_Literal_Constraint::operator const char* (void) const +TAO_Literal_Constraint::operator const char* () const { return (this->type_ == TAO_STRING) ? this->op_.str_ : 0; } -TAO_Literal_Constraint::operator const CORBA::Any* (void) const +TAO_Literal_Constraint::operator const CORBA::Any* () const { return (this->type_ == TAO_SEQUENCE) ? this->op_.any_ : 0; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 8772fbd39d4..a066079520c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -9,12 +9,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) +TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue () { } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_left_operand () { TAO_Literal_Constraint* left_operand = 0; this->get (left_operand, 1); @@ -22,7 +22,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_left_operand (void) } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_right_operand () { TAO_Literal_Constraint* right_operand = 0; this->get (right_operand); @@ -30,7 +30,7 @@ TAO_Constraint_Evaluator::Operand_Queue::get_right_operand (void) } TAO_Literal_Constraint& -TAO_Constraint_Evaluator::Operand_Queue::get_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::get_operand () { TAO_Literal_Constraint* operand = 0; this->get (operand); @@ -38,13 +38,13 @@ TAO_Constraint_Evaluator::Operand_Queue::get_operand (void) } void -TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand (void) +TAO_Constraint_Evaluator::Operand_Queue::dequeue_operand () { TAO_Literal_Constraint operand; this->dequeue_head (operand); } -TAO_Constraint_Evaluator::TAO_Constraint_Evaluator (void) +TAO_Constraint_Evaluator::TAO_Constraint_Evaluator () { // No-Op. } @@ -759,12 +759,12 @@ operator () (TAO_DynSequence_i& dyn_any, } TAO_Constraint_Validator:: -TAO_Constraint_Validator (void) +TAO_Constraint_Validator () { // No-Op. } -TAO_Constraint_Validator::~TAO_Constraint_Validator (void) +TAO_Constraint_Validator::~TAO_Constraint_Validator () { for (TAO_Typecode_Table::iterator type_iter (this->type_map_); ! type_iter.done (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h index 0351c364934..c4546897636 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h @@ -344,12 +344,12 @@ private: CORBA::Boolean sequence_does_contain (CORBA::Any* sequence, TAO_Literal_Constraint& element); - /// Disallow copying. - TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&); - TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&); + TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&) = delete; + TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&) = delete; + TAO_Constraint_Evaluator (TAO_Constraint_Evaluator&&) = delete; + TAO_Constraint_Evaluator& operator= (TAO_Constraint_Evaluator&&) = delete; protected: - /// The map of property names to their values for a property. TAO_Lookup_Table props_; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index fc4038822dd..9d0429b6b46 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -373,11 +373,11 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); void yy_delete_buffer ( YY_BUFFER_STATE b ); void yy_flush_buffer ( YY_BUFFER_STATE b ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state ( void ); +void yypop_buffer_state ( ); -static void yyensure_buffer_stack ( void ); -static void yy_load_buffer_state ( void ); +static void yyensure_buffer_stack ( ); +static void yy_load_buffer_state ( ); static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) @@ -435,9 +435,9 @@ extern char *yytext; -static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_get_previous_state ( ); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); -static int yy_get_next_buffer ( void ); +static int yy_get_next_buffer ( ); static void yynoreturn yy_fatal_error ( const char* msg ); @@ -651,18 +651,18 @@ static CORBA::ULongLong trader_strtoull(const char* str, unsigned int base); -static int yy_init_globals ( void ); +static int yy_init_globals ( ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( void ); +int yylex_destroy ( ); -int yyget_debug ( void ); +int yyget_debug ( ); @@ -670,7 +670,7 @@ void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra ( void ); +YY_EXTRA_TYPE yyget_extra ( ); @@ -678,7 +678,7 @@ void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in ( void ); +FILE *yyget_in ( ); @@ -686,7 +686,7 @@ void yyset_in ( FILE * _in_str ); -FILE *yyget_out ( void ); +FILE *yyget_out ( ); @@ -694,15 +694,15 @@ void yyset_out ( FILE * _out_str ); - int yyget_leng ( void ); + int yyget_leng ( ); -char *yyget_text ( void ); +char *yyget_text ( ); -int yyget_lineno ( void ); +int yyget_lineno ( ); @@ -856,7 +856,7 @@ static int input ( void ); -extern int yylex (void); +extern int yylex (); #define YY_DECL int yylex (void) #endif /* !YY_DECL */ @@ -1298,7 +1298,7 @@ case YY_STATE_EOF(INITIAL): * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ -static int yy_get_next_buffer (void) +static int yy_get_next_buffer () { char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = (yytext_ptr); @@ -1437,7 +1437,7 @@ static int yy_get_next_buffer (void) /* yy_get_previous_state - get the state just before the EOB char was reached */ - static yy_state_type yy_get_previous_state (void) + static yy_state_type yy_get_previous_state () { yy_state_type yy_current_state; char *yy_cp; @@ -1667,7 +1667,7 @@ static int yy_get_next_buffer (void) } -static void yy_load_buffer_state (void) +static void yy_load_buffer_state () { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; @@ -1821,7 +1821,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) * The next element becomes the new top. * */ -void yypop_buffer_state (void) +void yypop_buffer_state () { if (!YY_CURRENT_BUFFER) return; @@ -1841,7 +1841,7 @@ void yypop_buffer_state (void) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void yyensure_buffer_stack (void) +static void yyensure_buffer_stack () { yy_size_t num_to_alloc; @@ -2027,7 +2027,7 @@ static void yynoreturn yy_fatal_error (const char* msg ) /** Get the current line number. * */ -int yyget_lineno (void) +int yyget_lineno () { @@ -2041,7 +2041,7 @@ int yyget_lineno (void) /** Get the input stream. * */ -FILE *yyget_in (void) +FILE *yyget_in () { return yyin; } @@ -2051,7 +2051,7 @@ FILE *yyget_in (void) /** Get the output stream. * */ -FILE *yyget_out (void) +FILE *yyget_out () { return yyout; } @@ -2061,7 +2061,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +int yyget_leng () { return yyleng; } @@ -2071,7 +2071,7 @@ int yyget_leng (void) * */ -char *yyget_text (void) +char *yyget_text () { return yytext; } @@ -2116,7 +2116,7 @@ void yyset_out (FILE * _out_str ) -int yyget_debug (void) +int yyget_debug () { return yy_flex_debug; } @@ -2130,7 +2130,7 @@ void yyset_debug (int _bdebug ) -static int yy_init_globals (void) +static int yy_init_globals () { /* Initialization is the same as for the non-reentrant scanner. * This function is called from yylex_destroy(), so don't allocate here. @@ -2167,7 +2167,7 @@ static int yy_init_globals (void) /* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) +int yylex_destroy () { /* Pop the buffer stack, destroying each element. */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp index fb982f6a424..2c4cb219d93 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp @@ -5,12 +5,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__; -TAO_Interpreter::TAO_Interpreter (void) +TAO_Interpreter::TAO_Interpreter () : root_ (0) { } -TAO_Interpreter::~TAO_Interpreter (void) +TAO_Interpreter::~TAO_Interpreter () { delete root_; } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index 9e1246a55a1..576b8544083 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class LOCK_TYPE> -TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void) +TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database () { } template <class LOCK_TYPE> -TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void) +TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database () { ACE_WRITE_GUARD (LOCK_TYPE, ace_mon, this->db_lock_); @@ -220,7 +220,7 @@ lookup_offer (const char* type, CORBA::ULong id) } template <class LOCK_TYPE> TAO_Offer_Id_Iterator* -TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void) +TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids () { ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0); @@ -328,7 +328,7 @@ TAO_Service_Offer_Iterator (const char* type, } template <class LOCK_TYPE> -TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator () { this->stm_.db_lock_.release (); @@ -340,7 +340,7 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void) } template <class LOCK_TYPE> CosTrading::OfferId -TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id () { return (this->offer_iter_ != 0) ? TAO_Offer_Database<LOCK_TYPE>::generate_offer_id (this->type_, (**this->offer_iter_).ext_id_) @@ -348,20 +348,20 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void) } template <class LOCK_TYPE> int -TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers () { return (this->offer_iter_ != 0) ? ! this->offer_iter_->done () : 0; } template <class LOCK_TYPE> CosTrading::Offer* -TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer () { return (this->offer_iter_ != 0) ? (**this->offer_iter_).int_id_ : 0; } template <class LOCK_TYPE> void -TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void) +TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer () { if (this->offer_iter_ != 0) this->offer_iter_->advance (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index 465445a518b..e79269ae7b3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -7,12 +7,12 @@ TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) { } -TAO_Offer_Iterator::~TAO_Offer_Iterator (void) +TAO_Offer_Iterator::~TAO_Offer_Iterator () { } void -TAO_Offer_Iterator::destroy (void) +TAO_Offer_Iterator::destroy () { // Remove self from POA @@ -31,7 +31,7 @@ TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter) { } -TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void) +TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator() { } @@ -44,7 +44,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id, } CORBA::ULong -TAO_Query_Only_Offer_Iterator::max_left (void) +TAO_Query_Only_Offer_Iterator::max_left () { return static_cast<CORBA::ULong> (this->offers_.size ()); } @@ -71,11 +71,11 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, return offers_in_sequence != 0; } -TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection (void) +TAO_Offer_Iterator_Collection::TAO_Offer_Iterator_Collection () { } -TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void) +TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection () { while (! this->iters_.is_empty ()) { @@ -157,7 +157,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, } void -TAO_Offer_Iterator_Collection::destroy (void) +TAO_Offer_Iterator_Collection::destroy () { // Destroy all iterators in the collection. for (Offer_Iters::ITERATOR iters_iter (this->iters_); @@ -182,16 +182,16 @@ TAO_Offer_Iterator_Collection::destroy (void) } CORBA::ULong -TAO_Offer_Iterator_Collection::max_left (void) +TAO_Offer_Iterator_Collection::max_left () { throw CosTrading::UnknownMaxLeft(); } -TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator (void) +TAO_Offer_Id_Iterator::TAO_Offer_Id_Iterator () { } -TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) +TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator () { int return_value = 0; @@ -207,13 +207,13 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void) } CORBA::ULong -TAO_Offer_Id_Iterator::max_left (void) +TAO_Offer_Id_Iterator::max_left () { return static_cast<CORBA::ULong> (this->ids_.size ()); } void -TAO_Offer_Id_Iterator::destroy (void) +TAO_Offer_Id_Iterator::destroy () { // Remove self from POA diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index 6e6c27cfb33..c64338e52ed 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -16,7 +16,7 @@ TAO_Service_Type_Repository::TAO_Service_Type_Repository (ACE_Lock* lock) ACE_Lock_Adapter<ACE_Null_Mutex>); } -TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) +TAO_Service_Type_Repository::~TAO_Service_Type_Repository () { { // Make sure not to throw exceptions in destructors... @@ -35,7 +35,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void) } CosTradingRepos::ServiceTypeRepository::IncarnationNumber -TAO_Service_Type_Repository::incarnation (void) +TAO_Service_Type_Repository::incarnation () { CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index 3d36b2862af..5ca9f7b1236 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Trader_Base::TAO_Trader_Base (void) +TAO_Trader_Base::TAO_Trader_Base () : trading_components_ (*this), import_attributes_ (*this), support_attributes_ (*this), @@ -19,54 +19,54 @@ TAO_Trader_Base::TAO_Trader_Base (void) { } -TAO_Trader_Base::~TAO_Trader_Base (void) +TAO_Trader_Base::~TAO_Trader_Base () { } TAO_Import_Attributes_i & -TAO_Trader_Base::import_attributes (void) +TAO_Trader_Base::import_attributes () { return this->import_attributes_; } const TAO_Import_Attributes_i & -TAO_Trader_Base::import_attributes (void) const +TAO_Trader_Base::import_attributes () const { return this->import_attributes_; } TAO_Support_Attributes_i & -TAO_Trader_Base::support_attributes (void) +TAO_Trader_Base::support_attributes () { return this->support_attributes_; } const TAO_Support_Attributes_i & -TAO_Trader_Base::support_attributes (void) const +TAO_Trader_Base::support_attributes () const { return this->support_attributes_; } TAO_Link_Attributes_i & -TAO_Trader_Base::link_attributes (void) +TAO_Trader_Base::link_attributes () { return this->link_attributes_; } const TAO_Link_Attributes_i & -TAO_Trader_Base::link_attributes (void) const +TAO_Trader_Base::link_attributes () const { return this->link_attributes_; } TAO_Trading_Components_i & -TAO_Trader_Base::trading_components (void) +TAO_Trader_Base::trading_components () { return this->trading_components_; } const TAO_Trading_Components_i & -TAO_Trader_Base::trading_components (void) const +TAO_Trader_Base::trading_components () const { return this->trading_components_; } @@ -157,7 +157,7 @@ TAO_Trader_Base::is_valid_identifier_name (const char* ident) return return_value; } -TAO_Lockable::~TAO_Lockable (void) +TAO_Lockable::~TAO_Lockable () { } @@ -172,12 +172,12 @@ TAO_Support_Attributes_i (TAO_Lockable &locker) { } -TAO_Support_Attributes_i::~TAO_Support_Attributes_i (void) +TAO_Support_Attributes_i::~TAO_Support_Attributes_i () { } CORBA::Boolean -TAO_Support_Attributes_i::supports_modifiable_properties (void) const +TAO_Support_Attributes_i::supports_modifiable_properties () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -193,7 +193,7 @@ supports_modifiable_properties (CORBA::Boolean new_value) } CORBA::Boolean -TAO_Support_Attributes_i::supports_dynamic_properties (void) const +TAO_Support_Attributes_i::supports_dynamic_properties () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -210,7 +210,7 @@ supports_dynamic_properties (CORBA::Boolean new_value) } CORBA::Boolean -TAO_Support_Attributes_i::supports_proxy_offers (void) const +TAO_Support_Attributes_i::supports_proxy_offers () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); @@ -227,7 +227,7 @@ supports_proxy_offers (CORBA::Boolean new_value) } CosTrading::TypeRepository_ptr -TAO_Support_Attributes_i::type_repos (void) const +TAO_Support_Attributes_i::type_repos () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::TypeRepository::_nil ()); @@ -248,7 +248,7 @@ type_repos (CosTrading::TypeRepository_ptr new_value) } CosTradingRepos::ServiceTypeRepository_ptr -TAO_Support_Attributes_i::service_type_repos (void) const +TAO_Support_Attributes_i::service_type_repos () const { return this->service_type_repos_.ptr (); } @@ -272,12 +272,12 @@ TAO_Import_Attributes_i (TAO_Lockable &locker) } -TAO_Import_Attributes_i::~TAO_Import_Attributes_i (void) +TAO_Import_Attributes_i::~TAO_Import_Attributes_i () { } CORBA::ULong -TAO_Import_Attributes_i::def_search_card (void) const +TAO_Import_Attributes_i::def_search_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_search_card_; @@ -295,7 +295,7 @@ TAO_Import_Attributes_i::def_search_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_search_card (void) const +TAO_Import_Attributes_i::max_search_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_search_card_; @@ -313,7 +313,7 @@ TAO_Import_Attributes_i::max_search_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_match_card (void) const +TAO_Import_Attributes_i::def_match_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_match_card_; @@ -331,7 +331,7 @@ TAO_Import_Attributes_i::def_match_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_match_card (void) const +TAO_Import_Attributes_i::max_match_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_match_card_; @@ -348,7 +348,7 @@ TAO_Import_Attributes_i::max_match_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_return_card (void) const +TAO_Import_Attributes_i::def_return_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->def_return_card_; @@ -366,7 +366,7 @@ TAO_Import_Attributes_i::def_return_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_return_card (void) const +TAO_Import_Attributes_i::max_return_card () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 10); return this->max_return_card_; @@ -383,7 +383,7 @@ TAO_Import_Attributes_i::max_return_card (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_list (void) const +TAO_Import_Attributes_i::max_list () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->max_list_; @@ -397,7 +397,7 @@ TAO_Import_Attributes_i::max_list (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::def_hop_count (void) const +TAO_Import_Attributes_i::def_hop_count () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->def_hop_count_; @@ -415,7 +415,7 @@ TAO_Import_Attributes_i::def_hop_count (CORBA::ULong new_value) } CORBA::ULong -TAO_Import_Attributes_i::max_hop_count (void) const +TAO_Import_Attributes_i::max_hop_count () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), 0); return this->max_hop_count_; @@ -432,7 +432,7 @@ TAO_Import_Attributes_i::max_hop_count (CORBA::ULong new_value) } CosTrading::FollowOption -TAO_Import_Attributes_i::def_follow_policy (void) const +TAO_Import_Attributes_i::def_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); return this->def_follow_policy_; @@ -450,7 +450,7 @@ TAO_Import_Attributes_i::def_follow_policy (CosTrading::FollowOption new_value) } CosTrading::FollowOption -TAO_Import_Attributes_i::max_follow_policy (void) const +TAO_Import_Attributes_i::max_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); return this->max_follow_policy_; @@ -477,12 +477,12 @@ TAO_Trading_Components_i::TAO_Trading_Components_i (TAO_Lockable &locker) { } -TAO_Trading_Components_i::~TAO_Trading_Components_i (void) +TAO_Trading_Components_i::~TAO_Trading_Components_i () { } CosTrading::Lookup_ptr -TAO_Trading_Components_i::lookup_if (void) const +TAO_Trading_Components_i::lookup_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Lookup::_nil ()); @@ -497,7 +497,7 @@ TAO_Trading_Components_i::lookup_if (CosTrading::Lookup_ptr new_value) } CosTrading::Register_ptr -TAO_Trading_Components_i::register_if (void) const +TAO_Trading_Components_i::register_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Register::_nil ()); @@ -512,7 +512,7 @@ TAO_Trading_Components_i::register_if (CosTrading::Register_ptr new_value) } CosTrading::Link_ptr -TAO_Trading_Components_i::link_if (void) const +TAO_Trading_Components_i::link_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Link::_nil ()); @@ -527,7 +527,7 @@ TAO_Trading_Components_i::link_if (CosTrading::Link_ptr new_value) } CosTrading::Proxy_ptr -TAO_Trading_Components_i::proxy_if (void) const +TAO_Trading_Components_i::proxy_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Proxy::_nil ()); @@ -542,7 +542,7 @@ TAO_Trading_Components_i::proxy_if (CosTrading::Proxy_ptr new_value) } CosTrading::Admin_ptr -TAO_Trading_Components_i::admin_if (void) const +TAO_Trading_Components_i::admin_if () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::Admin::_nil ()); @@ -563,12 +563,12 @@ TAO_Link_Attributes_i::TAO_Link_Attributes_i (TAO_Lockable &locker) { } -TAO_Link_Attributes_i::~TAO_Link_Attributes_i (void) +TAO_Link_Attributes_i::~TAO_Link_Attributes_i () { } CosTrading::FollowOption -TAO_Link_Attributes_i::max_link_follow_policy (void) const +TAO_Link_Attributes_i::max_link_follow_policy () const { ACE_READ_GUARD_RETURN (ACE_Lock, ace_mon, this->locker_.lock (), CosTrading::local_only); @@ -661,7 +661,7 @@ TAO_Trader_Factory::TAO_Trader_Factory (int& argc, ACE_TCHAR** argv) } TAO_Trader_Factory::TAO_TRADER * -TAO_Trader_Factory::manufacture_trader (void) +TAO_Trader_Factory::manufacture_trader () { typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex> TRADER; diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 7a676905862..67941639ea2 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -22,7 +22,7 @@ TAO_Lookup (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup (void) +TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Lookup () { ACE_GUARD (TRADER_LOCK_TYPE, trader_mon, this->lock_); for (Request_Ids::ITERATOR riter (this->request_ids_); @@ -790,7 +790,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Register (TAO_Trader<TRADER_LO } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register (void) +TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register () { } @@ -1162,13 +1162,13 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin () { } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::Admin::OctetSeq * -TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (void) +TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem () { ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0); @@ -1454,7 +1454,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::TAO_Link (TAO_Trader<TRADER_LOCK_TYPE, } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link (void) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Link () { } @@ -1564,7 +1564,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name) template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> CosTrading::LinkNameSeq* -TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (void) +TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links () { // Allocate space for the link names. size_t size = this->links_.current_size (); @@ -1632,7 +1632,7 @@ TAO_Proxy (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> -TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy (void) +TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Proxy () { } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index 0221981bceb..f252f630e24 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -117,13 +117,13 @@ TAO_Policy_Creator::request_id (const CosTrading::Admin::OctetSeq& request_id) policy.value <<= request_id; } -TAO_Policy_Creator::operator const CosTrading::PolicySeq& (void) const +TAO_Policy_Creator::operator const CosTrading::PolicySeq& () const { return this->policies_; } const CosTrading::PolicySeq& -TAO_Policy_Creator::policy_seq (void) const +TAO_Policy_Creator::policy_seq () const { return this->policies_; } @@ -214,7 +214,7 @@ TAO_Property_Evaluator(CosTrading::Offer& offer, this->dp_cache_[i] = 0; } -TAO_Property_Evaluator::~TAO_Property_Evaluator (void) +TAO_Property_Evaluator::~TAO_Property_Evaluator () { // Clean up the results of any dynamic properties. for (CORBA::ULong i = 0; i < this->props_.length (); i++) @@ -424,7 +424,7 @@ TAO_Property_Evaluator_By_Name::get_property (const char* property_name) return property; } -TAO_Dynamic_Property::~TAO_Dynamic_Property (void) +TAO_Dynamic_Property::~TAO_Dynamic_Property () { } @@ -462,7 +462,7 @@ construct_dynamic_prop (const char* name, } void -TAO_Dynamic_Property::destroy (void) +TAO_Dynamic_Property::destroy () { if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ()) { @@ -553,7 +553,7 @@ TAO_Policies::TAO_Policies (TAO_Trader_Base& trader, } } -TAO_Policies::~TAO_Policies (void) +TAO_Policies::~TAO_Policies () { } @@ -610,19 +610,19 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol) const } CORBA::ULong -TAO_Policies::search_card (void) const +TAO_Policies::search_card () const { return this->ulong_prop (SEARCH_CARD); } CORBA::ULong -TAO_Policies::match_card (void) const +TAO_Policies::match_card () const { return this->ulong_prop (MATCH_CARD); } CORBA::ULong -TAO_Policies::return_card (void) const +TAO_Policies::return_card () const { return this->ulong_prop (RETURN_CARD); } @@ -679,32 +679,32 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol) const CORBA::Boolean -TAO_Policies::use_modifiable_properties (void) const +TAO_Policies::use_modifiable_properties () const { return this->boolean_prop (USE_MODIFIABLE_PROPERTIES); } CORBA::Boolean -TAO_Policies::use_dynamic_properties (void) const +TAO_Policies::use_dynamic_properties () const { return this->boolean_prop (USE_DYNAMIC_PROPERTIES); } CORBA::Boolean -TAO_Policies::use_proxy_offers (void) const +TAO_Policies::use_proxy_offers () const { return this->boolean_prop (USE_PROXY_OFFERS); } CORBA::Boolean -TAO_Policies::exact_type_match (void) const +TAO_Policies::exact_type_match () const { return this->boolean_prop (EXACT_TYPE_MATCH); } const CosTrading::TraderName* -TAO_Policies::starting_trader (void) const +TAO_Policies::starting_trader () const { const CosTrading::TraderName* trader_name = 0; @@ -731,7 +731,7 @@ TAO_Policies::starting_trader (void) const } CosTrading::FollowOption -TAO_Policies::link_follow_rule (void) const +TAO_Policies::link_follow_rule () const { CosTrading::FollowOption return_value = this->trader_.import_attributes ().def_follow_policy (); @@ -783,13 +783,13 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info) con } CORBA::ULong -TAO_Policies::hop_count (void) const +TAO_Policies::hop_count () const { return this->ulong_prop (HOP_COUNT); } const CosTrading::Admin::OctetSeq* -TAO_Policies::request_id (void) const +TAO_Policies::request_id () const { const CosTrading::Admin::OctetSeq* request_id = 0; @@ -1023,7 +1023,7 @@ TAO_Offer_Modifier (const char* type_name, } } -TAO_Offer_Modifier::~TAO_Offer_Modifier (void) +TAO_Offer_Modifier::~TAO_Offer_Modifier () { for (TAO_Typecode_Table::iterator type_iter (this->prop_types_); ! type_iter.done (); @@ -1296,13 +1296,13 @@ TAO_Offer_Filter::ok_to_consider (CosTrading::Offer* offer) } CORBA::Boolean -TAO_Offer_Filter::ok_to_consider_more (void) +TAO_Offer_Filter::ok_to_consider_more () { return this->search_card_ > 0 && this->match_card_ > 0; } void -TAO_Offer_Filter::matched_offer (void) +TAO_Offer_Filter::matched_offer () { this->match_card_--; this->return_card_--; @@ -1323,19 +1323,19 @@ TAO_Offer_Filter::matched_offer (void) } CORBA::ULong -TAO_Offer_Filter::search_card_remaining (void) const +TAO_Offer_Filter::search_card_remaining () const { return this->search_card_; } CORBA::ULong -TAO_Offer_Filter::match_card_remaining (void) const +TAO_Offer_Filter::match_card_remaining () const { return this->match_card_; } CosTrading::PolicyNameSeq* -TAO_Offer_Filter::limits_applied (void) +TAO_Offer_Filter::limits_applied () { int i = 0; CORBA::ULong size = static_cast<CORBA::ULong> (this->limits_.size ()); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index c321b73ab89..6c2fb4ef839 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -30,7 +30,7 @@ -TAO_Trading_Loader::TAO_Trading_Loader (void) +TAO_Trading_Loader::TAO_Trading_Loader () : federate_ (0), ior_output_file_ (0), bootstrapper_ (0) @@ -74,7 +74,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void) } } -TAO_Trading_Loader::~TAO_Trading_Loader (void) +TAO_Trading_Loader::~TAO_Trading_Loader () { // Destructor } @@ -112,7 +112,7 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Trading_Loader::fini (void) +TAO_Trading_Loader::fini () { try { @@ -178,7 +178,7 @@ TAO_Trading_Loader::fini (void) } int -TAO_Trading_Loader::run (void) +TAO_Trading_Loader::run () { int return_value = this->orb_manager_.run (); @@ -198,9 +198,9 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, this->orb_manager_.activate_poa_manager (); // Create a Trader Object and set its Service Type Repository. - auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv)); + std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv)); - this->trader_ = auto_trader; + this->trader_ = std::move(auto_trader); TAO_Support_Attributes_i &sup_attr = this->trader_->support_attributes (); @@ -266,7 +266,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr, } int -TAO_Trading_Loader::bootstrap_to_federation (void) +TAO_Trading_Loader::bootstrap_to_federation () { // If all traders follow this strategy, it creates a complete graph // of all known traders on a multicast network. @@ -364,7 +364,7 @@ TAO_Trading_Loader::bootstrap_to_federation (void) } int -TAO_Trading_Loader::init_multicast_server (void) +TAO_Trading_Loader::init_multicast_server () { #if defined (ACE_HAS_IP_MULTICAST) // Get reactor instance from TAO. diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 0eae04554d0..6006017b4be 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -27,7 +27,7 @@ #include "tao/Object_Loader.h" #include "tao/Utils/ORB_Manager.h" -#include "ace/Auto_Ptr.h" +#include <utility> class TAO_Trading_Serv_Export TAO_Trading_Loader : public TAO_Object_Loader { @@ -56,7 +56,6 @@ public: ACE_TCHAR *argv[]); protected: - /// Enable the Trading Service to answer multicast requests for its /// IOR. int init_multicast_server (void); @@ -71,7 +70,7 @@ protected: TAO_ORB_Manager orb_manager_; /// Pointer to the linked trader. - auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; + std::unique_ptr<TAO_Trader_Factory::TAO_TRADER> trader_; /// Service Type Repository used by the trading service. TAO_Service_Type_Repository type_repos_; @@ -96,9 +95,10 @@ protected: CORBA::Boolean bootstrapper_; private: - // Disallow copying and assignment. - TAO_Trading_Loader (const TAO_Trading_Loader &); - TAO_Trading_Loader &operator= (const TAO_Trading_Loader &); + TAO_Trading_Loader (const TAO_Trading_Loader &) = delete; + TAO_Trading_Loader &operator= (const TAO_Trading_Loader &) = delete; + TAO_Trading_Loader (TAO_Trading_Loader &&) = delete; + TAO_Trading_Loader &operator= (TAO_Trading_Loader &&) = delete; }; ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader) diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 2fb670808a4..9b53e14563b 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -70,25 +70,25 @@ class TAO_Export TAO_Abstract_ServantBase { public: /// Destructor - virtual ~TAO_Abstract_ServantBase (void); + virtual ~TAO_Abstract_ServantBase (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default @c _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void) = 0; + virtual CORBA::Boolean _non_existent () = 0; #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Query the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0; + virtual CORBA::InterfaceDef_ptr _get_interface () = 0; /// Default @c _get_component: always returns nil. - virtual CORBA::Object_ptr _get_component (void) = 0; + virtual CORBA::Object_ptr _get_component () = 0; #endif /// Default @c _repository_id - virtual char * _repository_id (void) = 0; + virtual char * _repository_id () = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ //@{ @@ -96,21 +96,21 @@ public: * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void) = 0; + virtual void _add_ref () = 0; /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void) = 0; + virtual void _remove_ref () = 0; /// Returns the current reference count value. - virtual CORBA::ULong _refcount_value (void) const = 0; + virtual CORBA::ULong _refcount_value () const = 0; //@} /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void) = 0; + virtual TAO_Stub *_create_stub () = 0; /// Find an operation in the operation table and return a /// TAO_Skeleton which can be used to make upcalls @@ -137,7 +137,7 @@ public: protected: /// Default constructor, only derived classes can be created. - TAO_Abstract_ServantBase (void); + TAO_Abstract_ServantBase (); /// Copy constructor, protected so no instances can be created. TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &); @@ -157,7 +157,7 @@ protected: TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0; /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL 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/Adapter.h b/TAO/tao/Adapter.h index 41f12d50af0..e9f0556a7d5 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -45,10 +45,10 @@ class TAO_ServerRequest; class TAO_Export TAO_Adapter { public: - virtual ~TAO_Adapter (void); + virtual ~TAO_Adapter (); /// Initialize the Adapter - virtual void open (void) = 0; + virtual void open () = 0; /// The ORB is shutting down, destroy any resources attached to this /// adapter. @@ -63,7 +63,7 @@ public: * Adapters at higher priority are used first, the first adapter * that matches a key is used to dispatch a request. */ - virtual int priority (void) const = 0; + virtual int priority () const = 0; /// Return the status.... virtual int dispatch (TAO::ObjectKey &key, @@ -94,14 +94,14 @@ public: /// Return the name, i.e. the object id used to resolve it in the /// ORB. - virtual const char *name (void) const = 0; + virtual const char *name () const = 0; /** * Return the root of the Object Adapter. * Each adapter defines its own IDL interface accessed through the * method above. */ - virtual CORBA::Object_ptr root (void) = 0; + virtual CORBA::Object_ptr root () = 0; /// Create a collocated object using the given profile and stub. virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h index 876864a2240..20105ad3964 100644 --- a/TAO/tao/Adapter_Factory.h +++ b/TAO/tao/Adapter_Factory.h @@ -33,7 +33,7 @@ class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Adapter_Factory (void); + virtual ~TAO_Adapter_Factory (); /// Create a new adapter virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0; diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 421fc0b234a..037f59e23d2 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -51,7 +51,7 @@ public: explicit TAO_Adapter_Registry (TAO_ORB_Core *); /// Close the - ~TAO_Adapter_Registry (void); + ~TAO_Adapter_Registry (); /** * Close each of of the Adapters and then cleanup the 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/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index d617283dbb0..4b525902eb6 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -66,8 +66,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: @@ -82,10 +82,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::TypeCode_ptr content_type_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::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 6a89a9dcb7b..48e0a7a074e 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -57,14 +57,14 @@ TAO::TypeCode::Alias<char const *, void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -100,7 +100,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -132,7 +132,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -142,7 +142,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -152,7 +152,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::content_type_i (void) const + TAO::Null_RefCount_Policy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 05a8f675fac..96c9bac0238 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_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: @@ -85,10 +85,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::TypeCode_ptr content_type_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::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index b74124189a3..45e7c8c7c51 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL using namespace TAO; -CORBA::Any::Any (void) +CORBA::Any::Any () : impl_ (0) { } @@ -37,7 +37,7 @@ CORBA::Any::Any (const CORBA::Any &rhs) } } -CORBA::Any::~Any (void) +CORBA::Any::~Any () { if (this->impl_ != 0) { @@ -80,7 +80,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl) } CORBA::TypeCode_ptr -CORBA::Any::type (void) const +CORBA::Any::type () const { if (this->impl_ != 0) { @@ -91,7 +91,7 @@ CORBA::Any::type (void) const } CORBA::TypeCode_ptr -CORBA::Any::_tao_get_typecode (void) const +CORBA::Any::_tao_get_typecode () const { if (this->impl_ != 0) { @@ -116,7 +116,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc) } int -CORBA::Any::_tao_byte_order (void) const +CORBA::Any::_tao_byte_order () const { if (this->impl_ != 0) { diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 2f644c9ad78..9f879820950 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -66,13 +66,13 @@ namespace CORBA typedef Any_var _var_type; typedef Any_out _out_type; - Any (void); + Any (); Any (const Any &); - ~Any (void); + ~Any (); Any &operator= (const Any &); - TAO::Any_Impl *impl (void) const; + TAO::Any_Impl *impl () const; /// Used in our destruction if we ourselves are stored in an Any. static void _tao_any_destructor (void *); @@ -146,19 +146,19 @@ namespace CORBA void replace (TAO::Any_Impl *); /// Return TypeCode of the element stored in the Any. - TypeCode_ptr type (void) const; + TypeCode_ptr type () const; /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (TypeCode_ptr); /// TAO extension, does not return a duplicate. - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr _tao_get_typecode () const; /// TAO extension. void _tao_set_typecode (const CORBA::TypeCode_ptr); - int _tao_byte_order (void) const; + int _tao_byte_order () const; private: CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const; @@ -184,10 +184,10 @@ namespace CORBA class TAO_AnyTypeCode_Export Any_var { public: - Any_var (void); + Any_var (); Any_var (Any *a); Any_var (const Any_var &); - ~Any_var (void); + ~Any_var (); Any_var &operator= (Any *); @@ -200,7 +200,7 @@ namespace CORBA Any_var &operator= (const Any_var &); /// Arrow operator (smart pointer). - Any *operator-> (void); + Any *operator-> (); /// Cast. operator const Any *() const; @@ -209,19 +209,19 @@ namespace CORBA operator Any *&(); /// For in Any parameter. - const Any &in (void) const; + const Any &in () const; /// For inout Any parameter. - Any &inout (void); + Any &inout (); /// For out Any parameter. - Any *&out (void); + Any *&out (); /// For Any return type. - Any *_retn (void); + Any *_retn (); /// TAO specific extension - Any *ptr (void) const; + Any *ptr () const; private: /// Holds the Any. Any *ptr_; @@ -252,9 +252,9 @@ namespace CORBA operator Any *&(); /// Return underlying instance. - Any *& ptr (void); + Any *& ptr (); - Any *operator-> (void); + Any *operator-> (); private: /// Assignment from _var disallowed. diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index cb8beef4ed0..7c9a1911696 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -287,7 +287,7 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS } int -TAO_AnyTypeCode_Adapter_Impl::Initializer (void) +TAO_AnyTypeCode_Adapter_Impl::Initializer () { // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton // which we need to initialise before Unknown_IDL_Types are used in a diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index ab8c7d6d3f6..566233eb0cf 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -32,7 +32,7 @@ class TAO_AnyTypeCode_Export TAO_AnyTypeCode_Adapter_Impl { public: // Used to force the initialization of the code. - static int Initializer (void); + static int Initializer (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 48dfb7e9f17..9222c88dbce 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -93,11 +93,7 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any, T_forany::tao_alloc ()), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index ace666a3009..8273695fffd 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -66,7 +66,7 @@ namespace TAO } } - Any_Basic_Impl::~Any_Basic_Impl (void) + Any_Basic_Impl::~Any_Basic_Impl () { } @@ -116,11 +116,7 @@ namespace TAO TAO::Any_Basic_Impl *replacement = TAO::Any_Basic_Impl::create_empty (any_tc); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index ab18778fc0f..c2796c62777 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -40,7 +40,7 @@ namespace TAO Any_Basic_Impl (CORBA::TypeCode_ptr, void *value); - virtual ~Any_Basic_Impl (void); + virtual ~Any_Basic_Impl (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index a45b3b2481b..7e82b968f9f 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -78,11 +78,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any, TAO::Any_Basic_Impl_T<T> * const replacement = TAO::Any_Basic_Impl_T<T>::create_empty (any_tc); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = 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/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 42cc10a0066..41bb34ba6aa 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -158,11 +158,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, ACE_NEW_RETURN (empty_value, T, false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<T> empty_value_safety (empty_value); -#else - auto_ptr<T> empty_value_safety (empty_value); -#endif /* ACE_HAS_CPP11 */ TAO::Any_Dual_Impl_T<T> *replacement = 0; ACE_NEW_RETURN (replacement, TAO::Any_Dual_Impl_T<T> (destructor, @@ -170,11 +166,7 @@ TAO::Any_Dual_Impl_T<T>::replace (TAO_InputCDR &cdr, empty_value), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ CORBA::Boolean const good_decode = replacement->demarshal_value (cdr); diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index 4d35f4add89..dd627266355 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -45,7 +45,7 @@ namespace TAO CORBA::TypeCode_ptr, const T &); Any_Dual_Impl_T (CORBA::TypeCode_ptr); - virtual ~Any_Dual_Impl_T (void); + virtual ~Any_Dual_Impl_T (); static void insert (CORBA::Any &, _tao_destructor, @@ -64,8 +64,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: void value (const T &); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index 3633d68739f..b1867d468e3 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -22,7 +22,7 @@ TAO::Any_Impl::Any_Impl (_tao_destructor destructor, { } -TAO::Any_Impl::~Any_Impl (void) +TAO::Any_Impl::~Any_Impl () { } @@ -56,20 +56,20 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr) } void -TAO::Any_Impl::free_value (void) +TAO::Any_Impl::free_value () { // We always have to do this. ::CORBA::release (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::type (void) const +TAO::Any_Impl::type () const { return CORBA::TypeCode::_duplicate (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::_tao_get_typecode (void) const +TAO::Any_Impl::_tao_get_typecode () const { return this->type_; } @@ -82,7 +82,7 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc) } int -TAO::Any_Impl::_tao_byte_order (void) const +TAO::Any_Impl::_tao_byte_order () const { return TAO_ENCAP_BYTE_ORDER; } @@ -102,13 +102,13 @@ TAO::Any_Impl::_tao_any_wstring_destructor (void *x) } void -TAO::Any_Impl::_add_ref (void) +TAO::Any_Impl::_add_ref () { ++this->refcount_; } void -TAO::Any_Impl::_remove_ref (void) +TAO::Any_Impl::_remove_ref () { CORBA::ULong const new_count = --this->refcount_; @@ -145,7 +145,7 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const } bool -TAO::Any_Impl::encoded (void) const +TAO::Any_Impl::encoded () const { return this->encoded_; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 2446ec37368..622ade7405c 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -22,15 +22,7 @@ #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Basic_Types.h" - -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Synch_Traits.h" -# include "ace/Null_Mutex.h" -# include "ace/Thread_Mutex.h" -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,16 +61,16 @@ namespace TAO CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0; - virtual void free_value (void); + virtual void free_value (); - CORBA::TypeCode_ptr type (void) const; - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr type () const; + CORBA::TypeCode_ptr _tao_get_typecode () const; void type (CORBA::TypeCode_ptr); - virtual int _tao_byte_order (void) const; + virtual int _tao_byte_order () const; - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); /// Used to release these CORBA basic types. static void _tao_any_string_destructor (void *); @@ -90,13 +82,13 @@ namespace TAO virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const; - bool encoded (void) const; + bool encoded () const; protected: Any_Impl (_tao_destructor, CORBA::TypeCode_ptr, bool encoded = false); - virtual ~Any_Impl (void); + virtual ~Any_Impl (); TAO::Any_Impl::_tao_destructor value_destructor_; CORBA::TypeCode_ptr type_; @@ -104,11 +96,7 @@ namespace TAO private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index f389796bff3..c0ba6c2d82b 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -91,11 +91,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any, 0), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index 3be4db172f9..c69f916df91 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -43,7 +43,7 @@ namespace TAO Any_Impl_T (_tao_destructor destructor, CORBA::TypeCode_ptr, T * const); - virtual ~Any_Impl_T (void); + virtual ~Any_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -61,8 +61,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & ); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index a5cdeb3239d..b728b74f42c 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -129,11 +129,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any, bound), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index 19631ca8c2d..c57d09c7a04 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO CORBA::TypeCode_ptr, T * const, CORBA::ULong bound); - virtual ~Any_Special_Impl_T (void); + virtual ~Any_Special_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -54,8 +54,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 2e06f71b942..1e905894b64 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -40,7 +40,7 @@ TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc) { } -TAO::Any_SystemException::~Any_SystemException (void) +TAO::Any_SystemException::~Any_SystemException () { } @@ -116,11 +116,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, empty_value), false); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO::Any_SystemException > replacement_safety (replacement); -#else - auto_ptr<TAO::Any_SystemException > replacement_safety (replacement); -#endif /* ACE_HAS_CPP11 */ // We know this will work since the unencoded case is covered above. TAO::Unknown_IDL_Type * const unk = @@ -152,7 +148,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, } void -TAO::Any_SystemException::free_value (void) +TAO::Any_SystemException::free_value () { if (this->value_destructor_ != 0) { @@ -165,7 +161,7 @@ TAO::Any_SystemException::free_value (void) } const void * -TAO::Any_SystemException::value (void) const +TAO::Any_SystemException::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index 2cb231476f4..622e5e501d4 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -50,7 +50,7 @@ namespace TAO Any_SystemException (CORBA::TypeCode_ptr); - virtual ~Any_SystemException (void); + virtual ~Any_SystemException (); static void insert (CORBA::Any &, _tao_destructor, @@ -71,8 +71,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: CORBA::SystemException *value_; diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 72e818c8ca7..bacd24e67d5 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Unknown_IDL_Type::LOCK const -TAO::Unknown_IDL_Type::lock_i (void) +TAO::Unknown_IDL_Type::lock_i () { static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>()); return base_lock_; @@ -49,7 +49,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc) { } -TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void) +TAO::Unknown_IDL_Type::~Unknown_IDL_Type () { } @@ -81,25 +81,25 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR & cdr) } const void * -TAO::Unknown_IDL_Type::value (void) const +TAO::Unknown_IDL_Type::value () const { return this->cdr_.start (); } void -TAO::Unknown_IDL_Type::free_value (void) +TAO::Unknown_IDL_Type::free_value () { ::CORBA::release (this->type_); } TAO_InputCDR & -TAO::Unknown_IDL_Type::_tao_get_cdr (void) +TAO::Unknown_IDL_Type::_tao_get_cdr () { return this->cdr_; } int -TAO::Unknown_IDL_Type::_tao_byte_order (void) const +TAO::Unknown_IDL_Type::_tao_byte_order () const { return this->cdr_.byte_order (); } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index b313a294ef0..a26f7f02240 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -43,14 +43,14 @@ namespace TAO Unknown_IDL_Type (CORBA::TypeCode_ptr); - virtual ~Unknown_IDL_Type (void); + virtual ~Unknown_IDL_Type (); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); - virtual TAO_InputCDR &_tao_get_cdr (void); - virtual int _tao_byte_order (void) const; + virtual TAO_InputCDR &_tao_get_cdr (); + virtual int _tao_byte_order () const; virtual void _tao_decode (TAO_InputCDR &); @@ -79,7 +79,7 @@ namespace TAO typedef ACE_Refcounted_Auto_Ptr<ACE_Lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > LOCK; - static LOCK const lock_i (void); + static LOCK const lock_i (); LOCK const lock_; mutable TAO_InputCDR cdr_; }; diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 1cf8645c5a2..6792fb8b35f 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -16,7 +16,7 @@ TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const } void -TAO::TypeCode::Empty_Param::tao_duplicate (void) +TAO::TypeCode::Empty_Param::tao_duplicate () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -24,7 +24,7 @@ TAO::TypeCode::Empty_Param::tao_duplicate (void) } void -TAO::TypeCode::Empty_Param::tao_release (void) +TAO::TypeCode::Empty_Param::tao_release () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -58,7 +58,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const } CORBA::TypeCode_ptr -TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const +TAO::TypeCode::Empty_Param::get_compact_typecode_i () const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index d0ef4e370c2..ba194eff926 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -60,8 +60,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: @@ -76,7 +76,7 @@ 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::TypeCode_ptr get_compact_typecode_i () const; }; } // End namespace TypeCode diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index dbd05818165..245bb43c630 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -63,8 +63,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: @@ -78,10 +78,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/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 75fb4ee17c8..81af701debf 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -58,14 +58,14 @@ TAO::TypeCode::Enum<char const *, void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -124,7 +124,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -161,7 +161,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -172,7 +172,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -183,7 +183,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - void) const + ) const { return this->nenumerators_; } 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/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 56a6b685fa0..e84730b2469 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -57,8 +57,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: @@ -73,9 +73,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::UShort fixed_digits_i (void) const; - virtual CORBA::UShort fixed_scale_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::UShort fixed_digits_i () const; + virtual CORBA::UShort fixed_scale_i () const; private: /// The number of significant digits. diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp index ec34f735087..93a88f1bbc7 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp @@ -24,7 +24,7 @@ TAO::TypeCode::Indirected_Type::tao_marshal (TAO_OutputCDR & cdr, } void -TAO::TypeCode::Indirected_Type::tao_duplicate (void) +TAO::TypeCode::Indirected_Type::tao_duplicate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -39,7 +39,7 @@ TAO::TypeCode::Indirected_Type::tao_duplicate (void) } void -TAO::TypeCode::Indirected_Type::tao_release (void) +TAO::TypeCode::Indirected_Type::tao_release () { unsigned long newcount; CORBA::TypeCode_ptr curmaster; @@ -103,25 +103,25 @@ TAO::TypeCode::Indirected_Type::equivalent_i ( } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::get_compact_typecode_i (void) const +TAO::TypeCode::Indirected_Type::get_compact_typecode_i () const { return this->recursive_tc_ ? this->recursive_tc_->get_compact_typecode () : 0; } char const * -TAO::TypeCode::Indirected_Type::id_i (void) const +TAO::TypeCode::Indirected_Type::id_i () const { return this->id_.in (); } char const * -TAO::TypeCode::Indirected_Type::name_i (void) const +TAO::TypeCode::Indirected_Type::name_i () const { return this->recursive_tc_ ? this->recursive_tc_->name () : 0; } CORBA::ULong -TAO::TypeCode::Indirected_Type::member_count_i (void) const +TAO::TypeCode::Indirected_Type::member_count_i () const { return this->recursive_tc_ ? this->recursive_tc_->member_count () : 0; } @@ -147,13 +147,13 @@ TAO::TypeCode::Indirected_Type::member_visibility_i (CORBA::ULong index) const } CORBA::ValueModifier -TAO::TypeCode::Indirected_Type::type_modifier_i (void) const +TAO::TypeCode::Indirected_Type::type_modifier_i () const { return this->recursive_tc_ ? this->recursive_tc_->type_modifier () : 0; } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::concrete_base_type_i (void) const +TAO::TypeCode::Indirected_Type::concrete_base_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->concrete_base_type () : 0; } @@ -165,13 +165,13 @@ TAO::TypeCode::Indirected_Type::member_label_i (CORBA::ULong index) const } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::discriminator_type_i (void) const +TAO::TypeCode::Indirected_Type::discriminator_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->discriminator_type () : 0; } CORBA::Long -TAO::TypeCode::Indirected_Type::default_index_i (void) const +TAO::TypeCode::Indirected_Type::default_index_i () const { return this->recursive_tc_ ? this->recursive_tc_->default_index () : 0; } diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index b72f0d14f2e..4d810a4150a 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h @@ -64,8 +64,8 @@ namespace TAO //@{ virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const; 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 (); //@} /// Setter for recursive reference. @@ -83,10 +83,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; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} @@ -101,8 +101,8 @@ namespace TAO */ //@{ virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} /** @@ -115,8 +115,8 @@ namespace TAO */ //@{ 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/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 965d22e645c..b7274bcd458 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Marshal_Object::~TAO_Marshal_Object (void) +TAO_Marshal_Object::~TAO_Marshal_Object () { } diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 09a5705b113..6c6bee37e03 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -75,10 +75,10 @@ class TAO_AnyTypeCode_Export TAO_Marshal_Object { public: /// constructor - TAO_Marshal_Object (void); + TAO_Marshal_Object (); /// destructor - virtual ~TAO_Marshal_Object (void); + virtual ~TAO_Marshal_Object (); /// skip entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. @@ -111,7 +111,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Primitive: public TAO_Marshal_Object { public: - TAO_Marshal_Primitive (void); + TAO_Marshal_Primitive (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -133,7 +133,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Any: public TAO_Marshal_Object { public: - TAO_Marshal_Any (void); + TAO_Marshal_Any (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -155,7 +155,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object { public: - TAO_Marshal_TypeCode (void); + TAO_Marshal_TypeCode (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -177,7 +177,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Principal: public TAO_Marshal_Object { public: - TAO_Marshal_Principal (void); + TAO_Marshal_Principal (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -199,7 +199,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object { public: - TAO_Marshal_ObjRef (void); + TAO_Marshal_ObjRef (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -221,7 +221,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object { public: - TAO_Marshal_Struct (void); + TAO_Marshal_Struct (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -243,7 +243,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Union: public TAO_Marshal_Object { public: - TAO_Marshal_Union (void); + TAO_Marshal_Union (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -265,7 +265,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_String: public TAO_Marshal_Object { public: - TAO_Marshal_String (void); + TAO_Marshal_String (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -287,7 +287,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Sequence: public TAO_Marshal_Object { public: - TAO_Marshal_Sequence (void); + TAO_Marshal_Sequence (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -309,7 +309,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Array: public TAO_Marshal_Object { public: - TAO_Marshal_Array (void); + TAO_Marshal_Array (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -331,7 +331,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Alias: public TAO_Marshal_Object { public: - TAO_Marshal_Alias (void); + TAO_Marshal_Alias (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -353,7 +353,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Except: public TAO_Marshal_Object { public: - TAO_Marshal_Except (void); + TAO_Marshal_Except (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -375,7 +375,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_WString : public TAO_Marshal_Object { public: - TAO_Marshal_WString (void); + TAO_Marshal_WString (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -397,7 +397,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Value: public TAO_Marshal_Object { public: - TAO_Marshal_Value (void); + TAO_Marshal_Value (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl index 281a0225f2f..54d26c68102 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -3,77 +3,77 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Marshal_Object::TAO_Marshal_Object (void) +TAO_Marshal_Object::TAO_Marshal_Object () { } ACE_INLINE -TAO_Marshal_Primitive::TAO_Marshal_Primitive (void) +TAO_Marshal_Primitive::TAO_Marshal_Primitive () { } ACE_INLINE -TAO_Marshal_Any::TAO_Marshal_Any (void) +TAO_Marshal_Any::TAO_Marshal_Any () { } ACE_INLINE -TAO_Marshal_Principal::TAO_Marshal_Principal (void) +TAO_Marshal_Principal::TAO_Marshal_Principal () { } ACE_INLINE -TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void) +TAO_Marshal_TypeCode::TAO_Marshal_TypeCode () { } ACE_INLINE -TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void) +TAO_Marshal_ObjRef::TAO_Marshal_ObjRef () { } ACE_INLINE -TAO_Marshal_Struct::TAO_Marshal_Struct (void) +TAO_Marshal_Struct::TAO_Marshal_Struct () { } ACE_INLINE -TAO_Marshal_Union::TAO_Marshal_Union (void) +TAO_Marshal_Union::TAO_Marshal_Union () { } ACE_INLINE -TAO_Marshal_String::TAO_Marshal_String (void) +TAO_Marshal_String::TAO_Marshal_String () { } ACE_INLINE -TAO_Marshal_Sequence::TAO_Marshal_Sequence (void) +TAO_Marshal_Sequence::TAO_Marshal_Sequence () { } ACE_INLINE -TAO_Marshal_Array::TAO_Marshal_Array (void) +TAO_Marshal_Array::TAO_Marshal_Array () { } ACE_INLINE -TAO_Marshal_Alias::TAO_Marshal_Alias (void) +TAO_Marshal_Alias::TAO_Marshal_Alias () { } ACE_INLINE -TAO_Marshal_Except::TAO_Marshal_Except (void) +TAO_Marshal_Except::TAO_Marshal_Except () { } ACE_INLINE -TAO_Marshal_WString::TAO_Marshal_WString (void) +TAO_Marshal_WString::TAO_Marshal_WString () { } ACE_INLINE -TAO_Marshal_Value::TAO_Marshal_Value (void) +TAO_Marshal_Value::TAO_Marshal_Value () : nested_processing_ (false) { } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 927ae22006c..7c0571e618f 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -23,13 +23,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object CORBA::ULong -CORBA::NamedValue::_incr_refcount (void) +CORBA::NamedValue::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NamedValue::_decr_refcount (void) +CORBA::NamedValue::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -39,7 +39,7 @@ CORBA::NamedValue::_decr_refcount (void) return new_count; } -CORBA::NamedValue::~NamedValue (void) +CORBA::NamedValue::~NamedValue () { if (this->name_) { @@ -52,13 +52,13 @@ CORBA::NamedValue::~NamedValue (void) // **************************************************************** CORBA::ULong -CORBA::NVList::_incr_refcount (void) +CORBA::NVList::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NVList::_decr_refcount (void) +CORBA::NVList::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -68,7 +68,7 @@ CORBA::NVList::_decr_refcount (void) return new_count; } -CORBA::NVList::~NVList (void) +CORBA::NVList::~NVList () { // initialize an iterator and delete each NamedValue ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_); @@ -402,7 +402,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) } ptrdiff_t -CORBA::NVList::_tao_target_alignment (void) +CORBA::NVList::_tao_target_alignment () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -426,17 +426,13 @@ CORBA::NVList::_tao_target_alignment (void) } void -CORBA::NVList::evaluate (void) +CORBA::NVList::evaluate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (this->incoming_ != 0) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_InputCDR> incoming (this->incoming_); -#else - auto_ptr<TAO_InputCDR> incoming (this->incoming_); -#endif /* ACE_HAS_CPP11 */ this->incoming_ = 0; this->_tao_decode (*(incoming.get ()), this->incoming_flag_); @@ -444,7 +440,7 @@ CORBA::NVList::evaluate (void) } CORBA::Boolean -CORBA::NVList::_lazy_has_arguments (void) const +CORBA::NVList::_lazy_has_arguments () const { if (this->incoming_ != 0) { diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 001a1d7691d..989df82cd99 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -26,11 +26,7 @@ #include "ace/Unbounded_Queue.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -84,21 +80,21 @@ namespace CORBA public: /// optional name - const char * name (void) const; + const char * name () const; /// return the value - Any_ptr value (void) const; + Any_ptr value () const; /// return the parameter mode flag - Flags flags (void) const; + Flags flags () const; // The pseudo object static methods.. static NamedValue * _duplicate (NamedValue *); - static NamedValue * _nil (void); + static NamedValue * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // Useful for template programming. typedef NamedValue_ptr _ptr_type; @@ -111,20 +107,16 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NamedValue (void); + ~NamedValue (); private: /// private constructor. Cannot be directly instantiated other than /// by its friends. - NamedValue (void); + NamedValue (); private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// holds the value Any any_; @@ -165,7 +157,7 @@ namespace CORBA public: /// return the current number of elements in the list - ULong count (void) const; + ULong count () const; /// add an element and just initialize the flags NamedValue_ptr add (Flags); @@ -193,11 +185,11 @@ namespace CORBA // The pseudo object static methods.. static NVList * _duplicate (NVList *); - static NVList * _nil (void); + static NVList * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // = TAO Extensions: @@ -223,14 +215,14 @@ namespace CORBA * re-alignment. * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors. */ - ptrdiff_t _tao_target_alignment (void); + ptrdiff_t _tao_target_alignment (); /** * If this list is used by a DII request, this will tell us if * our CDR stream contains any marshaled arguments (needed for * GIOP 1.2). */ - Boolean _lazy_has_arguments (void) const; + Boolean _lazy_has_arguments () const; // Useful for template programming. typedef NVList_ptr _ptr_type; @@ -243,12 +235,12 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NVList (void); + ~NVList (); private: /// Constructor - cannot be instantiated directly other than /// through the CORBA::ORB::create_list method - NVList (void); + NVList (); /// Helper to increase the list size. This is used by all the add_ /// methods of the NVList class @@ -256,7 +248,7 @@ namespace CORBA /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (void); + void evaluate (); private: /// Internal list of parameters stored as NamedValues @@ -266,11 +258,7 @@ namespace CORBA ULong max_; /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Protects the incoming pointer. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index d170907e390..a9d1940a8df 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -55,7 +55,7 @@ TAO_NVList_Adapter_Impl::create_named_value (CORBA::NamedValue_ptr &nv) } int -TAO_NVList_Adapter_Impl::Initializer (void) +TAO_NVList_Adapter_Impl::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index aca4292e926..5ad1d79264e 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -36,7 +36,7 @@ public: virtual void create_named_value (CORBA::NamedValue_ptr &nv); /// Used to force the initialization of the NVList adapter - static int Initializer (void); + static int Initializer (); }; static int TAO_Requires_NVList_Adapter_Impl_Initializer = diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 09b696a606c..6dd3b5e1fa0 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -66,10 +66,10 @@ namespace TAO public: /// No-op reference increment. - void add_ref (void) { } + void add_ref () { } /// No-op reference decrement. - void remove_ref (void) { } + void remove_ref () { } }; diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 59e1abf4e3c..5a43981c0f2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.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: @@ -86,9 +86,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 char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 2502e71169d..9022c9ce878 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -38,13 +38,13 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -70,7 +70,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -116,7 +116,7 @@ TAO::TypeCode::Objref<char const *, char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -125,7 +125,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index 0887c074809..8166b24edbe 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -73,8 +73,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: @@ -90,9 +90,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 char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 403529e8650..d8482d33599 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -143,7 +143,7 @@ namespace TAO { public: Reset (CORBA::ULong & flag) : flag_ (flag) { } - ~Reset (void) { this->flag_ = 0; } + ~Reset () { this->flag_ = 0; } private: CORBA::ULong & flag_; }; diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 9b621ac9bd3..154a4d41742 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -60,8 +60,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: @@ -76,9 +76,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/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 99f8e26c3bf..5ef1aec82db 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -48,13 +48,13 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -105,7 +105,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -126,7 +126,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::ULong TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } @@ -134,7 +134,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( 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/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 507ad7ba137..8ca53f95e6e 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -59,8 +59,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: @@ -75,8 +75,8 @@ 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 get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 90b9344e529..83f28c3add9 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -24,12 +24,12 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate () { } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release () { } @@ -57,7 +57,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -71,7 +71,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( CORBA::ULong TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8fb262cb65d..388644be81b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -62,8 +62,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: @@ -78,8 +78,8 @@ 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 get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index 3234062e624..4e5fb375edf 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -72,8 +72,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 (); //@} /// Accessor for fields_ @@ -91,10 +91,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; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 212bd380a39..fb6853c958e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -83,7 +83,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -92,7 +92,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -181,7 +181,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -229,7 +229,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -241,7 +241,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -253,7 +253,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index aa800a6b537..06bbd178928 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -78,8 +78,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: @@ -94,10 +94,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; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 3f25a04ed14..97662a84f02 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::True_RefCount_Policy::~True_RefCount_Policy (void) +TAO::True_RefCount_Policy::~True_RefCount_Policy () { } diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index e1198f14cbe..257032630fc 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -25,11 +25,7 @@ #include "tao/orbconf.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -75,7 +71,7 @@ namespace TAO public: /// Increase the reference count on this object. - void add_ref (void); + void add_ref (); /// Decrease the reference count on this object. /** @@ -83,7 +79,7 @@ namespace TAO * reference count drops to zero, call @c operator @c delete() * on this object. */ - void remove_ref (void); + void remove_ref (); protected: /// Constructor. @@ -91,7 +87,7 @@ namespace TAO * @note This constructor is protected since it not meant to be * instantiated/used as a standalone object. */ - True_RefCount_Policy (void); + True_RefCount_Policy (); /// Destructor. /** @@ -100,15 +96,11 @@ namespace TAO * zero, i.e. when @c remove_ref() calls @c operator * @c delete @c this. */ - virtual ~True_RefCount_Policy (void); + virtual ~True_RefCount_Policy (); private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End namespace TAO diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index b8277a895cc..53108bd3b91 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::TypeCode::~TypeCode (void) +CORBA::TypeCode::~TypeCode () { } @@ -113,19 +113,19 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const } char const * -CORBA::TypeCode::id_i (void) const +CORBA::TypeCode::id_i () const { throw ::CORBA::TypeCode::BadKind (); } char const * -CORBA::TypeCode::name_i (void) const +CORBA::TypeCode::name_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::member_count_i (void) const +CORBA::TypeCode::member_count_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -149,37 +149,37 @@ CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const } CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (void) const +CORBA::TypeCode::discriminator_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::Long -CORBA::TypeCode::default_index_i (void) const +CORBA::TypeCode::default_index_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::length_i (void) const +CORBA::TypeCode::length_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (void) const +CORBA::TypeCode::content_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_digits_i (void) const +CORBA::TypeCode::fixed_digits_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_scale_i (void) const +CORBA::TypeCode::fixed_scale_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -191,20 +191,20 @@ CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const } CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (void) const +CORBA::TypeCode::type_modifier_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (void) const +CORBA::TypeCode::concrete_base_type_i () const { throw ::CORBA::TypeCode::BadKind (); } // --------------------------------------------------------------- -CORBA::TypeCode::Bounds::Bounds (void) +CORBA::TypeCode::Bounds::Bounds () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0", "Bounds") { @@ -217,7 +217,7 @@ CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::Bounds::_alloc (void) +CORBA::TypeCode::Bounds::_alloc () { CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0); @@ -225,7 +225,7 @@ CORBA::TypeCode::Bounds::_alloc (void) } CORBA::Exception * -CORBA::TypeCode::Bounds::_tao_duplicate (void) const +CORBA::TypeCode::Bounds::_tao_duplicate () const { CORBA::Exception *result; ACE_NEW_RETURN (result, @@ -235,7 +235,7 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const } void -CORBA::TypeCode::Bounds::_raise (void) const +CORBA::TypeCode::Bounds::_raise () const { throw *this; } @@ -258,7 +258,7 @@ CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &) // **************************************************************** -CORBA::TypeCode::BadKind::BadKind (void) +CORBA::TypeCode::BadKind::BadKind () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0", "BadKind") { @@ -271,7 +271,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::BadKind::_tao_duplicate (void) const +CORBA::TypeCode::BadKind::_tao_duplicate () const { CORBA::Exception *result = 0; ACE_NEW_RETURN (result, @@ -281,7 +281,7 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const } void -CORBA::TypeCode::BadKind::_raise (void) const +CORBA::TypeCode::BadKind::_raise () const { throw *this; } @@ -402,7 +402,7 @@ namespace TAO } CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::nil (void) + Objref_Traits<CORBA::TypeCode>::nil () { return CORBA::TypeCode::_nil (); } diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index d7701ab1c50..9a21085a314 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -70,14 +70,14 @@ namespace CORBA public: /// Constructor. - Bounds (void); + Bounds (); static Bounds * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -96,14 +96,14 @@ namespace CORBA { public: - BadKind (void); + BadKind (); static BadKind * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -123,7 +123,7 @@ namespace CORBA static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc); /// Returns a NULL typecode. - static CORBA::TypeCode_ptr _nil (void); + static CORBA::TypeCode_ptr _nil (); /** * @name @c CORBA::TypeCode Methods @@ -158,7 +158,7 @@ namespace CORBA Boolean equivalent (TypeCode_ptr tc) const; /// The kind of @c TypeCode. - TCKind kind (void) const; + TCKind kind () const; /// Return @c TypeCode stripped of optional @c name and /// @c member_name fields. @@ -180,7 +180,7 @@ namespace CORBA * the TAO_IDL compiler by invoking it with its "-Gt" * (i.e. enable optimized TypeCodes) command line option. */ - TypeCode_ptr get_compact_typecode (void) const; + TypeCode_ptr get_compact_typecode () const; /// The @c RepositoryId globally identifying the type. /** @@ -206,7 +206,7 @@ namespace CORBA * is required by the C++ mapping. In particular, ownership * is maintained by the @c TypeCode. */ - char const * id (void) const; + char const * id () const; /// The simple name identifying the type within its enclosing /// scope. @@ -233,7 +233,7 @@ namespace CORBA * behavior is required by the C++ mapping. In particular, * ownership is maintained by the @c TypeCode. */ - char const * name (void) const; + char const * name () const; /// The type member count. /** @@ -246,7 +246,7 @@ namespace CORBA * @li @c tk_except * @li @c tk_event */ - ULong member_count (void) const; + ULong member_count () const; /// The type member name. /** @@ -292,7 +292,7 @@ namespace CORBA * * @li @c tk_union */ - TypeCode_ptr discriminator_type (void) const; + TypeCode_ptr discriminator_type () const; /// The index of the default union member. /** @@ -300,7 +300,7 @@ namespace CORBA * * @li @c tk_union */ - Long default_index (void) const; + Long default_index () const; /// The length of the type. /** @@ -311,7 +311,7 @@ namespace CORBA * @li @c tk_sequence * @li @c tk_array */ - ULong length (void) const; + ULong length () const; /// The underlying content type. /** @@ -322,7 +322,7 @@ namespace CORBA * @li @c tk_value_box * @li @c tk_alias */ - TypeCode_ptr content_type (void) const; + TypeCode_ptr content_type () const; /// The number of significant digits. /** @@ -330,7 +330,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_digits (void) const; + UShort fixed_digits () const; /// The scale factor. /** @@ -338,7 +338,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_scale (void) const; + UShort fixed_scale () const; /// The @c Visibility of the @c valuetype or @c eventtype member /// corresponding to index @a index. @@ -358,7 +358,7 @@ namespace CORBA * @li @c tk_value * @li @c tk_event */ - ValueModifier type_modifier (void) const; + ValueModifier type_modifier () const; /// The @c TypeCode corresponding to the concrete base /// @c valuetype or @c eventtype. @@ -372,7 +372,7 @@ namespace CORBA * @c valuetype or @c eventtype. * @c CORBA::TypeCode::_nil() if no concrete base exists. */ - TypeCode_ptr concrete_base_type (void) const; + TypeCode_ptr concrete_base_type () const; //@} /// Marshal the @c TypeCode @c TCKind. @@ -411,10 +411,10 @@ namespace CORBA CORBA::ULong offset) const = 0; /// Increase the reference count on this @c TypeCode. - virtual void tao_duplicate (void) = 0; + virtual void tao_duplicate () = 0; /// Decrease the reference count on this object. - virtual void tao_release (void) = 0; + virtual void tao_release () = 0; /// Destruction callback for Anys. static void _tao_any_destructor (void * x); @@ -432,7 +432,7 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~TypeCode (void); + virtual ~TypeCode (); /** * @name @c TypeCode Template Methods @@ -453,23 +453,23 @@ namespace CORBA //@{ virtual Boolean equal_i (TypeCode_ptr tc) const = 0; virtual Boolean equivalent_i (TypeCode_ptr tc) const = 0; - virtual TypeCode_ptr get_compact_typecode_i (void) const = 0; + virtual TypeCode_ptr get_compact_typecode_i () const = 0; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual ULong member_count_i (void) const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual ULong member_count_i () const; virtual char const * member_name_i (ULong index) const; virtual TypeCode_ptr member_type_i (ULong index) const; virtual Any * member_label_i (ULong index) const; - virtual TypeCode_ptr discriminator_type_i (void) const; - virtual Long default_index_i (void) const; - virtual ULong length_i (void) const; - virtual TypeCode_ptr content_type_i (void) const; - virtual UShort fixed_digits_i (void) const; - virtual UShort fixed_scale_i (void) const; + virtual TypeCode_ptr discriminator_type_i () const; + virtual Long default_index_i () const; + virtual ULong length_i () const; + virtual TypeCode_ptr content_type_i () const; + virtual UShort fixed_digits_i () const; + virtual UShort fixed_scale_i () const; virtual Visibility member_visibility_i (ULong index) const; - virtual ValueModifier type_modifier_i (void) const; - virtual TypeCode_ptr concrete_base_type_i (void) const; + virtual ValueModifier type_modifier_i () const; + virtual TypeCode_ptr concrete_base_type_i () const; //@} private: @@ -549,7 +549,7 @@ namespace TAO { static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr); static void release (::CORBA::TypeCode_ptr); - static ::CORBA::TypeCode_ptr nil (void); + static ::CORBA::TypeCode_ptr nil (); static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p, TAO_OutputCDR & cdr); }; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 1616339555c..193de495ea3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -51,11 +51,11 @@ namespace TAO Base_Attributes (char const * id); /// Get the @c RepositoryId globally identifying the type. - char const * id (void) const; + char const * id () const; /// Get the simple name identifying the type within its /// enclosing scope. - char const * name (void) const; + char const * name () const; /// Set the simple name identifying the type within its /// enclosing scope. diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index b3d656e61cb..e80e1c653a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -44,7 +44,7 @@ namespace TAO struct TC_Info { /// Constructor. - TC_Info (void) : id (0), type () {} + TC_Info () : id (0), type () {} /// Repository ID. char const * id; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index da96f1360cd..1e420b17592 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -60,20 +60,20 @@ namespace TAO /** * Constructor used when creating dynamic @c union @c TypeCodes. */ - Case (void); + Case (); /// Destructor. - virtual ~Case (void); + virtual ~Case (); /// Cloning/copying operation. - virtual Case * clone (void) const = 0; + virtual Case * clone () const = 0; /// Return the IDL @c union case label value embedded within a /// @c CORBA::Any. - virtual CORBA::Any * label (void) const = 0; + virtual CORBA::Any * label () const = 0; /// Get the name of the @c union case/member. - char const * name (void) const; + char const * name () const; /// Set the name of the @c union case/member. void name (char const * the_name); @@ -83,7 +83,7 @@ namespace TAO * @note The reference count is not manipulated by this method, * i.e., ownership is retained by this class. */ - CORBA::TypeCode_ptr type (void) const; + CORBA::TypeCode_ptr type () const; /// Set the @c CORBA::TypeCode of the @c union case/member. /** diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index de360a3cdcb..b44435db95f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -71,8 +71,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index d6ab4a1ab36..973edcffb32 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -108,8 +108,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 31855ed90a4..99cc7cf771a 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -76,12 +76,12 @@ 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 (); //@} /// Accessor for cases_ - const CaseArrayType& cases(void) const; + const CaseArrayType& cases() const; protected: /** @@ -94,15 +94,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::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index 14193893e5e..d702bec5bfc 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -78,7 +78,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -87,7 +87,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -198,7 +198,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -253,7 +253,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -265,7 +265,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -277,7 +277,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->ncases_; } @@ -352,7 +352,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::discriminator_type_i (void) const + TAO::Null_RefCount_Policy>::discriminator_type_i () const { return CORBA::TypeCode::_duplicate ( @@ -364,7 +364,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::default_index_i (void) const + TAO::Null_RefCount_Policy>::default_index_i () const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index 180747f1428..e624fcbece0 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -80,8 +80,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::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index c454d0cbe1a..836403fd08d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -76,12 +76,12 @@ 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 (); //@} /// Accessor for concrete_base_ - const TypeCodeType& concrete_base(void) const; + const TypeCodeType& concrete_base() const; /// Accessor for fields_ const FieldArrayType& fields() const; @@ -98,15 +98,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; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 311b8f541a8..54d40980a78 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -87,7 +87,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -96,7 +96,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -224,7 +224,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -275,7 +275,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -287,7 +287,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -299,7 +299,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } @@ -355,7 +355,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::type_modifier_i (void) const + TAO::Null_RefCount_Policy>::type_modifier_i () const { return this->type_modifier_; } @@ -366,7 +366,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::concrete_base_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( 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/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 395fdb7df83..e7e793c952c 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -62,7 +62,7 @@ class TAO_Export TAO_AnyTypeCode_Adapter : public ACE_Service_Object { public: - virtual ~TAO_AnyTypeCode_Adapter (void); + virtual ~TAO_AnyTypeCode_Adapter (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 96b084c29b5..f47baa2a74f 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -51,7 +51,7 @@ namespace TAO public: /// Destructor. - virtual ~Argument (void); + virtual ~Argument (); /// Marshal the argument into the given CDR output stream. /** @@ -66,7 +66,7 @@ namespace TAO virtual CORBA::Boolean demarshal (TAO_InputCDR &); /// Template method to clone a TAO Argument - virtual Argument* clone (void); + virtual Argument* clone (); #if TAO_HAS_INTERCEPTORS == 1 @@ -86,7 +86,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *) const; /// Get the parameter mode of this argument - virtual CORBA::ParameterMode mode (void) const = 0; + virtual CORBA::ParameterMode mode () const = 0; //@} #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -97,7 +97,7 @@ namespace TAO class TAO_Export InArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InArgument; @@ -107,7 +107,7 @@ namespace TAO class TAO_Export InoutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InoutArgument; @@ -117,7 +117,7 @@ namespace TAO class TAO_Export OutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument OutArgument; @@ -127,7 +127,7 @@ namespace TAO class TAO_Export RetArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument RetArgument; @@ -136,7 +136,7 @@ namespace TAO class TAO_Export Void_Return_Argument : public RetArgument { public: - virtual Argument* clone (void); + virtual Argument* clone (); }; } diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 086cd3eacc1..33a79646a44 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -37,7 +37,7 @@ struct array_traits TAO::Array_Traits<forany_type>::free (value); } - inline static slice_type * alloc (void) + inline static slice_type * alloc () { return TAO::Array_Traits<forany_type>::alloc (); } diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 294c0c21a37..78ac9ed7eff 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -49,10 +49,10 @@ public: typedef T_slice _slice_type; typedef TAG _tag_type; - TAO_Array_Forany_T (void); + TAO_Array_Forany_T (); TAO_Array_Forany_T (_slice_type *, CORBA::Boolean nocopy = false); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); - ~TAO_Array_Forany_T (void); + ~TAO_Array_Forany_T (); static void _tao_any_destructor (void *); @@ -72,14 +72,14 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); - _slice_type * ptr (void) const; - CORBA::Boolean nocopy (void) const; - - static _slice_type * tao_alloc (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); + _slice_type * ptr () const; + CORBA::Boolean nocopy () const; + + static _slice_type * tao_alloc (); private: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -99,10 +99,10 @@ public: typedef T_slice const & _const_subscript_type; typedef T_slice & _subscript_type; - TAO_Array_Var_Base_T (void); + TAO_Array_Var_Base_T (); TAO_Array_Var_Base_T (_slice_type *); TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T,T_slice,TAG> &); - ~TAO_Array_Var_Base_T (void); + ~TAO_Array_Var_Base_T (); _subscript_type operator[] (CORBA::ULong index); _const_subscript_type operator[] (CORBA::ULong index) const; @@ -114,13 +114,13 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _retn_type _retn (void); - _retn_arg_type _retn_arg (void); + _in_type in () const; + _inout_type inout (); + _retn_type _retn (); + _retn_arg_type _retn_arg (); // TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -139,7 +139,7 @@ public: typedef T_slice _slice_type; typedef T_slice *_out_type; - TAO_FixedArray_Var_T (void); + TAO_FixedArray_Var_T (); TAO_FixedArray_Var_T (_slice_type *); TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T,T_slice,TAG> &); @@ -147,7 +147,7 @@ public: TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_FixedArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); private: // Some compilers don't look into the base class when parsing @@ -168,7 +168,7 @@ public: typedef T_slice _slice_type; typedef T_slice *&_out_type; - TAO_VarArray_Var_T (void); + TAO_VarArray_Var_T (); TAO_VarArray_Var_T (_slice_type *); TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T,T_slice,TAG> &); @@ -176,7 +176,7 @@ public: TAO_VarArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_VarArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); operator _slice_type *& (); @@ -208,7 +208,7 @@ public: TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (_slice_type *); operator _slice_type *& (); - _slice_type *& ptr (void); + _slice_type *& ptr (); _slice_type & operator[] (CORBA::ULong index); const _slice_type & operator[] (CORBA::ULong index) const; 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/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 8af4f039df8..806620dc950 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -39,7 +39,7 @@ namespace TAO #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; protected: S const & x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Basic_Clonable_Argument_T (S const & x); - virtual ~In_Basic_Clonable_Argument_T (void); + virtual ~In_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #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_; @@ -107,7 +107,7 @@ namespace TAO #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_; @@ -124,16 +124,16 @@ namespace TAO class Ret_Basic_Argument_T : public RetArgument { public: - Ret_Basic_Argument_T (void); + Ret_Basic_Argument_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); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; 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/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index b3c667e962a..a249e9110ff 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -37,7 +37,7 @@ public: typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type; // @copydoc TAO::details::generic_sequence::generic_sequence() - inline bounded_basic_string_sequence(void) + inline bounded_basic_string_sequence() : impl_() {} // @copydoc TAO::details::generic_sequence::generic_sequence() 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/CDR.h b/TAO/tao/CDR.h index f7406c6000d..1b1168c5cf2 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -163,7 +163,7 @@ public: ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR); /// Destructor. - ~TAO_OutputCDR (void); + ~TAO_OutputCDR (); // @todo do we want a special method to write an array of // strings and wstrings? @@ -190,7 +190,7 @@ public: ACE_CDR::ULong pending_length); /// Are there more data fragments to come? - bool more_fragments (void) const; + bool more_fragments () const; /// Specify whether there are more data fragments to come. void more_fragments (bool more); @@ -202,16 +202,16 @@ public: ACE_Time_Value * timeout); /// Fragmented message request ID. - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Stub object associated with the request. - TAO_Stub * stub (void) const; + TAO_Stub * stub () const; /// Message semantics (twoway, oneway, reply) - TAO_Message_Semantics message_semantics (void) const; + TAO_Message_Semantics message_semantics () const; /// Maximum time to wait for outgoing message to be sent. - ACE_Time_Value * timeout (void) const; + ACE_Time_Value * timeout () const; //@} /// These methods are used by valuetype indirection support. @@ -240,9 +240,10 @@ public: int offset (char* pos); private: - // disallow copying... - TAO_OutputCDR (const TAO_OutputCDR& rhs); - TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs); + TAO_OutputCDR (const TAO_OutputCDR&rhs) = delete; + TAO_OutputCDR& operator= (const TAO_OutputCDR&) = delete; + TAO_OutputCDR (TAO_OutputCDR&&) = delete; + TAO_OutputCDR& operator= (TAO_OutputCDR&&) = delete; private: /** @@ -408,17 +409,15 @@ public: TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, TAO_ORB_Core* orb_core = 0); -#if defined (ACE_HAS_CPP11) TAO_InputCDR& operator= (const TAO_InputCDR&) = default; -#endif /* ACE_HAS_CPP11 */ /// Destructor - virtual ~TAO_InputCDR (void); + virtual ~TAO_InputCDR (); // = TAO specific methods. /// Accessor - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; ACE_Message_Block::Message_Flags clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index c4fb156fcc5..08d0efeae3e 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -454,14 +454,10 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::string &x) { -#if defined (ACE_HAS_CPP11) return os.fragment_stream (ACE_CDR::OCTET_ALIGN, sizeof (char)) && static_cast<ACE_OutputCDR &> (os) << x; -#else - return os << x.c_str (); -#endif } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, @@ -479,16 +475,12 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, const std::wstring &x) { -#if defined (ACE_HAS_CPP11) return os.fragment_stream ((sizeof (CORBA::WChar) == 2 ? ACE_CDR::SHORT_ALIGN : ACE_CDR::LONG_ALIGN), sizeof (CORBA::WChar)) && static_cast<ACE_OutputCDR &> (os) << x; -#else - return os << x.c_str (); -#endif } ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index 81dd555f150..5e308bc9ad2 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -52,7 +52,7 @@ namespace TAO typedef TAO::details::string_traits_base <character_type> s_traits; /// Default constructor. - inline String_var (void) : ptr_ (0) + inline String_var () : ptr_ (0) { } @@ -72,7 +72,7 @@ namespace TAO } /// Destructor. - inline ~String_var (void) + inline ~String_var () { s_traits::release (this->ptr_); } @@ -128,19 +128,19 @@ namespace TAO } /// For in parameter. - inline const character_type *in (void) const + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) + inline character_type *&inout () { return this->ptr_; } /// For out parameter. - inline character_type *&out (void) + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; @@ -148,7 +148,7 @@ namespace TAO } /// For string of return type. - inline character_type *_retn (void) + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; @@ -225,7 +225,7 @@ namespace TAO } /// Return underlying instance. - inline character_type *&ptr (void) + inline character_type *&ptr () { return this->ptr_; } 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/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index f3b02cd4b4c..0970e3a39cd 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -40,10 +40,10 @@ class TAO_Export TAO_Cleanup_Func_Registry public: /// Constructor. - TAO_Cleanup_Func_Registry (void); + TAO_Cleanup_Func_Registry (); /// Return the number of registered cleanup functions. - size_t size (void) const; + size_t size () const; protected: /// Register a cleanup function. The number of slot the cleanup diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 3ada82f83da..67f3e884033 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -63,7 +63,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ClientRequestInterceptor_Adapter (void); + virtual ~ClientRequestInterceptor_Adapter (); /** * @name PortableInterceptor Client Side Interception Points diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h index 0ca15b73e70..0f514b2e3d1 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h @@ -40,9 +40,9 @@ class TAO_Export TAO_ClientRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (); - virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0; + virtual TAO::ClientRequestInterceptor_Adapter *create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL 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/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 80e79b20b7c..36729d3dcb3 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -38,7 +38,7 @@ public: ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 0d0169cdd11..db3df08c895 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -170,7 +170,6 @@ ACE_CDR::Boolean TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, std::wstring &x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; if (!this->read_4 (cdr, &len)) return false; @@ -227,9 +226,6 @@ TAO_UTF16_BOM_Translator::read_wstring (ACE_InputCDR &cdr, } x.clear (); return false; -#else - return this->ACE_WChar_Codeset_Translator::read_wstring (cdr, x); -#endif } #endif diff --git a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp index 6da6df8f67a..44f03eb740c 100644 --- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp +++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp @@ -121,7 +121,6 @@ ACE_CDR::Boolean TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, std::string &x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; if (!cdr.read_ulong (len)) return false; @@ -161,9 +160,6 @@ TAO_UTF8_Latin1_Translator::read_string (ACE_InputCDR &cdr, x.clear (); return false; -#else - return this->ACE_Char_Codeset_Translator::read_string (cdr, x); -#endif } ACE_CDR::Boolean 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/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index d093150da0f..6de1485a595 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -64,11 +64,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) factory != end; ++factory) { -#if defined (ACE_HAS_CPP11) std::unique_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); -#else - auto_ptr <TAO_Connector> connector ((*factory)->factory ()->make_connector ()); -#endif /* ACE_HAS_CPP11 */ if (connector.get ()) { diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index f9ff5707a93..6a644e300f8 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -81,9 +81,10 @@ public: TAO_ConnectorSetIterator end (void) const; private: - // Disallow copying and assignment. - TAO_Connector_Registry (const TAO_Connector_Registry&); - void operator= (const TAO_Connector_Registry&); + TAO_Connector_Registry (const TAO_Connector_Registry&) = delete; + void operator= (const TAO_Connector_Registry&) = delete; + TAO_Connector_Registry (TAO_Connector_Registry&&) = delete; + void operator= (TAO_Connector_Registry&&) = delete; private: /// List of connectors that are currently open. diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index bd5ebe7efa6..52bf4e2517a 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -302,11 +302,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( void TAO_AMH_DSI_Exception_Holder::raise_invoke () { -#if defined (ACE_HAS_CPP11) std::unique_ptr< ::CORBA::Exception> safety (this->exception_); -#else - auto_ptr< ::CORBA::Exception> safety (this->exception_); -#endif /* ACE_HAS_CPP11 */ this->exception_->_raise (); } diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 4076983b754..dd9eb9cfc5a 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -31,11 +31,7 @@ #include "tao/default_environment.h" #include "ace/Unbounded_Queue.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -113,11 +109,7 @@ namespace CORBA private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; /** @@ -182,11 +174,7 @@ namespace CORBA ContextList &operator= (const ContextList &); /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<char *> ctx_list_; diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index db7200985ed..a59a7b059eb 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -30,11 +30,7 @@ #include "tao/Pseudo_VarOut_T.h" #include "ace/Unbounded_Queue.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -106,11 +102,7 @@ namespace CORBA ExceptionList &operator= (const ExceptionList &); /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Internal list of typecodes. ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_; diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 6613188666b..19054aa74c2 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -40,11 +40,7 @@ #endif /* TAO_HAS_AMI */ #include "ace/SString.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -248,11 +244,7 @@ namespace CORBA CORBA::Context_ptr ctx_; /// Reference counting. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Protect the response_received_. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 555e1c4f8f7..8532a92c237 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -29,11 +29,7 @@ #include "tao/TAO_Server_Request.h" #include "tao/CDR.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -150,11 +146,7 @@ namespace CORBA CORBA::Any_ptr exception_; /// Reference counting. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Request from the ORB. TAO_ServerRequest &orb_server_request_; diff --git a/TAO/tao/Dynamic_TP/DTP_Task.cpp b/TAO/tao/Dynamic_TP/DTP_Task.cpp index 5dac916eede..80a3bbd2dd2 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Task.cpp @@ -345,7 +345,7 @@ TAO_DTP_Task::svc (void) ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Decrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), - this->busy_threads_.value())); + this->busy_threads_.load())); } ACE_Time_Value tmp_sec = this->thread_idle_time_.to_absolute_time(); @@ -385,7 +385,7 @@ TAO_DTP_Task::svc (void) ACE_TEXT ("TAO (%P|%t) - DTP_Task::svc() ") ACE_TEXT ("Incrementing busy_threads_. ") ACE_TEXT ("Busy thread count:%d\n"), - this->busy_threads_.value ())); + this->busy_threads_.load ())); } } } diff --git a/TAO/tao/Dynamic_TP/DTP_Task.h b/TAO/tao/Dynamic_TP/DTP_Task.h index 73dfeff8651..c39e3b57772 100644 --- a/TAO/tao/Dynamic_TP/DTP_Task.h +++ b/TAO/tao/Dynamic_TP/DTP_Task.h @@ -31,6 +31,7 @@ #include "ace/Synch.h" #include "ace/Containers_T.h" #include "ace/Vector_T.h" +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -177,7 +178,7 @@ private: size_t num_queue_requests_; /// The number of currently active worker threads. - ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> busy_threads_; + std::atomic<unsigned long> busy_threads_; /// The queue of pending servant requests (a.k.a. the "request queue"). TAO::CSD::TP_Queue queue_; diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index a51873958c1..bfc7bcc1a0d 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -519,11 +519,7 @@ CORBA::ULong TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); -#else - auto_ptr<TAO_DTP_Thread_Pool> safe_thread_pool (thread_pool); -#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index 2ba8a45bf58..df83f5f3124 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -241,7 +241,6 @@ public: // @} private: - /// @name Helpers // @{ @@ -253,7 +252,6 @@ private: // @} private: - TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 8b3e2269022..d381afd7329 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -74,7 +74,7 @@ namespace CORBA public: /// The default constructor. The environment will hold no /// exceptions. - Environment (void); + Environment (); /// Copy constructor. Environment (const Environment &ACE_TRY_ENV); @@ -83,11 +83,11 @@ namespace CORBA Environment &operator=(const Environment &ACE_TRY_ENV); /// Destructor, release the exception. - ~Environment (void); + ~Environment (); /// Some static methods that need to be defined in every pseudo object static Environment * _duplicate (Environment *); - static Environment * _nil (void); + static Environment * _nil (); /// Return the contained CORBA::Exception. /** @@ -98,7 +98,7 @@ namespace CORBA * "C++ Language Mapping" (formal/00-01-02). Section 1.27 * Environment (page 1-113) */ - CORBA::Exception* exception (void) const; + CORBA::Exception* exception () const; /// Set the contained CORBA::Exception to @a ex /** @@ -114,20 +114,20 @@ namespace CORBA /// Return if the exception is a user exception or a system /// exception. - int exception_type (void) const; + int exception_type () const; /// return the repository ID for the exception. - const char *exception_id (void) const; + const char *exception_id () const; /// Clear the exception. - void clear (void); + void clear (); /// Print the exception to output determined by f. This function /// is not CORBA compliant. void print_exception (const char *info, FILE *f=stdout) const; // = Obtain a default environment to use with TAO. - static CORBA::Environment &default_environment (void); + static CORBA::Environment &default_environment (); // Useful for template programming. typedef CORBA::Environment_ptr _ptr_type; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3e20fd0b4e5..cec1728c15d 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -110,25 +110,25 @@ namespace CORBA Exception (const Exception &src); /// Destructor. - virtual ~Exception (void); + virtual ~Exception (); // = To throw the exception (when using the standard mapping). - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = The static narrow operations. static Exception * _downcast (Exception * x); static Exception const * _downcast (Exception const * x); /// Return the repository ID of the Exception. - virtual const char * _rep_id (void) const; + virtual const char * _rep_id () const; /// Return the name of the Exception. - virtual const char * _name (void) const; + virtual const char * _name () const; // = These are TAO-specific extensions. /// Will be overridden in the concrete derived classes. - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Print the exception to output determined by @a f. /** @@ -146,7 +146,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const = 0; + virtual ACE_CString _info () const = 0; virtual void _tao_encode (TAO_OutputCDR &cdr) const = 0; @@ -177,11 +177,11 @@ namespace CORBA * }; * </PRE> */ - virtual CORBA::Exception *_tao_duplicate (void) const = 0; + virtual CORBA::Exception *_tao_duplicate () const = 0; protected: /// Default constructor. - Exception (void); + Exception (); /// Assignment operator. Exception & operator = (const Exception & src); diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index e10b104bf0c..071d6cfd8dc 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -35,7 +35,7 @@ namespace TAO // Function pointer returning a pointer to CORBA::Exception. This is used to // describe the allocator for user-defined exceptions that are used internally // by the interpreter. - typedef CORBA::Exception* (*TAO_Exception_Alloc) (void); + typedef CORBA::Exception* (*TAO_Exception_Alloc) (); /** * @struct Exception_Data diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index 5a6e4c7e7e4..e7bd1f7e1af 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -41,16 +41,16 @@ class TAO_Export TAO_Fault_Tolerance_Service public: /// Ctor - TAO_Fault_Tolerance_Service (void); + TAO_Fault_Tolerance_Service (); /// Dtor - ~TAO_Fault_Tolerance_Service (void); + ~TAO_Fault_Tolerance_Service (); /// Initialize the internal data structures void init (TAO_ORB_Core *orb_core); /// Return the underlying callback object - TAO_Service_Callbacks *service_callback (void); + TAO_Service_Callbacks *service_callback (); private: void operator= (const TAO_Fault_Tolerance_Service &); diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 706229b5a46..6369762f23d 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -39,7 +39,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; protected: S const * x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Fixed_Size_Clonable_Argument_T (S const & x); - virtual ~In_Fixed_Size_Clonable_Argument_T (void); + virtual ~In_Fixed_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #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_; @@ -107,7 +107,7 @@ namespace TAO #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_; @@ -124,15 +124,15 @@ namespace TAO class Ret_Fixed_Size_Argument_T : public RetArgument { public: - Ret_Fixed_Size_Argument_T (void); + Ret_Fixed_Size_Argument_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); - S excp (void); - S retn (void); + S & arg (); + S excp (); + S retn (); protected: S x_; diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h index be6d1f43034..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. /** @@ -68,9 +68,10 @@ public: ACE_CDR::ULong pending_length) = 0; private: - // Disallow copying and assignment. - TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &); - void operator= (TAO_GIOP_Fragmentation_Strategy const &); + TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &) = delete; + void operator= (TAO_GIOP_Fragmentation_Strategy const &) = delete; + TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy&&) = delete; + void operator= (TAO_GIOP_Fragmentation_Strategy &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL 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/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index 517c40658fa..4605ad57ff4 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -41,13 +41,13 @@ public: CORBA::Octet major; /// Get major version number - CORBA::Octet major_version (void) const; + CORBA::Octet major_version () const; /// Minor version number CORBA::Octet minor; /// Get minor version number - CORBA::Octet minor_version (void) const; + CORBA::Octet minor_version () const; /// Copy constructor TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src); diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index 33e507af217..07a46d0d6f4 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -78,7 +78,7 @@ public: typedef range_checking<value_type,true> range; /// Default constructor. - generic_sequence(void) + generic_sequence() : maximum_(allocation_traits::default_maximum()) , length_(0) , buffer_(allocation_traits::default_buffer_allocation()) 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/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp index 37b5284328f..8eac641e59e 100644 --- a/TAO/tao/IORManipulation/IORManipulation.cpp +++ b/TAO/tao/IORManipulation/IORManipulation.cpp @@ -46,11 +46,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( // get the profile lists, start by initialize the composite reference // by using the first Object. Then for each subsequent Object verify // they are the same type and they do not have duplicate profiles. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles (iors[0]->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0) throw TAO_IOP::Invalid_IOR (); CORBA::String_var id = @@ -145,11 +141,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( // initialize with estimated pfile count. TAO_MProfile Diff_Profiles (count); -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles (group->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ if (Diff_Profiles.add_profiles (tmp_pfiles.get ()) < 0) throw TAO_IOP::Invalid_IOR (); @@ -277,13 +269,8 @@ TAO_IOR_Manipulation_impl::is_in_ior ( CORBA::ULong count = 0; TAO_Profile *pfile1 = 0; TAO_Profile *pfile2 = 0; -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); std::unique_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); -#else - auto_ptr<TAO_MProfile> tmp_pfiles1 (ior1->_stubobj ()->make_profiles ()); - auto_ptr<TAO_MProfile> tmp_pfiles2 (ior2->_stubobj ()->make_profiles ()); -#endif /* ACE_HAS_CPP11 */ tmp_pfiles1->rewind (); while ((pfile1 = tmp_pfiles1->get_next ()) != 0) 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/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index c4c6f181b75..69108c9836f 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -20,12 +20,7 @@ #include /**/ "tao/Versioned_Namespace.h" #include "tao/Basic_Types.h" - -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -43,20 +38,16 @@ template <class ACE_LOCK> class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base (void); + virtual ~TAO_Intrusive_Ref_Count_Base (); - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); protected: - TAO_Intrusive_Ref_Count_Base (void); + TAO_Intrusive_Ref_Count_Base (); private: -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<ACE_LOCK, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&); diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index 1974d07e2bf..2b293e14b47 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -65,7 +65,7 @@ class TAO_Intrusive_Ref_Count_Handle public: /// Default Constructor - enters the "nil" state. - TAO_Intrusive_Ref_Count_Handle (void); + TAO_Intrusive_Ref_Count_Handle (); /// Ctor - By default, takes ownership of passed-in "copy" of reference /// to T. But the second argument (bool) can be changed from @@ -83,7 +83,7 @@ public: TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b); /// Destructor - ~TAO_Intrusive_Ref_Count_Handle (void); + ~TAO_Intrusive_Ref_Count_Handle (); /// Assignment Operator with T* argument. /// Takes ownership of passed-in "copy" of reference to T. @@ -99,21 +99,21 @@ public: /// Returns true if underlying pointer is NULL (0). /// Returns false otherwise. - bool is_nil (void) const; + bool is_nil () const; /// Used to pass the underlying pointer as an "IN" argument to a method. - T* in (void) const; + T* in () const; /// Used to pass the underlying pointer as an "IN/OUT" argument to a method. - T*& inout (void); + T*& inout (); /// Used to pass the underlying pointer as an "OUT" argument to a method. - T*& out (void); + T*& out (); /// Used to take-away the underlying pointer from this smart pointer object. /// Caller becomes responsibe for the returned "copy" to the reference. /// Always leaves the smart pointer in the "nil" state upon return. - T* _retn (void); + T* _retn (); /// Equality operator allows the refcounted object to be used generically /// as a contained object @@ -124,14 +124,14 @@ private: /// Claim a "copy" of the reference-counted object by adding /// one to its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. - void claim (void); + void claim (); /// Drop our "copy" of the reference-counted object by removing /// one from its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. /// Note that this method will always leave this smart pointer /// in the "nil" state upon its return. - void drop (void); + void drop (); /// The underlying pointer to the (intrusively) reference-counted object. /// Set to 0 when this smart pointer is in the "nil" state. Otherwise, diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index c3429bb15e9..1d97550e93e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -38,13 +38,13 @@ class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_ public: /// take ownership of obj. TAO_Intrusive_Ref_Count_Object (OBJ* obj); - virtual ~TAO_Intrusive_Ref_Count_Object (void); + virtual ~TAO_Intrusive_Ref_Count_Object (); OBJ* get () const; private: // Prevent default constructor used. - TAO_Intrusive_Ref_Count_Object (void); + TAO_Intrusive_Ref_Count_Object (); // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Object (const TAO_Intrusive_Ref_Count_Object&); 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/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 91e2c97e768..c44772a678d 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -57,11 +57,11 @@ namespace TAO class TAO_Export Invocation_Base { public: - virtual ~Invocation_Base (void); + virtual ~Invocation_Base (); /// Accessor and mutator methods //@{ - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor and mutator methods for forwarded object /// locations. @@ -69,7 +69,7 @@ namespace TAO * These access methods have to be public so that the * PortableInterceptor can use them */ - CORBA::Object_ptr forwarded_reference (void); + CORBA::Object_ptr forwarded_reference (); void forwarded_reference (CORBA::Object_ptr o); /// Accessors for the service context list. @@ -78,33 +78,33 @@ namespace TAO * elsewhere. Providing this accessor helps the PI to access this * list in both remote and collocated mode. */ - TAO_Service_Context &request_service_context (void); - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &request_service_context (); + TAO_Service_Context &reply_service_context (); /// Return the forwarded object location by loosing ownership. - CORBA::Object_ptr steal_forwarded_reference (void); + CORBA::Object_ptr steal_forwarded_reference (); /// Return the effective target of the invocation. /** * Please see the PortableInterceptor specification in the CORBA * spec to understand what effective target means. */ - CORBA::Object_ptr effective_target (void) const; + CORBA::Object_ptr effective_target () const; /// Return the target object - CORBA::Object_ptr target (void) const; + CORBA::Object_ptr target () const; /// Does this invocation return a response? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Accessor of reply_status of the invocation. - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; /// Mutator of reply_status of the invocation. void reply_status (GIOP::ReplyStatusType s); /// The operaton details of the invocation - TAO_Operation_Details &operation_details (void); + TAO_Operation_Details &operation_details (); //@} protected: @@ -174,19 +174,19 @@ namespace TAO * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t &stack_size (void); + size_t &stack_size (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); /// Change the exception status. void exception (CORBA::Exception *exception); /// Invocation status. - TAO::Invocation_Status invoke_status (void) const; + TAO::Invocation_Status invoke_status () const; /// Mutator to set the invocation status. void invoke_status (Invocation_Status s); - PortableInterceptor::ReplyStatus pi_reply_status (void) const; + PortableInterceptor::ReplyStatus pi_reply_status () const; /// Accessor used to determine if the current invocation is part /// of a remote request, and if not, it will be considered to be @@ -196,22 +196,22 @@ namespace TAO protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. - Invocation_Status send_request_interception (void); + Invocation_Status send_request_interception (); /// Helper method to invoke receive_reply interception call to all /// the registered interceptors. - Invocation_Status receive_reply_interception (void); + Invocation_Status receive_reply_interception (); /// Helper method to invoke receive_other interception call to all /// the registered interceptors. - Invocation_Status receive_other_interception (void); + Invocation_Status receive_other_interception (); /// Helper methods to handle interception calls when exceptions /// are thrown by the PortableInterceptor. PortableInterceptor::ReplyStatus handle_any_exception (CORBA::Exception * e); - PortableInterceptor::ReplyStatus handle_all_exception (void); + PortableInterceptor::ReplyStatus handle_all_exception (); protected: /// The client requestor adapter diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h index 29a2519aa05..af0c7f18731 100644 --- a/TAO/tao/Load_Protocol_Factory_T.h +++ b/TAO/tao/Load_Protocol_Factory_T.h @@ -33,11 +33,7 @@ namespace TAO const char *name) { TAO_Protocol_Factory *protocol_factory = 0; -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Protocol_Factory> safe_protocol_factory; -#else - auto_ptr<TAO_Protocol_Factory> safe_protocol_factory; -#endif /* ACE_HAS_CPP11 */ TAO_Protocol_Item *item = 0; diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 0e11bcd646d..bd6732bd654 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -46,13 +46,13 @@ namespace CORBA public: /// Destructor - virtual ~LocalObject (void); + virtual ~LocalObject (); /// Increment the ref count static LocalObject_ptr _duplicate (LocalObject_ptr obj); /// Return a NIL object - static LocalObject_ptr _nil (void); + static LocalObject_ptr _nil (); /** * @todo Narrowing a LocalObject to a CORBA::Object is broken @@ -66,17 +66,17 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) /// Always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Gets info about object from the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); /// Throws NO_IMPLEMENT. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, @@ -139,12 +139,12 @@ namespace CORBA */ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); // = TAO extensions /// Throws CORBA::NO_IMPLEMENT. - virtual TAO::ObjectKey * _key (void); + virtual TAO::ObjectKey * _key (); /// Useful for template programming. typedef LocalObject_ptr _ptr_type; @@ -156,7 +156,7 @@ namespace CORBA /** * Make it protected to prevent instantiation of this class. */ - LocalObject (void); + LocalObject (); private: /** diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h index 11f2a09c8f0..2967593191a 100644 --- a/TAO/tao/MMAP_Allocator.h +++ b/TAO/tao/MMAP_Allocator.h @@ -58,9 +58,10 @@ public: off_t offset (void * p); private: - // Disallow copying. - TAO_MMAP_Allocator (TAO_MMAP_Allocator const &); - void operator= (TAO_MMAP_Allocator const &); + TAO_MMAP_Allocator (TAO_MMAP_Allocator const &) = delete; + void operator= (TAO_MMAP_Allocator const &) = delete; + TAO_MMAP_Allocator (TAO_MMAP_Allocator &&) = delete; + void operator= (TAO_MMAP_Allocator &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 7d3aa640e01..d00ce8384b7 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -69,7 +69,7 @@ public: /// Destructor: decrements reference count on all references /// profiles! - ~TAO_MProfile (void); + ~TAO_MProfile (); /// Inits MProfile to hold sz TAO_Profiles. /// NOT THREAD SAFE @@ -88,20 +88,20 @@ public: int grow (CORBA::ULong sz); /// Treat as a circular list. - TAO_Profile *get_cnext (void); + TAO_Profile *get_cnext (); /// Get next profile in list, return 0 at end of list. - TAO_Profile *get_next (void); + TAO_Profile *get_next (); /// Assume a circular list of profiles. - TAO_Profile *get_cprev (void); + TAO_Profile *get_cprev (); /// Get previous profile, stop at beginning of list and return 0. - TAO_Profile *get_prev (void); + TAO_Profile *get_prev (); /// Return a pointer to the current profile, will not increment /// reference pointer. - TAO_Profile *get_current_profile (void); + TAO_Profile *get_current_profile (); /// Return a pointer to the profile referenced by handle void. TAO_Profile *get_profile (TAO_PHandle handle); @@ -109,24 +109,24 @@ public: // rem_profile (TAO_PHandle handle); let's wait. /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void); + TAO_PHandle get_current_handle (); /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void) const; + TAO_PHandle get_current_handle () const; /// Returns the number of profiles stored in the list (last_+1). - CORBA::ULong profile_count (void) const; + CORBA::ULong profile_count () const; /// return the maximum number of profiles that can be stored in this /// container, (size_+1) - CORBA::ULong size (void) const; + CORBA::ULong size () const; /// Return the profile at position <slot>. If <slot> is out of range /// it returns 0. const TAO_Profile* get_profile (CORBA::ULong slot) const; /// Sets the current slot back to 0. - void rewind (void); + void rewind (); /// Return the index of this entry or -1 if it can not be added. /// reference count on profile in incremented! @@ -151,7 +151,7 @@ public: void forward_from (TAO_MProfile *mprofiles); /// Returns a pointer to the profile which was forwarded. - TAO_MProfile *forward_from (void); + TAO_MProfile *forward_from (); /** * Returns true of there is at least one profile in first which @@ -171,7 +171,7 @@ public: protected: /// This method handle the dynamic allocation of the data member /// <policy_list_>. - void create_policy_list (void); + void create_policy_list (); public: /// Sets the policies list associated with the profiles @@ -180,11 +180,11 @@ public: /// Gets the policies list associated with the profiles /// owned by the TAO_MProfile. - CORBA::PolicyList *policy_list (void); + CORBA::PolicyList *policy_list (); protected: /// Initialize the policy list, demarsharling the policy. - void init_policy_list (void); + void init_policy_list (); protected: /// Stores the policy list for the profile of this MProfile. @@ -200,12 +200,12 @@ protected: protected: /// Return the complete list of profiles, this object retains /// ownership! - TAO_Profile **pfiles (void) const; + TAO_Profile **pfiles () const; private: /// Helper method to implement the destructor - void cleanup (void); + void cleanup (); /// A helper to give_profile to be used when share is true. This /// method is used primarily to help the corbaloc parser create a 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/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 22d33393918..7b961a81f0e 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -40,7 +40,7 @@ namespace CORBA class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object { public: - virtual ~TAO_NVList_Adapter (void); + virtual ~TAO_NVList_Adapter (); virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0; diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h index 60c95f9e8ca..3673bae0fde 100644 --- a/TAO/tao/Nested_Upcall_Guard.h +++ b/TAO/tao/Nested_Upcall_Guard.h @@ -84,9 +84,10 @@ namespace TAO private: Nested_Upcall_Guard (void); - /// Disallow copying and assignment. - Nested_Upcall_Guard (const Nested_Upcall_Guard&); - Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&); + Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete; + Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete; + Nested_Upcall_Guard (Nested_Upcall_Guard&&) = delete; + Nested_Upcall_Guard &operator= (Nested_Upcall_Guard&&) = delete; private: /// Pointer to the transport that we plan to use. diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h index a24b532a95d..6efc37b0450 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.h +++ b/TAO/tao/Null_Fragmentation_Strategy.h @@ -45,9 +45,10 @@ public: virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong); private: - // Disallow copying and assignment. - TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &); - void operator= (TAO_Null_Fragmentation_Strategy const &); + TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &) = delete; + void operator= (TAO_Null_Fragmentation_Strategy const &) = delete; + TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy &&) = delete; + void operator= (TAO_Null_Fragmentation_Strategy &&) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 96650f39713..81e5633180d 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -35,11 +35,7 @@ #include "ace/Thread_Mutex.h" #include "ace/Guard_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -171,18 +167,18 @@ namespace CORBA class TAO_Export InvalidName : public CORBA::UserException { public: - InvalidName (void); + InvalidName (); InvalidName (const InvalidName &); - ~InvalidName (void); + ~InvalidName (); InvalidName &operator= (const InvalidName &); static InvalidName *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR &) const; @@ -209,10 +205,10 @@ namespace CORBA /// Returns a pointer to a nil ORB, i.e., an non-existent ORB. This /// can be used for initialization or in comparisons. - static CORBA::ORB_ptr _nil (void); + static CORBA::ORB_ptr _nil (); /// Return this ORB's ORBid. - char * id (void); + char * id (); /** * Turn a string-ified object reference back into an object @@ -284,7 +280,7 @@ namespace CORBA void get_next_response (CORBA::Request_ptr &req); - CORBA::Boolean poll_next_response (void); + CORBA::Boolean poll_next_response (); /// The ORB TypeCode creation functions. @@ -381,7 +377,7 @@ namespace CORBA * If an error occurs during initialization or at runtime, a CORBA * system exception will be thrown. */ - void run (void); + void run (); /** * Instructs the ORB to initialize itself and run its event loop in @@ -417,7 +413,7 @@ namespace CORBA /// Returns an indication of whether the ORB needs to perform some /// work. - CORBA::Boolean work_pending (void); + CORBA::Boolean work_pending (); /// Returns an indication of whether the ORB needs to perform some /// work but will look for work pending for no more than the @@ -434,7 +430,7 @@ namespace CORBA * is not present; this behavior can be modified by passing an * appropriate @c ACE_Time_Value as described in run(). **/ - void perform_work (void); + void perform_work (); void perform_work (ACE_Time_Value &tv); void perform_work (ACE_Time_Value *tv); @@ -460,7 +456,7 @@ namespace CORBA * the ORB in one thread and trying to service a request in another * thread are not well defined. TAO does not support such cases. */ - void destroy (void); + void destroy (); /** * This method acts as a mini-bootstrapping Naming Service, which is @@ -492,7 +488,7 @@ namespace CORBA /// Returns a sequence of ObjectIds that lists which objects have /// references available via the initial references mechanism. - CORBA::ORB::ObjectIdList_ptr list_initial_services (void); + CORBA::ORB::ObjectIdList_ptr list_initial_services (); #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, @@ -510,18 +506,18 @@ namespace CORBA #endif /// Reference counting... - unsigned long _incr_refcount (void); - unsigned long _decr_refcount (void); - unsigned long _refcount (void) const; + unsigned long _incr_refcount (); + unsigned long _decr_refcount (); + unsigned long _refcount () const; /// Set the IOR flag. void _use_omg_ior_format (CORBA::Boolean ior); /// Get the IOR flag. - CORBA::Boolean _use_omg_ior_format (void); + CORBA::Boolean _use_omg_ior_format (); /// Get the ORB core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Factory method that creates an ORB. static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core); @@ -532,7 +528,7 @@ namespace CORBA typedef ORB_out _out_type; /// Get the Timeout value - ACE_Time_Value *get_timeout (void); + ACE_Time_Value *get_timeout (); protected: // We must be created via the @c CORBA::ORB_init() function. @@ -543,13 +539,13 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ORB (void); + ~ORB (); /// Resolve the Policy Manager for this ORB. - CORBA::Object_ptr resolve_policy_manager (void); + CORBA::Object_ptr resolve_policy_manager (); /// Resolve the Policy Current for this thread. - CORBA::Object_ptr resolve_policy_current (void); + CORBA::Object_ptr resolve_policy_current (); private: /// Resolve the given service based on the service ID. @@ -568,7 +564,7 @@ namespace CORBA /// Check if ORB has shutdown. If it has, throw the appropriate /// exception. - void check_shutdown (void); + void check_shutdown (); /// Set the timeout value void set_timeout (ACE_Time_Value * timeout); @@ -576,11 +572,7 @@ namespace CORBA private: /// Maintains a reference count of number of instantiations of the /// ORB. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// The ORB_Core that created us.... TAO_ORB_Core * orb_core_; diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index b46a2f83819..1043a54de32 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -26,11 +26,7 @@ CORBA::ORB::_incr_refcount (void) ACE_INLINE unsigned long CORBA::ORB::_refcount (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 69b2f23f059..7c973c2b44f 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -46,7 +46,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~ORBInitializer_Registry_Adapter (void); + virtual ~ORBInitializer_Registry_Adapter (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ac09508d440..cb2d45bff86 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1966,11 +1966,7 @@ TAO_ORB_Core::root_poa () if (CORBA::is_nil (this->root_poa_.in ())) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Adapter> poa_adapter (factory->create (this)); -#else - auto_ptr<TAO_Adapter> poa_adapter (factory->create (this)); -#endif /* ACE_HAS_CPP11 */ poa_adapter->open (); // @@ Not exception safe diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 4437dc95601..35b2b599763 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -41,11 +41,7 @@ #include "ace/Lock_Adapter_T.h" #include "ace/TSS_T.h" #include "ace/Service_Config.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Data_Block; @@ -171,7 +167,7 @@ public: TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g); /// Accessor for the ORB parameters. - TAO_ORB_Parameters *orb_params (void); + TAO_ORB_Parameters *orb_params (); /** * @todo @@ -186,46 +182,46 @@ public: */ /// Accessor to the POA current. //@{ - CORBA::Object_ptr poa_current(void); + CORBA::Object_ptr poa_current(); //@} /// Get the connector registry - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the IOR parser registry - TAO_Parser_Registry *parser_registry (void); + TAO_Parser_Registry *parser_registry (); /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (); /// Return pointer to the orb initializer registry associated with /// this ORB core. Tries to load the PI library if it is not loaded /// yet - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (); TAO_ZIOP_Adapter *ziop_adapter () const; void ziop_adapter (TAO_ZIOP_Adapter *adapter); - TAO_Service_Context_Registry &service_context_registry (void); + TAO_Service_Context_Registry &service_context_registry (); /// Get the protocol factories - TAO_ProtocolFactorySet *protocol_factories (void); + TAO_ProtocolFactorySet *protocol_factories (); /// Get pointer to the ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Wrappers that forward the request to the concurrency strategy. - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); /// Get the ACE_Thread_Manager - ACE_Thread_Manager *thr_mgr (void); + ACE_Thread_Manager *thr_mgr (); /// Return the RootPOA, or try to load it if not initialized already. - CORBA::Object_ptr root_poa (void); + CORBA::Object_ptr root_poa (); /// Get the adapter registry - TAO_Adapter_Registry &adapter_registry (void); + TAO_Adapter_Registry &adapter_registry (); /// @name Collocation Strategies as configured by the user //@{ @@ -250,17 +246,17 @@ public: /// Set/get the collocation flags //@{ void optimize_collocation_objects (CORBA::Boolean opt); - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; void use_global_collocation (CORBA::Boolean opt); - CORBA::Boolean use_global_collocation (void) const; + CORBA::Boolean use_global_collocation () const; - CORBA::ULong get_collocation_strategy (void) const; + CORBA::ULong get_collocation_strategy () const; //@} /// Get the adapter named "RootPOA" and cache the result, this is an /// optimization for the POA. - TAO_Adapter *poa_adapter (void); + TAO_Adapter *poa_adapter (); /** * @name Access to Factories @@ -272,31 +268,31 @@ public: */ //@{ /// Returns pointer to the resource factory. - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); /// Returns pointer to the factory for creating gui resources - TAO::GUIResource_Factory *gui_resource_factory (void); + TAO::GUIResource_Factory *gui_resource_factory (); /// Returns pointer to the client factory. - TAO_Client_Strategy_Factory *client_factory (void); + TAO_Client_Strategy_Factory *client_factory (); /// Returns pointer to the server factory. - TAO_Server_Strategy_Factory *server_factory (void); + TAO_Server_Strategy_Factory *server_factory (); /// Returns pointer to the Protocols_Hooks. - TAO_Protocols_Hooks *protocols_hooks (void); + TAO_Protocols_Hooks *protocols_hooks (); /// Returns a pointer to the Thread Lane Resources Manager. - TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void); + TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (); /// Returns a pointer to the Collocation Resolver. - TAO_Collocation_Resolver &collocation_resolver (void); + TAO_Collocation_Resolver &collocation_resolver (); /// Returns a pointer to the Stub factory. - TAO_Stub_Factory *stub_factory (void); + TAO_Stub_Factory *stub_factory (); /// Returns a pointer to the endpoint selector factory. - TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void); + TAO_Endpoint_Selector_Factory *endpoint_selector_factory (); //@} @@ -315,41 +311,41 @@ public: const char *network_priority_protocols_hooks_name); /// Gets the value of TAO_ORB_Core::protocols_hooks__ - TAO_Protocols_Hooks * get_protocols_hooks (void); + TAO_Protocols_Hooks * get_protocols_hooks (); /// Gets the value of TAO_ORB_Core::network_priority_protocols_hooks__ TAO_Network_Priority_Protocols_Hooks * - get_network_priority_protocols_hooks (void); + get_network_priority_protocols_hooks (); /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::dynamic_adapter_name_. - static const char *dynamic_adapter_name (void); + static const char *dynamic_adapter_name (); /// Sets the value of TAO_ORB_Core::ifr_client_adapter_name_. static void ifr_client_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::ifr_client_adapter_name_. - static const char *ifr_client_adapter_name (void); + static const char *ifr_client_adapter_name (); /// Sets the value of TAO_ORB_Core::typecodefactory_adapter_name_. static void typecodefactory_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_. - static const char *typecodefactory_adapter_name (void); + static const char *typecodefactory_adapter_name (); /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. static void iorinterceptor_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. - static const char *iorinterceptor_adapter_factory_name (void); + static const char *iorinterceptor_adapter_factory_name (); /// Sets the value of TAO_ORB_Core::valuetype_adapter_factory_name. static void valuetype_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::valuetype_adapter_factory_name. - static const char *valuetype_adapter_factory_name (void); + static const char *valuetype_adapter_factory_name (); /// See if we have a collocated address, if yes, return the POA /// associated with the address. @@ -358,46 +354,46 @@ public: /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the buffers used in *outgoing* CDR streams. - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /// This allocator is global, may or may not have locks. It is /// intended for allocating the ACE_Data_Blocks used in *incoming* /// CDR streams. - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used to queue messages in /// transports. - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /// The Message Blocks used for input CDRs must have appropriate /// locking strategies. ACE_Data_Block *create_input_cdr_data_block (size_t size); /// Return the locking strategy used for the data blocks. - ACE_Lock *locking_strategy (void); + ACE_Lock *locking_strategy (); #if (TAO_HAS_CORBA_MESSAGING == 1) /// Accessor method for the default_policies_ - TAO_Policy_Set *get_default_policies (void); + TAO_Policy_Set *get_default_policies (); /// Get a policy. First, check the ORB-level Policy Manager, then /// check the ORB defaults. @@ -437,19 +433,19 @@ public: * tradeoffs and take a decision. */ //@{ - CORBA::Environment *default_environment (void) const; + CORBA::Environment *default_environment () const; void default_environment (CORBA::Environment*); //@} #if (TAO_HAS_CORBA_MESSAGING == 1) /// Return the Policy_Manager for this ORB. - TAO_Policy_Manager *policy_manager (void); + TAO_Policy_Manager *policy_manager (); /// Accesors to the policy current, this object should be kept in /// TSS storage. The POA has to reset the policy current object on /// every upcall. - TAO_Policy_Current &policy_current (void); + TAO_Policy_Current &policy_current (); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -540,7 +536,7 @@ public: Messaging::SyncScope &scope); /// Return the default sync scope configured for this ORB - Messaging::SyncScope default_sync_scope (void); + Messaging::SyncScope default_sync_scope (); /// Handle to the factory for protocols_hooks_.. TAO_Protocols_Hooks *protocols_hooks_; @@ -549,7 +545,7 @@ public: TAO_Network_Priority_Protocols_Hooks *network_priority_protocols_hooks_; /// Obtain the TSS resources of this orb. - TAO_ORB_Core_TSS_Resources* get_tss_resources (void); + TAO_ORB_Core_TSS_Resources* get_tss_resources (); /// Obtain the TSS resource in the given slot. void* get_tss_resource (size_t slot_id); @@ -567,13 +563,13 @@ public: void tss_cleanup (ACE_Array_Base<void *> &ts_objects); /// Get access to the leader_follower class. - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /// Get access to the leader follower strategy. - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); /// Get access to the thread lane resources. - TAO_Thread_Lane_Resources &lane_resources (void); + TAO_Thread_Lane_Resources &lane_resources (); /// Run the event loop. int run (ACE_Time_Value *tv, int perform_work); @@ -582,13 +578,13 @@ public: void shutdown (CORBA::Boolean wait_for_completion); /// Get the shutdown flag value - bool has_shutdown (void) const; + bool has_shutdown () const; /// Shutdown the ORB and free resources - void destroy (void); + void destroy (); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (void); + void check_shutdown (); /// Returns the @a timeout value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -628,53 +624,53 @@ public: CORBA::Long reinitialize_object (TAO_Stub *stub); /// Return ORBid string. - const char *orbid (void) const; + const char *orbid () const; /// Set/Get the IOR of the Implementation Repository service. //@{ - CORBA::Object_ptr implrepo_service (void); + CORBA::Object_ptr implrepo_service (); void implrepo_service (const CORBA::Object_ptr ir); //@} /// Do we attempt to register with the Implementation Repository - CORBA::Boolean use_implrepo (void); + CORBA::Boolean use_implrepo (); /// Do we put the ImR's endpoints into persistent object references we create - CORBA::Boolean imr_endpoints_in_ior (void); + CORBA::Boolean imr_endpoints_in_ior (); /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (void); + CORBA::Object_ptr resolve_typecodefactory (); #if TAO_HAS_INTERCEPTORS == 1 /// Resolve the PICurrent. - CORBA::Object_ptr resolve_picurrent (void); + CORBA::Object_ptr resolve_picurrent (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ /// Resolve POA Current. - CORBA::Object_ptr resolve_poa_current (void); + CORBA::Object_ptr resolve_poa_current (); /// Resolve the CodecFactory DLL. - CORBA::Object_ptr resolve_codecfactory (void); + CORBA::Object_ptr resolve_codecfactory (); /// Resolve the Compression DLL. - CORBA::Object_ptr resolve_compression_manager (void); + CORBA::Object_ptr resolve_compression_manager (); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (void); + CORBA::Object_ptr resolve_dynanyfactory (); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (void); + CORBA::Object_ptr resolve_ior_manipulation (); - TAO_ZIOP_Adapter* ziop_adapter_i (void); + TAO_ZIOP_Adapter* ziop_adapter_i (); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (void); + CORBA::Object_ptr resolve_ior_table (); /// Resolve the Async IOR Table reference for this ORB. - CORBA::Object_ptr resolve_async_ior_table (void); + CORBA::Object_ptr resolve_async_ior_table (); /// Resolve the Monitor reference for this ORB. - CORBA::Object_ptr resolve_monitor (void); + CORBA::Object_ptr resolve_monitor (); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. @@ -682,20 +678,20 @@ public: #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 /// Resolve the RT ORB reference for this ORB. - CORBA::Object_ptr resolve_rt_orb (void); + CORBA::Object_ptr resolve_rt_orb (); #endif /// Resolve the RT Current flyweight for this ORB. /// Return server_id string. - const char *server_id (void) const; + const char *server_id () const; /// List all the service known by the ORB - CORBA::ORB_ObjectIdList *list_initial_references (void); + CORBA::ORB_ObjectIdList *list_initial_references (); /// Reference counting... - unsigned long _incr_refcnt (void); - unsigned long _decr_refcnt (void); - unsigned long _refcnt (void) const; + unsigned long _incr_refcnt (); + unsigned long _decr_refcnt (); + unsigned long _refcnt () const; /// Register the handle of an open connection with the ORB Core /// handle set. This handle set will be used to explicitly remove @@ -748,12 +744,12 @@ public: CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max); /// Return a reference to the Fault Tolerant service object. - TAO_Fault_Tolerance_Service &fault_tolerance_service (void); + TAO_Fault_Tolerance_Service &fault_tolerance_service (); /// Transmit the entire TAG_FT_GROUP component data from a server IOGR as /// a FT_GROUP_VERSION tagged service context on requests to that IOGR instead /// of just the group version. - CORBA::Boolean ft_send_extended_sc (void); + CORBA::Boolean ft_send_extended_sc (); /// Raise a comm failure exception if a service is not loaded, else /// delegate to the service to see what the service has to do for @@ -782,7 +778,7 @@ public: #if TAO_HAS_INTERCEPTORS == 1 /// Return a pointer to the cached TAO::PICurrent object. - CORBA::Object_ptr pi_current (void); + CORBA::Object_ptr pi_current (); /// Set the pointer to the cached TAO::PICurrent object. void pi_current (CORBA::Object_ptr current); @@ -807,11 +803,11 @@ public: /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (); /// Get the Server Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (); #endif /* TAO_HAS_INTERCEPTORS */ @@ -820,7 +816,7 @@ public: //@} /// Return the valuetype adapter - TAO_Valuetype_Adapter *valuetype_adapter (void); + TAO_Valuetype_Adapter *valuetype_adapter (); #if !defined(CORBA_E_MICRO) /// Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) @@ -839,25 +835,25 @@ public: /// Get the IOR Interceptor adapter. If not created, this method will try /// to create one. - TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void); + TAO_IORInterceptor_Adapter *ior_interceptor_adapter (); /// Set and Get methods to indicate whether a BiDir IIOP policy has /// been set in the POA. /// @note At present, the value will be true even if one of the POA's /// is set with the Bi Dir GIOP policy. - CORBA::Boolean bidir_giop_policy (void); + CORBA::Boolean bidir_giop_policy (); void bidir_giop_policy (CORBA::Boolean); /// Return the table that maps object key/name to de-stringified /// object reference. It is needed for supporting local objects in /// the resolve_initial_references() mechanism. - TAO_Object_Ref_Table &object_ref_table (void); + TAO_Object_Ref_Table &object_ref_table (); /// Acceessor to the table that stores the object_keys. - TAO::ObjectKey_Table &object_key_table (void); + TAO::ObjectKey_Table &object_key_table (); /// Return the current request dispatcher strategy. - TAO_Request_Dispatcher *request_dispatcher (void); + TAO_Request_Dispatcher *request_dispatcher (); /// Set a new request dispatcher. The ORB Core retains ownership /// of the request dispatcher once it gets it. Currently, this only @@ -876,15 +872,15 @@ public: * The flushing strategies are stateless, therefore, there is only * one per ORB. */ - TAO_Flushing_Strategy *flushing_strategy (void); + TAO_Flushing_Strategy *flushing_strategy (); /// Get Code Set Manager - TAO_Codeset_Manager *codeset_manager (void); + TAO_Codeset_Manager *codeset_manager (); typedef ACE_Array_Map<ACE_CString, ACE_CString> InitRefMap; /// Return a pointer to the -ORBInitRef map. - InitRefMap * init_ref_map (void); + InitRefMap * init_ref_map (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded in the ORB Table @@ -918,7 +914,7 @@ protected: /// Destructor is protected since the ORB Core is a reference /// counted object. - ~TAO_ORB_Core (void); + ~TAO_ORB_Core (); /// Initialize the guts of the ORB Core. It is intended that this be /// called by CORBA::ORB_init(). @@ -926,7 +922,7 @@ protected: /// Final termination hook, typically called by CORBA::ORB's /// destructor. - int fini (void); + int fini (); /// Routine that creates a ACE_Data_Block given the lock and allocators. ACE_Data_Block *create_data_block_i (size_t size, @@ -935,48 +931,48 @@ protected: ACE_Lock *lock); /// Obtain and cache the typecode factory object reference. - void resolve_typecodefactory_i (void); + void resolve_typecodefactory_i (); /// Obtain and cache the poa current. - void resolve_poa_current_i (void); + void resolve_poa_current_i (); #if TAO_HAS_INTERCEPTORS == 1 /// Obtain and cache the picurrent factory object reference. - void resolve_picurrent_i (void); + void resolve_picurrent_i (); /// Get the Client Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (); /// Get the Server Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (); #endif /* TAO_HAS_INTERCEPTORS */ /// Obtain and cache the codec factory object reference. - void resolve_codecfactory_i (void); + void resolve_codecfactory_i (); /// Obtain and cache the compression manager object reference. - void resolve_compression_manager_i (void); + void resolve_compression_manager_i (); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (void); + void resolve_dynanyfactory_i (); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (void); + void resolve_iormanipulation_i (); /// Obtain and cache the Monitor object reference. - void resolve_monitor_i (void); + void resolve_monitor_i (); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. - void services_callbacks_init (void); + void services_callbacks_init (); /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. Prevents /// exceptions from propagating up the call chain. - void destroy_interceptors (void); + void destroy_interceptors (); /// Pointer to the list of protocol loaded into this ORB instance. /// Helper method to hold the common code part for -ORBEndpoint and @@ -986,11 +982,11 @@ protected: /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (); /// Return pointer to the orb initializer registry associated with /// this ORB core. - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (); /// Common code from ::initialize_object and ::reinitialize_object CORBA::Long initialize_object_i (TAO_Stub *the_stub, @@ -1005,10 +1001,10 @@ private: //@} /// Obtain and cache the ior table object reference. - void resolve_ior_table_i (void); + void resolve_ior_table_i (); /// Obtain and cache the async ior table object reference. - void resolve_async_ior_table_i (void); + void resolve_async_ior_table_i (); /// Checks to see whether collocation optimizations have to be /// applied on objects in the @a other_orb @@ -1211,11 +1207,7 @@ protected: #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// Registry containing all registered policy factories. TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_; @@ -1306,7 +1298,7 @@ class TAO_Export TAO_ORB_Core_Static_Resources : public ACE_Service_Object public: /// Return the context-specific singleton instance. - static TAO_ORB_Core_Static_Resources* instance (void); + static TAO_ORB_Core_Static_Resources* instance (); public: /** @@ -1376,7 +1368,7 @@ public: //private: /// Constructor. - TAO_ORB_Core_Static_Resources (void); + TAO_ORB_Core_Static_Resources (); TAO_ORB_Core_Static_Resources& operator= (const TAO_ORB_Core_Static_Resources&); @@ -1392,7 +1384,7 @@ private: /// Obtain an instance of the first ORB core registered in the ORB /// table. -TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); +TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (); // **************************************************************** diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index f68d3beef3d..f6ebac0549d 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -19,11 +19,7 @@ TAO_ORB_Core::_incr_refcnt (void) ACE_INLINE unsigned long TAO_ORB_Core::_refcnt (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } ACE_INLINE unsigned long diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index ec7eb332909..0b7a3f6f6a3 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -45,7 +45,7 @@ public: explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0); TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap); TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs); - ~TAO_ORB_Core_Auto_Ptr (void); + ~TAO_ORB_Core_Auto_Ptr (); //@} /** @@ -53,8 +53,8 @@ public: */ //@{ TAO_ORB_Core &operator *() const; - TAO_ORB_Core *get (void) const; - TAO_ORB_Core *release (void); + TAO_ORB_Core *get () const; + TAO_ORB_Core *release (); void reset (TAO_ORB_Core *p = 0); TAO_ORB_Core *operator-> () const; //@} diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index f5c12f9dd32..01e5a60de9c 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -41,13 +41,13 @@ class TAO_Export TAO_ORB_Core_TSS_Resources public: /// Constructor - TAO_ORB_Core_TSS_Resources (void); + TAO_ORB_Core_TSS_Resources (); /// destructor - ~TAO_ORB_Core_TSS_Resources (void); + ~TAO_ORB_Core_TSS_Resources (); /// Cleans TSS resources. - void fini (void); + void fini (); private: diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index c1e5ed0d60e..8841c8d34a3 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -67,7 +67,7 @@ namespace TAO * @note See the note in the class description for an explanation * of why this constructor is not protected. */ - ORB_Table (void); + ORB_Table (); typedef ACE_Array_Map<CORBA::String_var, ORB_Core_Ref_Counter, @@ -82,8 +82,8 @@ namespace TAO * @name The canonical ACE_Map methods. */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); int bind (const char *orb_id, ::TAO_ORB_Core *orb_core); /// Return @c TAO_ORB_Core corresponding to ORB with given @a @@ -99,10 +99,10 @@ namespace TAO /// Obtain the first ORB for the @c ORB_Core_instance() /// implementation. - ::TAO_ORB_Core * first_orb (void); + ::TAO_ORB_Core * first_orb (); /// Return a unique instance - static ORB_Table * instance (void); + static ORB_Table * instance (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded. @@ -113,10 +113,10 @@ namespace TAO void not_default (char const * orb_id); /// Accessor to the underlying table_ - Table * table (void); + Table * table (); /// Return reference to underlying lock. - TAO_SYNCH_MUTEX & lock (void); + TAO_SYNCH_MUTEX & lock (); private: @@ -158,13 +158,13 @@ namespace TAO public: /// Constructor. - ORB_Core_Ref_Counter (void); + ORB_Core_Ref_Counter (); /// Constructor. ORB_Core_Ref_Counter (::TAO_ORB_Core * core); /// Destructor. - ~ORB_Core_Ref_Counter (void); + ~ORB_Core_Ref_Counter (); /// Copy constructor. ORB_Core_Ref_Counter (ORB_Core_Ref_Counter const & rhs); @@ -173,7 +173,7 @@ namespace TAO void operator= (ORB_Core_Ref_Counter const & rhs); /// ORB_Core pointer accessor. - ::TAO_ORB_Core * core (void) const { return this->core_; } + ::TAO_ORB_Core * core () const { return this->core_; } private: ::TAO_ORB_Core * core_; diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index d89c8df39e3..f1be9002e7d 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -110,11 +110,7 @@ CORBA::Object::_remove_ref () CORBA::ULong CORBA::Object::_refcount_value() const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } void diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 92c2e499c85..c7f9752374f 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -30,11 +30,7 @@ #include "tao/Object_Argument_T.h" #include "tao/Arg_Traits_T.h" #include "tao/Any_Insert_Policy_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -102,7 +98,7 @@ namespace CORBA { public: /// Destructor. - virtual ~Object (void); + virtual ~Object (); /** * @name Spec defined methods @@ -115,7 +111,7 @@ namespace CORBA static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj); /// Return a NULL object. - static CORBA::Object_ptr _nil (void); + static CORBA::Object_ptr _nil (); /// No-op it is just here to simplify some templates. static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj); @@ -131,7 +127,7 @@ namespace CORBA /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; /** * Return a (potentially non-unique) hash value for this object. @@ -152,18 +148,18 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Get info about the object from the Interface Repository. - virtual InterfaceDef_ptr _get_interface (void); + virtual InterfaceDef_ptr _get_interface (); /// Get info about the object from the Interface Repository. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) // DII operations to create a request. @@ -217,7 +213,7 @@ namespace CORBA #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /** * @name Reference Count Management @@ -227,13 +223,13 @@ namespace CORBA */ //@{ /// Increment the reference count. - virtual void _add_ref (void); + virtual void _add_ref (); /// Decrement the reference count. - virtual void _remove_ref (void); + virtual void _remove_ref (); /// Get the refcount - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} // Useful for template programming. @@ -251,15 +247,15 @@ namespace CORBA /// Accessor for the cached servant reference held on the stub /// if this object is collocated - virtual TAO_Abstract_ServantBase *_servant (void) const; + virtual TAO_Abstract_ServantBase *_servant () const; /// Is this object collocated with the servant? /// Note this does not return this->is_collocated_ but will instead /// query the underlying stub for its collocation status - virtual CORBA::Boolean _is_collocated (void) const; + virtual CORBA::Boolean _is_collocated () const; /// Is this a local object? - virtual CORBA::Boolean _is_local (void) const; + virtual CORBA::Boolean _is_local () const; /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); @@ -272,7 +268,7 @@ namespace CORBA /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO::ObjectKey *_key (void); + virtual TAO::ObjectKey *_key (); /// Constructor Object (TAO_Stub *p, @@ -283,8 +279,8 @@ namespace CORBA Object (IOP::IOR *ior, TAO_ORB_Core *orb_core); /// Get the underlying stub object. - virtual TAO_Stub *_stubobj (void) const; - virtual TAO_Stub *_stubobj (void); + virtual TAO_Stub *_stubobj () const; + virtual TAO_Stub *_stubobj (); /// Set the proxy broker. virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker); @@ -304,10 +300,10 @@ namespace CORBA #endif /* GEN_OSTREAM_OPS */ /// Accessor to the flag.. - CORBA::Boolean is_evaluated (void) const; + CORBA::Boolean is_evaluated () const; /// Accessor for the ORB_Core.. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Accessors for the underlying IOP::IOR's. /** @@ -315,14 +311,14 @@ namespace CORBA * the IOR. This is useful for cases when one wants to initialize * a new CORBA Object */ - IOP::IOR *steal_ior (void); + IOP::IOR *steal_ior (); - const IOP::IOR &ior (void) const; + const IOP::IOR &ior () const; //@} End of TAO-specific methods.. /// Can this object be stringified? - virtual bool can_convert_to_ior (void) const; + virtual bool can_convert_to_ior () const; /// A hook to allow users to provide custom object stringification. /// @note This method is intended to be used by classes that @@ -331,7 +327,7 @@ namespace CORBA const char* ior_prefix) const; /// Wrapper for _remove_ref(), naming convention for templatizing. - void _decr_refcount (void); + void _decr_refcount (); protected: /// Initializing a local object. @@ -412,7 +408,7 @@ namespace TAO { static CORBA::Object_ptr duplicate (CORBA::Object_ptr); static void release (CORBA::Object_ptr); - static CORBA::Object_ptr nil (void); + static CORBA::Object_ptr nil (); static CORBA::Boolean marshal (const CORBA::Object_ptr p, TAO_OutputCDR & cdr); }; @@ -429,7 +425,7 @@ namespace TAO /// library is present. extern TAO_Export TAO::Object_Proxy_Broker * - (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void); + (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR&, const CORBA::Object*); diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index d467e6d2711..55fa8ddcc0c 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -87,12 +87,12 @@ namespace TAO { public: /// Default Constructor and destructor.. - ObjectKey_Table (void); + ObjectKey_Table (); - ~ObjectKey_Table (void); + ~ObjectKey_Table (); /// Iterates and unbinds the contents of the table. - int destroy (void); + int destroy (); /// Bind the ObjectKey in the table. /** diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index 5befb04c321..a2e2937c869 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -41,7 +41,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; protected: S_ptr x_; @@ -67,9 +67,9 @@ namespace TAO { public: In_Object_Clonable_Argument_T (S_ptr x); - virtual ~In_Object_Clonable_Argument_T (void); + virtual ~In_Object_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -94,7 +94,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); + S_ptr & arg (); private: S_ptr & x_; @@ -118,7 +118,7 @@ namespace TAO #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_ptr & x_; @@ -137,16 +137,16 @@ namespace TAO { public: - Ret_Object_Argument_T (void); + Ret_Object_Argument_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_ptr & arg (void); + S_ptr & arg (); - S_ptr excp (void); - S_ptr retn (void); + S_ptr excp (); + S_ptr retn (); private: S_var x_; diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 9854f40b8d0..3ad8a251c09 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -84,7 +84,7 @@ namespace TAO > { public: - ObjectKey (void); + ObjectKey (); ObjectKey (CORBA::ULong max); ObjectKey ( CORBA::ULong max, @@ -92,13 +92,11 @@ namespace TAO CORBA::Octet* buffer, CORBA::Boolean release = false ); -#if defined (ACE_HAS_CPP11) ObjectKey (const ObjectKey &) = default; ObjectKey (ObjectKey &&) = default; ObjectKey& operator= (const ObjectKey &) = default; ObjectKey& operator= (ObjectKey &&) = default; -#endif /* ACE_HAS_CPP11 */ - ~ObjectKey (void); + ~ObjectKey (); typedef ObjectKey_var _var_type; diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index a40fe96d375..cbed00313fb 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -48,7 +48,7 @@ class TAO_Export TAO_Object_Loader : public ACE_Service_Object { public: /// The destructor - virtual ~TAO_Object_Loader (void); + virtual ~TAO_Object_Loader (); /** * Create and activate a new object into the orb. 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/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 24b90a68ece..fb7ca8039ae 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -56,7 +56,7 @@ public: typedef Table::iterator iterator; /// Constructor - TAO_Object_Ref_Table (void); + TAO_Object_Ref_Table (); /** * Register an object reference with the table, and map the given @@ -78,18 +78,18 @@ public: CORBA::Object_ptr resolve_initial_reference (const char * id); /// Explicitly destroy the contents of the object reference table. - void destroy (void); + void destroy (); /** * @name Forward Iterators */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); //@} /// Return the current size of the underlying table. - size_t current_size (void) const; + size_t current_size () const; private: /** @@ -102,9 +102,10 @@ private: //@} private: - // Disallow copying and assignment. - TAO_Object_Ref_Table (const TAO_Object_Ref_Table &); - void operator= (const TAO_Object_Ref_Table &); + TAO_Object_Ref_Table (const TAO_Object_Ref_Table &) = delete; + void operator= (const TAO_Object_Ref_Table &) = delete; + TAO_Object_Ref_Table (TAO_Object_Ref_Table &&) = delete; + void operator= (TAO_Object_Ref_Table &&) = delete; private: /// The implementation. diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h index 9f32df30fed..31f3aa3226e 100644 --- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h @@ -45,12 +45,12 @@ public: { } - inline operator object_reference_type * (void) const + inline operator object_reference_type * () const { return *this->element_; } - inline object_reference_type * in (void) const + inline object_reference_type * in () const { return *this->element_; } diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index c1d04e108fb..08e283e91e7 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -89,11 +89,11 @@ public: return *this->element_; } - inline object_reference_type *in (void) const { + inline object_reference_type *in () const { return *this->element_; } - inline object_reference_type *&inout (void) const { + inline object_reference_type *&inout () const { return *this->element_; } diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 95c88afbe54..3d31c1cc941 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -47,14 +47,14 @@ template <typename T> class TAO_Objref_Var_T : private TAO_Base_var { public: - TAO_Objref_Var_T (void); + TAO_Objref_Var_T (); TAO_Objref_Var_T (T * p) : ptr_ (p) {} TAO_Objref_Var_T (const TAO_Objref_Var_T<T> &); - ~TAO_Objref_Var_T (void); + ~TAO_Objref_Var_T (); TAO_Objref_Var_T<T> & operator= (T *); TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; /// Cast operators. operator T * const & () const; @@ -66,17 +66,17 @@ public: typedef T *& _out_type; typedef T * _retn_type; - _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. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; - void free (void); + void free (); void reset (T *); private: @@ -105,8 +105,8 @@ public: /// Cast operator. operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h index ef893a8849a..a695f89f735 100644 --- a/TAO/tao/On_Demand_Fragmentation_Strategy.h +++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h @@ -52,9 +52,10 @@ public: ACE_CDR::ULong pending_length); private: - // Disallow copying and assignment. - TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &); - void operator= (TAO_On_Demand_Fragmentation_Strategy const &); + TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &) = delete; + void operator= (TAO_On_Demand_Fragmentation_Strategy const &) = delete; + TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy &&) = delete; + void operator= (TAO_On_Demand_Fragmentation_Strategy &&) = delete; private: /// Pointer to the underlying transport object. diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index 2aa46394c6a..9907aa92961 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -49,8 +49,7 @@ namespace TAO class ClientRequestDetails { public: - - ClientRequestDetails (void); + ClientRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); @@ -61,7 +60,6 @@ namespace TAO bool should_be_processed (bool is_remote_request) const; private: - /// The ProcessingMode setting that can be adjusted via the /// PortableInterceptor::ProcessingModePolicy. PortableInterceptor::ProcessingMode processing_mode_; diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index fc7a4980394..d2b95eb562e 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -31,7 +31,7 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) } void -TAO_ClientRequestInfo::setup_picurrent (void) +TAO_ClientRequestInfo::setup_picurrent () { // Retrieve the thread scope current (no TSS access incurred yet). CORBA::Object_ptr pi_current_obj = @@ -75,7 +75,7 @@ TAO_ClientRequestInfo::get_service_context_i ( } CORBA::Object_ptr -TAO_ClientRequestInfo::target (void) +TAO_ClientRequestInfo::target () { this->check_validity (); @@ -83,7 +83,7 @@ TAO_ClientRequestInfo::target (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::effective_target (void) +TAO_ClientRequestInfo::effective_target () { this->check_validity (); @@ -91,7 +91,7 @@ TAO_ClientRequestInfo::effective_target (void) } IOP::TaggedProfile * -TAO_ClientRequestInfo::effective_profile (void) +TAO_ClientRequestInfo::effective_profile () { this->check_validity (); @@ -128,7 +128,7 @@ TAO_ClientRequestInfo::effective_profile (void) // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo::received_exception (void) +TAO_ClientRequestInfo::received_exception () { this->check_validity (); @@ -163,7 +163,7 @@ TAO_ClientRequestInfo::received_exception (void) } char * -TAO_ClientRequestInfo::received_exception_id (void) +TAO_ClientRequestInfo::received_exception_id () { this->check_validity (); @@ -309,7 +309,7 @@ TAO_ClientRequestInfo::add_request_service_context ( } CORBA::ULong -TAO_ClientRequestInfo::request_id (void) +TAO_ClientRequestInfo::request_id () { this->check_validity (); @@ -393,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void) } char * -TAO_ClientRequestInfo::operation (void) +TAO_ClientRequestInfo::operation () { this->check_validity (); @@ -401,7 +401,7 @@ TAO_ClientRequestInfo::operation (void) } Dynamic::ParameterList * -TAO_ClientRequestInfo::arguments (void) +TAO_ClientRequestInfo::arguments () { this->check_validity (); @@ -443,7 +443,7 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList ¶m_list) } Dynamic::ExceptionList * -TAO_ClientRequestInfo::exceptions (void) +TAO_ClientRequestInfo::exceptions () { this->check_validity (); @@ -481,7 +481,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list) } Dynamic::ContextList * -TAO_ClientRequestInfo::contexts (void) +TAO_ClientRequestInfo::contexts () { this->check_validity (); @@ -489,7 +489,7 @@ TAO_ClientRequestInfo::contexts (void) } Dynamic::RequestContext * -TAO_ClientRequestInfo::operation_context (void) +TAO_ClientRequestInfo::operation_context () { this->check_validity (); @@ -497,7 +497,7 @@ TAO_ClientRequestInfo::operation_context (void) } CORBA::Any * -TAO_ClientRequestInfo::result (void) +TAO_ClientRequestInfo::result () { this->check_validity (); @@ -526,7 +526,7 @@ TAO_ClientRequestInfo::result (CORBA::Any *any) } CORBA::Boolean -TAO_ClientRequestInfo::response_expected (void) +TAO_ClientRequestInfo::response_expected () { this->check_validity (); @@ -534,7 +534,7 @@ TAO_ClientRequestInfo::response_expected (void) } Messaging::SyncScope -TAO_ClientRequestInfo::sync_scope (void) +TAO_ClientRequestInfo::sync_scope () { this->check_validity (); @@ -542,7 +542,7 @@ TAO_ClientRequestInfo::sync_scope (void) } PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo::reply_status (void) +TAO_ClientRequestInfo::reply_status () { this->check_validity (); @@ -558,7 +558,7 @@ TAO_ClientRequestInfo::reply_status (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::forward_reference (void) +TAO_ClientRequestInfo::forward_reference () { this->check_validity (); @@ -606,7 +606,7 @@ TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id) } void -TAO_ClientRequestInfo::check_validity (void) +TAO_ClientRequestInfo::check_validity () { if (this->invocation_ == 0) throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); @@ -619,7 +619,7 @@ TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time) } TimeBase::TimeT -TAO_ClientRequestInfo::tao_ft_expiration_time (void) const +TAO_ClientRequestInfo::tao_ft_expiration_time () const { return this->invocation_->operation_details ().ft_expiration_time (); } @@ -631,7 +631,7 @@ TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id) } CORBA::Long -TAO_ClientRequestInfo::tao_ft_retention_id (void) const +TAO_ClientRequestInfo::tao_ft_retention_id () const { return this->invocation_->operation_details ().ft_retention_id (); } diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 00f692f7ffc..fe41ecb1f83 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -75,34 +75,34 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns true for a two-way operation, and false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -110,11 +110,11 @@ public: * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD, * TRANSPORT_RETRY, UNKNOWN. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// return the object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -129,23 +129,23 @@ public: /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. - virtual CORBA::Object_ptr target (void); + virtual CORBA::Object_ptr target (); /// Return the object reference for the current target. The target /// may change in the even of a location forward. - virtual CORBA::Object_ptr effective_target (void); + virtual CORBA::Object_ptr effective_target (); - virtual IOP::TaggedProfile * effective_profile (void); + virtual IOP::TaggedProfile * effective_profile (); /// Return an Any containing the received exception, if any. /// Otherwise, throw a CORBA::BAD_INV_ORDER exception. /** * @note There is no trivial way to extract the exception from an Any. */ - virtual CORBA::Any * received_exception (void); + virtual CORBA::Any * received_exception (); /// Return the repository ID for the received exception. - virtual char * received_exception_id (void); + virtual char * received_exception_id (); /// Return the first IOP::TaggedComponent that matches the given /// IOP::ComponentId in the object reference for the current @@ -176,20 +176,19 @@ public: void tao_ft_expiration_time (TimeBase::TimeT time); /// Get the absolute FT expiration time for this request - TimeBase::TimeT tao_ft_expiration_time (void) const; + TimeBase::TimeT tao_ft_expiration_time () const; /// Set the FT request retention ID for this request. void tao_ft_retention_id (CORBA::Long request_id); /// Get the FT request retention ID for this request. - CORBA::Long tao_ft_retention_id (void) const; + CORBA::Long tao_ft_retention_id () const; /* * End proprietary FT methods. */ private: - bool parameter_list (Dynamic::ParameterList ¶m_list); bool exception_list (Dynamic::ExceptionList &exception_list); @@ -198,11 +197,11 @@ private: /// Check if this ClientRequestInfo object is called within the /// context of a request. - void check_validity (void); + void check_validity (); /// Setup thread scope and request scope /// PortableInterceptor::Current objects. - void setup_picurrent (void); + void setup_picurrent (); /// Helper method to get the request and response service contexts. IOP::ServiceContext *get_service_context_i ( diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 6d746b2ea5a..2c4a2db3e32 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -255,7 +255,7 @@ namespace TAO } void - ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void) + ClientRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index de01f6487f1..3f1c10c7af9 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -64,7 +64,7 @@ namespace TAO , public TAO_RequestInterceptor_Adapter_Impl { public: - ClientRequestInterceptor_Adapter_Impl (void); + ClientRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Client Side Interception Points @@ -101,7 +101,7 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); virtual PortableInterceptor::ReplyStatus pi_reply_status ( TAO::Invocation_Base const &invocation_base); diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index 2b85812b366..10260d213a7 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ClientRequestInterceptor_Adapter* -TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ClientRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index 75b079061b3..2166b6491a8 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Export TAO_ClientRequestInterceptor_Adapter_Factory_Impl : public TAO_ClientRequestInterceptor_Adapter_Factory { public: - virtual TAO::ClientRequestInterceptor_Adapter *create (void); + virtual TAO::ClientRequestInterceptor_Adapter *create (); }; ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index 338bfbf4f58..306e088b265 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h @@ -51,13 +51,9 @@ namespace PortableInterceptor const ACE_TCHAR * dll_name); virtual ~DLL_Resident_ORB_Initializer (); - virtual void pre_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void pre_init (::PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void post_init (::PortableInterceptor::ORBInitInfo_ptr info); private: PortableInterceptor::ORBInitializer_var initializer_; diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 77da79213eb..e8fd6b39c04 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -60,7 +60,7 @@ namespace TAO }; /// Constructor. - Interceptor_List (void); + Interceptor_List (); void add_interceptor (InterceptorType_ptr_type i); @@ -68,7 +68,7 @@ namespace TAO void add_interceptor (InterceptorType_ptr_type i, const CORBA::PolicyList& policies); - void destroy_interceptors (void); + void destroy_interceptors (); /// Return the registered interceptor in sequence element @a index. RegisteredInterceptor& registered_interceptor (size_t index); @@ -76,7 +76,7 @@ namespace TAO /// Return the interceptor in sequence element @a index. InterceptorType_ptr_type interceptor (size_t index); - size_t size (void) const; + size_t size () const; private: typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray; diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 1006abbccec..aba8e1fb7b8 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -35,7 +35,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p) } TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void) +TAO::Objref_Traits<TAO_ORBInitInfo>::nil () { return TAO_ORBInitInfo::_nil (); } @@ -61,12 +61,12 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core, { } -TAO_ORBInitInfo::~TAO_ORBInitInfo (void) +TAO_ORBInitInfo::~TAO_ORBInitInfo () { } CORBA::StringSeq * -TAO_ORBInitInfo::arguments (void) +TAO_ORBInitInfo::arguments () { this->check_validity (); @@ -94,7 +94,7 @@ TAO_ORBInitInfo::arguments (void) } char * -TAO_ORBInitInfo::orb_id (void) +TAO_ORBInitInfo::orb_id () { this->check_validity (); @@ -104,7 +104,7 @@ TAO_ORBInitInfo::orb_id (void) } IOP::CodecFactory_ptr -TAO_ORBInitInfo::codec_factory (void) +TAO_ORBInitInfo::codec_factory () { if (CORBA::is_nil (this->codec_factory_.in ())) { @@ -277,7 +277,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( } PortableInterceptor::SlotId -TAO_ORBInitInfo::allocate_slot_id (void) +TAO_ORBInitInfo::allocate_slot_id () { this->check_validity (); @@ -333,7 +333,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup) } void -TAO_ORBInitInfo::check_validity (void) +TAO_ORBInitInfo::check_validity () { if (this->orb_core_ == 0) { @@ -348,7 +348,7 @@ TAO_ORBInitInfo::check_validity (void) } CORBA::ORB_ptr -TAO_ORBInitInfo::_get_orb (void) +TAO_ORBInitInfo::_get_orb () { this->check_validity (); @@ -379,7 +379,7 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj) return obj; } -const char* TAO_ORBInitInfo::_interface_repository_id (void) const +const char* TAO_ORBInitInfo::_interface_repository_id () const { return "IDL:TAO_ORBInitInfo:1.0"; } diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 4dc4efdca3f..a8b960f33d4 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -71,14 +71,14 @@ public: //@{ /// Return the argument vector for the ORB currently being /// initialized as a string sequence. - virtual CORBA::StringSeq * arguments (void); + virtual CORBA::StringSeq * arguments (); /// Return the ORBid for the ORB currently being initialized. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the CodecFactory for the ORB currently being /// initialized. - virtual IOP::CodecFactory_ptr codec_factory (void); + virtual IOP::CodecFactory_ptr codec_factory (); /// Register a mapping between a string and a corresponding object /// reference with the ORB being initialized. @@ -132,7 +132,7 @@ public: /// Reserve a slot in table found within the /// PortableInterceptor::Current object. - virtual PortableInterceptor::SlotId allocate_slot_id (void); + virtual PortableInterceptor::SlotId allocate_slot_id (); /// Register a policy factory of the given policy type with the ORB /// currently being initialized. @@ -140,7 +140,7 @@ public: CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); //@} /** @@ -171,18 +171,18 @@ public: * * @note Only use this method if you know what you are doing. */ - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Invalidate this ORBInitInfo instance. /** * @note This method is only meant to be called by the * CORBA::ORB_init() function. */ - void invalidate (void); + void invalidate (); /// Return the number of allocated slots in for the PICurrent /// object. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; //@} /** @@ -202,24 +202,24 @@ public: static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj); - static TAO_ORBInitInfo_ptr _nil (void) + static TAO_ORBInitInfo_ptr _nil () { return (TAO_ORBInitInfo_ptr)0; } //@} - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: /// Destructor is protected to enforce proper memory management /// through the reference counting mechanism. - ~TAO_ORBInitInfo (void); + ~TAO_ORBInitInfo (); /// Check if this ORBInitInfo instance is valid. Once post_init() /// has been called on each of the ORBInitializers, this ORBInitInfo /// is no longer valid. Throw an exception in that case. - void check_validity (void); + void check_validity (); private: @@ -258,7 +258,7 @@ namespace TAO { static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr); static void release (TAO_ORBInitInfo_ptr); - static TAO_ORBInitInfo_ptr nil (void); + static TAO_ORBInitInfo_ptr nil (); static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr); }; } diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index c74c4f5e385..f21bc49245c 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ORBInitializer_Registry::ORBInitializer_Registry (void) +TAO::ORBInitializer_Registry::ORBInitializer_Registry () : lock_ (), initializers_ () { @@ -66,7 +66,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) } int -TAO::ORBInitializer_Registry::fini (void) +TAO::ORBInitializer_Registry::fini () { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index f6c9de7cd2c..40156abfe85 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -43,7 +43,7 @@ namespace TAO : public ORBInitializer_Registry_Adapter { public: - ORBInitializer_Registry (void); + ORBInitializer_Registry (); /// Added to provide registration for the several static service /// objects, brought in with this ORBInitializer_Registry @@ -57,7 +57,7 @@ namespace TAO /// Service config fini method, release all ORBInitializers at this /// moment - virtual int fini (void); + virtual int fini (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. @@ -81,8 +81,8 @@ namespace TAO private: // Prevent copying - ORBInitializer_Registry (const ORBInitializer_Registry &); - void operator= (const ORBInitializer_Registry &); + ORBInitializer_Registry (const ORBInitializer_Registry &) = delete; + void operator= (const ORBInitializer_Registry &) = delete; private: TAO_SYNCH_RECURSIVE_MUTEX lock_; diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 4a8dde4d7a1..319c44c812a 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This one is used during static initialization while the other is used // when PI is a shared library. int -TAO_PI_Init::Initializer (void) +TAO_PI_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 2d0f9cbe662..addfd85df07 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -31,7 +31,7 @@ class TAO_PI_Export TAO_PI_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; #if defined (TAO_AS_STATIC_LIBS) || (defined (ACE_VXWORKS) && !defined (__RTP__)) diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 2a673e1eb3f..86bb1f2c632 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -20,10 +20,6 @@ TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core) { } -TAO::PICurrent::~PICurrent (void) -{ -} - CORBA::Any * TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier) { @@ -50,14 +46,14 @@ namespace } TAO::PICurrent_Impl * -TAO::PICurrent::tsc (void) +TAO::PICurrent::tsc () { TAO::PICurrent_Impl *impl = static_cast<TAO::PICurrent_Impl *> ( this->orb_core_.get_tss_resource (this->tss_slot_)); // If this TSS has not yet been set-up, give it it's own PICurrent_Impl. - if (0 == impl) + if (!impl) { ACE_NEW_THROW_EX (impl, TAO::PICurrent_Impl (&this->orb_core_, this->tss_slot_), @@ -89,7 +85,7 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier) } CORBA::ORB_ptr -TAO::PICurrent::_get_orb (void) +TAO::PICurrent::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index c5fb1391941..78ae7d699ec 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -76,14 +76,14 @@ namespace TAO const CORBA::Any & data); //@} - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// Number of slots allocated in the slot table. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; /// Retrieve the PICurrent implementation from TSS, i.e. the thread /// scope current (TSC). - PICurrent_Impl * tsc (void); + PICurrent_Impl * tsc (); /// Verify the validity of the given SlotId. void check_validity (const PortableInterceptor::SlotId &identifier); @@ -98,14 +98,14 @@ namespace TAO * counted, and should not be destroyed using delete() by anything * other than the reference counting mechanism. */ - virtual ~PICurrent (void); + virtual ~PICurrent () = default; private: /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent (const PICurrent &); - void operator= (const PICurrent &); + PICurrent (const PICurrent &) = delete; + void operator= (const PICurrent &) = delete; //@} private: diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 3c3ae41dd95..9f8ccaba8f8 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -171,7 +171,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl () } void -TAO::PICurrent_Impl::push (void) +TAO::PICurrent_Impl::push () { if (this->orb_core_) // We have a stack to adjust { @@ -197,7 +197,7 @@ TAO::PICurrent_Impl::push (void) } void -TAO::PICurrent_Impl::pop (void) +TAO::PICurrent_Impl::pop () { if (this->orb_core_) // We have a stack to adjust { diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 3d22b82bb1e..7819fdda9cc 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -52,7 +52,7 @@ namespace TAO size_t tss_slot= 0, PICurrent_Impl *pop= 0); /// Destructor. - ~PICurrent_Impl (void); + ~PICurrent_Impl (); /// Retrieve information stored in the slot table at the given /// SlotId. @@ -66,10 +66,10 @@ namespace TAO void take_lazy_copy (PICurrent_Impl *p); /// Push a new PICurrent_Impl on stack - void push (void); + void push (); /// Pop old PICurrent_Impl from stack - void pop (void); + void pop (); private: /// Force this object to convert from a logical (referenced) @@ -97,8 +97,8 @@ namespace TAO /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent_Impl (const PICurrent_Impl &); - void operator= (const PICurrent_Impl &); + PICurrent_Impl (const PICurrent_Impl &) = delete; + void operator= (const PICurrent_Impl &) = delete; //@} private: diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index 5aa02eea3a9..123d4f54ea8 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -16,7 +16,6 @@ TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } - void TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { @@ -39,7 +38,6 @@ TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) this->register_policy_factories (info); } - void TAO_PI_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index 082f9a3fdc5..8a7af55048d 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -37,7 +37,6 @@ class TAO_PI_Export TAO_PI_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer methods * @@ -51,7 +50,6 @@ public: //@} private: - /// Register PortableInterceptor policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index fac7f3071af..85236c1f2cf 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -34,8 +34,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory public virtual ::CORBA::LocalObject { public: - CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value); + CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index cf36dafbbb1..eb614ce9dbb 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( } PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil () { return PortableInterceptor::PolicyFactory::_nil (); } @@ -77,10 +77,10 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::PolicyFactory::PolicyFactory (void) +PortableInterceptor::PolicyFactory::PolicyFactory () {} -PortableInterceptor::PolicyFactory::~PolicyFactory (void) +PortableInterceptor::PolicyFactory::~PolicyFactory () {} PortableInterceptor::PolicyFactory_ptr @@ -146,7 +146,7 @@ PortableInterceptor::PolicyFactory::_is_a (const char *value) } } -const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const +const char* PortableInterceptor::PolicyFactory::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"; } diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 0b2dfabc75b..f97f52df981 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -106,7 +106,7 @@ namespace PortableInterceptor ); - static PolicyFactory_ptr _nil (void) + static PolicyFactory_ptr _nil () { return static_cast<PolicyFactory_ptr> (0); } @@ -137,14 +137,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - PolicyFactory (void); + PolicyFactory (); - virtual ~PolicyFactory (void); + virtual ~PolicyFactory (); private: // Private and unimplemented for concrete interfaces. @@ -179,7 +179,7 @@ namespace TAO static void release ( ::PortableInterceptor::PolicyFactory_ptr ); - static ::PortableInterceptor::PolicyFactory_ptr nil (void); + static ::PortableInterceptor::PolicyFactory_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index 81cd0387879..252e0f9f1cf 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PolicyFactory_Registry_Adapter* -TAO_PolicyFactory_Loader::create (void) +TAO_PolicyFactory_Loader::create () { TAO::PolicyFactory_Registry_Adapter* obj = 0; ACE_NEW_RETURN (obj, @@ -27,7 +27,7 @@ TAO_PolicyFactory_Loader::create (void) } int -TAO_PolicyFactory_Loader::Initializer (void) +TAO_PolicyFactory_Loader::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader); } diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index d96c7d39abd..98ad244420f 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -31,10 +31,10 @@ class TAO_PI_Export TAO_PolicyFactory_Loader { public: /// Creates a Codec factory and returns it. - virtual TAO::PolicyFactory_Registry_Adapter* create (void); + virtual TAO::PolicyFactory_Registry_Adapter* create (); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index 0ff905feef5..fc8d396aece 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -6,12 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry () : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE) { } -TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry () { const TABLE::iterator end (this->factories_.end ()); diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index ddd26b87151..9ea5fb17330 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -39,7 +39,6 @@ class TAO_PolicyFactory_Registry : public TAO::PolicyFactory_Registry_Adapter { public: - /** * The type of table that maps policy type to policy factory. * @@ -51,16 +50,14 @@ public: */ typedef ACE_Map_Manager<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, - ACE_Null_Mutex> - TABLE; + ACE_Null_Mutex> TABLE; public: - /// Constructor - TAO_PolicyFactory_Registry (void); + TAO_PolicyFactory_Registry (); /// Destructor. Releases duplicated PolicyFactory references. - ~TAO_PolicyFactory_Registry (void); + ~TAO_PolicyFactory_Registry (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB @@ -83,10 +80,8 @@ public: bool factory_exists (CORBA::PolicyType & type) const; private: - /// The table that maps policy type to policy factory. TABLE factories_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index 046e5014ac4..85938fec13d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -17,9 +17,9 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy } CORBA::Policy_ptr -TAO_ProcessingModePolicy::copy (void) +TAO_ProcessingModePolicy::copy () { - TAO_ProcessingModePolicy *copy = 0; + TAO_ProcessingModePolicy *copy {}; ACE_NEW_THROW_EX (copy, TAO_ProcessingModePolicy (this->processing_mode_), CORBA::NO_MEMORY ()); @@ -28,18 +28,18 @@ TAO_ProcessingModePolicy::copy (void) } void -TAO_ProcessingModePolicy::destroy (void) +TAO_ProcessingModePolicy::destroy () { } PortableInterceptor::ProcessingMode -TAO_ProcessingModePolicy::processing_mode (void) +TAO_ProcessingModePolicy::processing_mode () { return processing_mode_; } CORBA::PolicyType -TAO_ProcessingModePolicy::policy_type (void) +TAO_ProcessingModePolicy::policy_type () { return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; } diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index ce6d12690db..ecc270c8e3d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -44,13 +44,13 @@ public: /// Constructor. TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); - virtual PortableInterceptor::ProcessingMode processing_mode (void); + virtual PortableInterceptor::ProcessingMode processing_mode (); - 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 (); private: /// The attribute diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 29ec2f53511..adb2c7c0597 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * -TAO_RequestInfo_Util::make_parameter_list (void) +TAO_RequestInfo_Util::make_parameter_list () { Dynamic::ParameterList *parameter_list = 0; ACE_NEW_THROW_EX (parameter_list, @@ -30,7 +30,7 @@ TAO_RequestInfo_Util::make_parameter_list (void) } Dynamic::ExceptionList * -TAO_RequestInfo_Util::make_exception_list (void) +TAO_RequestInfo_Util::make_exception_list () { Dynamic::ExceptionList *exception_list = 0; ACE_NEW_THROW_EX (exception_list, @@ -47,7 +47,7 @@ TAO_RequestInfo_Util::make_exception_list (void) } Dynamic::ContextList * -TAO_RequestInfo_Util::make_context_list (void) +TAO_RequestInfo_Util::make_context_list () { Dynamic::ContextList *context_list = 0; ACE_NEW_THROW_EX (context_list, @@ -64,7 +64,7 @@ TAO_RequestInfo_Util::make_context_list (void) } Dynamic::RequestContext * -TAO_RequestInfo_Util::make_request_context (void) +TAO_RequestInfo_Util::make_request_context () { Dynamic::RequestContext *request_context = 0; ACE_NEW_THROW_EX (request_context, diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index b0c48d878bf..56537358735 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -60,13 +60,13 @@ public: * class. */ //@{ - static Dynamic::ParameterList * make_parameter_list (void); + static Dynamic::ParameterList * make_parameter_list (); - static Dynamic::ExceptionList * make_exception_list (void); + static Dynamic::ExceptionList * make_exception_list (); - static Dynamic::ContextList * make_context_list (void); + static Dynamic::ContextList * make_context_list (); - static Dynamic::RequestContext * make_request_context (void); + static Dynamic::RequestContext * make_request_context (); static CORBA::Any * make_any (CORBA::Boolean tk_void_any); //@} diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp index ce14ce596b4..b9c074cd79e 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void) +TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl () { } diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h index a3ff67558ef..44d76c58261 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h @@ -43,7 +43,7 @@ class TAO_PI_Export TAO_RequestInterceptor_Adapter_Impl : public TAO::RequestInterceptor_Adapter { public: - ~TAO_RequestInterceptor_Adapter_Impl (void); + ~TAO_RequestInterceptor_Adapter_Impl (); void popTSC (TAO_ORB_Core *orb_core); void pushTSC (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 87500e8ff82..61f12fffadf 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -53,7 +53,7 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, } } -TAO::PICurrent_Guard::~PICurrent_Guard (void) +TAO::PICurrent_Guard::~PICurrent_Guard () { if (this->src_ != 0 && this->dest_ != 0 && this->src_ != this->dest_) diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 8eaee4ec81d..16014c78dca 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -72,7 +72,7 @@ namespace TAO * points are invoked, and after the starting and intermediate (if * any) interception points are invoked. */ - ~PICurrent_Guard (void); + ~PICurrent_Guard (); private: diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 0c222f5d26b..322d9be2505 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_PI_Server_Init::Initializer (void) +TAO_PI_Server_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ServerRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index 63b7f2b2281..f38922a5209 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -31,7 +31,7 @@ class TAO_PI_Server_Export TAO_PI_Server_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 6971657efc8..3c38f5cf1fd 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::TAO_PI_Server_Loader () : initialized_ (false) { } -TAO_PI_Server_Loader::~TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::~TAO_PI_Server_Loader () { } diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b7079eb7c0d..d466c9a2564 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -27,10 +27,10 @@ class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_PI_Server_Loader (void); + TAO_PI_Server_Loader (); /// Destructor. - virtual ~TAO_PI_Server_Loader (void); + virtual ~TAO_PI_Server_Loader (); /// Initialize the PI_Server loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index b2863450ee9..93470b44b2d 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) +TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl () { } @@ -506,13 +506,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( } void -TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void) +TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } TAO::PICurrent_Impl * -TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) +TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current () { TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 6a5b7f25d12..15630621c6a 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -68,7 +68,7 @@ namespace TAO { public: /// Constructor. - ServerRequestInterceptor_Adapter_Impl (void); + ServerRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Server Side Interception Points @@ -154,9 +154,9 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); - virtual TAO::PICurrent_Impl *allocate_pi_current (void); + virtual TAO::PICurrent_Impl *allocate_pi_current (); virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent); diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h index 1727d249013..69ea625353f 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ b/TAO/tao/PI_Server/ServerRequestDetails.h @@ -49,7 +49,7 @@ namespace TAO class ServerRequestDetails { public: - ServerRequestDetails (void); + ServerRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 93d297ca0c4..418c92be0b1 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong -TAO::ServerRequestInfo::request_id (void) +TAO::ServerRequestInfo::request_id () { // The request ID returned by this method need not correspond to the // GIOP request ID sent with the client request. The request ID @@ -65,15 +65,15 @@ TAO::ServerRequestInfo::request_id (void) } char * -TAO::ServerRequestInfo::operation (void) +TAO::ServerRequestInfo::operation () { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO::ServerRequestInfo::arguments (void) +TAO::ServerRequestInfo::arguments () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -115,9 +115,9 @@ TAO::ServerRequestInfo::arguments (void) } Dynamic::ExceptionList * -TAO::ServerRequestInfo::exceptions (void) +TAO::ServerRequestInfo::exceptions () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -145,21 +145,21 @@ TAO::ServerRequestInfo::exceptions (void) } Dynamic::ContextList * -TAO::ServerRequestInfo::contexts (void) +TAO::ServerRequestInfo::contexts () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } Dynamic::RequestContext * -TAO::ServerRequestInfo::operation_context (void) +TAO::ServerRequestInfo::operation_context () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } CORBA::Any * -TAO::ServerRequestInfo::result (void) +TAO::ServerRequestInfo::result () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -167,8 +167,7 @@ TAO::ServerRequestInfo::result (void) // Generate the result on demand. static CORBA::Boolean const tk_void_any = true; - CORBA::Any * result_any = - TAO_RequestInfo_Util::make_any (tk_void_any); + CORBA::Any * result_any = TAO_RequestInfo_Util::make_any (tk_void_any); CORBA::Any_var safe_result_any = result_any; @@ -181,35 +180,41 @@ TAO::ServerRequestInfo::result (void) } CORBA::Boolean -TAO::ServerRequestInfo::response_expected (void) +TAO::ServerRequestInfo::response_expected () { return this->server_request_.response_expected (); } Messaging::SyncScope -TAO::ServerRequestInfo::sync_scope (void) +TAO::ServerRequestInfo::sync_scope () { if (this->server_request_.sync_with_server ()) + { return Messaging::SYNC_WITH_SERVER; + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ReplyStatus -TAO::ServerRequestInfo::reply_status (void) +TAO::ServerRequestInfo::reply_status () { if (this->server_request_.pi_reply_status () == -1) + { // A reply hasn't been received yet. throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } return this->server_request_.pi_reply_status (); } CORBA::Object_ptr -TAO::ServerRequestInfo::forward_reference (void) +TAO::ServerRequestInfo::forward_reference () { if (this->server_request_.pi_reply_status () != PortableInterceptor::LOCATION_FORWARD) + { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } // TAO_ServerRequest::forward_location() already duplicates the // object reference. There is no need to duplicate it here. @@ -227,7 +232,7 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -236,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current (); return rsc->get_slot (id); - } IOP::ServiceContext * @@ -280,7 +284,7 @@ TAO::ServerRequestInfo::get_service_context_i ( // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO::ServerRequestInfo::sending_exception (void) +TAO::ServerRequestInfo::sending_exception () { if (this->server_request_.pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION && this->server_request_.pi_reply_status () != PortableInterceptor::USER_EXCEPTION) @@ -291,8 +295,7 @@ TAO::ServerRequestInfo::sending_exception (void) // The spec says that if it is a user exception which cannot be // inserted then the UNKNOWN exception should be thrown with minor // code 1. - - CORBA::Any * temp = 0; + CORBA::Any * temp {}; ACE_NEW_THROW_EX (temp, CORBA::Any, @@ -304,56 +307,61 @@ TAO::ServerRequestInfo::sending_exception (void) CORBA::Any_var caught_exception_var = temp; - if (this->server_request_.caught_exception () != 0) + if (this->server_request_.caught_exception ()) + { (*temp) <<= *(this->server_request_.caught_exception ()); + } return caught_exception_var._retn (); } char * -TAO::ServerRequestInfo::server_id (void) +TAO::ServerRequestInfo::server_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::orb_id (void) +TAO::ServerRequestInfo::orb_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::AdapterName * -TAO::ServerRequestInfo::adapter_name (void) +TAO::ServerRequestInfo::adapter_name () { // The adapter_name attribute defines a name for the object adapter // that services requests for the invoked object. In the case of the // POA, the adapter_name is the sequence of names from the root POA // to the POA that services the request. The root POA is not named // in this sequence. - if (this->servant_upcall_ != 0) - return - this->servant_upcall_->poa ().adapter_name (); + if (this->servant_upcall_) + { + return this->servant_upcall_->poa ().adapter_name (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ObjectId * -TAO::ServerRequestInfo::object_id (void) +TAO::ServerRequestInfo::object_id () { if (this->servant_upcall_ != 0) { const PortableServer::ObjectId &id = this->servant_upcall_->user_id (); - PortableInterceptor::ObjectId *tmp = 0; + PortableInterceptor::ObjectId *tmp {}; ACE_NEW_THROW_EX (tmp, PortableInterceptor::ObjectId, @@ -385,21 +393,25 @@ TAO::ServerRequestInfo::object_id (void) } CORBA::OctetSeq * -TAO::ServerRequestInfo::adapter_id (void) +TAO::ServerRequestInfo::adapter_id () { - if (this->servant_upcall_ != 0) + if (this->servant_upcall_) + { return this->servant_upcall_->poa ().id (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::target_most_derived_interface (void) +TAO::ServerRequestInfo::target_most_derived_interface () { - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } + + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { @@ -446,7 +458,7 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -460,11 +472,13 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, CORBA::Boolean TAO::ServerRequestInfo::target_is_a (const char * id) { + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } + // Implemented in the generated skeleton. - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 98b1267f71a..279a231b79c 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -80,34 +80,34 @@ namespace TAO /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no /// return value then an @c Any with @c tk_void @c TypeCode is /// returned. This method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns @c true for a two-way operation, and @c false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -115,12 +115,12 @@ namespace TAO * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD, * @c TRANSPORT_RETRY, @c UNKNOWN.. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is /// @c PortableInterceptor::LOCATION_FORWARD return the /// object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); /// Retrieve data from the "request scope" @c PICurrent object. virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -141,29 +141,29 @@ namespace TAO * @note There is no trivial way to extract the exception from an * @c Any. */ - virtual CORBA::Any * sending_exception (void); + virtual CORBA::Any * sending_exception (); /// Return the @c ObjectId for the target object. - virtual PortableInterceptor::ObjectId * object_id (void); + virtual PortableInterceptor::ObjectId * object_id (); /// Return the @c AdapterId for the POA handling the current /// request. - virtual CORBA::OctetSeq * adapter_id (void); + virtual CORBA::OctetSeq * adapter_id (); /// Return the server_id of the server. The value is passed to /// the ORB via @c -ORBServerId parameter. - virtual char * server_id (void); + virtual char * server_id (); /// Return the ORBId value that is passed to the @c ORB_init /// call. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the name of the object adapter that services requests /// for the invoked object. - virtual PortableInterceptor::AdapterName * adapter_name (void); + virtual PortableInterceptor::AdapterName * adapter_name (); /// Return the most derived interface of the target object. - virtual char * target_most_derived_interface (void); + virtual char * target_most_derived_interface (); /// Return the policy of the given type in effect for the current /// request. @@ -207,7 +207,7 @@ namespace TAO /// Return a reference to the underlying @c TAO_ServerRequest /// object. - TAO_ServerRequest &server_request (void); + TAO_ServerRequest &server_request (); protected: /// Helper method to get the request and response service diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 30d7fe51d1a..80f6f6100b5 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( } PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil () { return PortableInterceptor::ServerRequestInterceptor::_nil (); } @@ -78,10 +78,10 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor () {} -PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor () {} PortableInterceptor::ServerRequestInterceptor_ptr @@ -156,7 +156,7 @@ PortableInterceptor::ServerRequestInterceptor::_is_a ( } } -const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const +const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 676567e42ef..4dce9d6cc6a 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -131,7 +131,7 @@ namespace PortableInterceptor ); - static ServerRequestInterceptor_ptr _nil (void) + static ServerRequestInterceptor_ptr _nil () { return static_cast<ServerRequestInterceptor_ptr> (0); } @@ -203,14 +203,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - ServerRequestInterceptor (void); + ServerRequestInterceptor (); - virtual ~ServerRequestInterceptor (void); + virtual ~ServerRequestInterceptor (); private: // Private and unimplemented for concrete interfaces. @@ -245,7 +245,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInfo_ptr ); - static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); + static ::PortableInterceptor::ServerRequestInfo_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr @@ -266,7 +266,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInterceptor_ptr ); - static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); + static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index f04d2565187..c4123f9b325 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ServerRequestInterceptor_Adapter* -TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ServerRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 7c7abdab60b..9cacd9b0172 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Server_Export TAO_ServerRequestInterceptor_Adapter_Factory_Impl : public TAO_ServerRequestInterceptor_Adapter_Factory { public: - virtual TAO::ServerRequestInterceptor_Adapter *create (void); + virtual TAO::ServerRequestInterceptor_Adapter *create (); }; diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index daacd764291..91c355f9bf0 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -45,10 +45,10 @@ class TAO_Export TAO_Parser_Registry { public: /// Default constructor. - TAO_Parser_Registry (void); + TAO_Parser_Registry (); /// Dstructor. - ~TAO_Parser_Registry (void); + ~TAO_Parser_Registry (); /// Initialize the parser registry with the list of known protocols. /// Invoked by the ORB during startup. @@ -60,8 +60,8 @@ public: // = Iterator. typedef TAO_IOR_Parser** Parser_Iterator; - Parser_Iterator begin (void) const; - Parser_Iterator end (void) const; + Parser_Iterator begin () const; + Parser_Iterator end () const; private: 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/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 275a419cbc2..e359b804871 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -53,7 +53,7 @@ namespace TAO class TAO_Export PolicyFactory_Registry_Adapter { public: - virtual ~PolicyFactory_Registry_Adapter (void); + virtual ~PolicyFactory_Registry_Adapter (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h index bc214fe55ba..19b6e383f72 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.h +++ b/TAO/tao/PolicyFactory_Registry_Factory.h @@ -34,9 +34,9 @@ class TAO_Export TAO_PolicyFactory_Registry_Factory : public ACE_Service_Object { public: - virtual ~TAO_PolicyFactory_Registry_Factory (void); + virtual ~TAO_PolicyFactory_Registry_Factory (); - virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0; + virtual TAO::PolicyFactory_Registry_Adapter* create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL 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/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 619fb506e3f..97a2fea0484 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -54,9 +54,10 @@ public: CORBA::SetOverrideType set_add); private: - // Disallow copying. - TAO_Policy_Manager (TAO_Policy_Manager const &); - TAO_Policy_Manager & operator= (TAO_Policy_Manager const &); + TAO_Policy_Manager (TAO_Policy_Manager const &) = delete; + TAO_Policy_Manager & operator= (TAO_Policy_Manager const &) = delete; + TAO_Policy_Manager (TAO_Policy_Manager &&) = delete; + TAO_Policy_Manager & operator= (TAO_Policy_Manager &&) = delete; private: /// Protect access diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 36d8d6c7bc7..1e415564ecd 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -48,7 +48,7 @@ public: TAO_Policy_Set (const TAO_Policy_Set &rhs); /// Destructor - ~TAO_Policy_Set (void); + ~TAO_Policy_Set (); /// Copy the state from @a source, it uses the copy() operator to /// obtain independent copies of all the policies. @@ -93,14 +93,14 @@ public: /// @c CORBA::Policy::_nil () is returned if the policy doesn't /// exist. CORBA::Policy *get_policy_by_index (CORBA::ULong index) const; - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; private: TAO_Policy_Set & operator= (const TAO_Policy_Set&); /// Remove and destroy all the policy objects owned by this policy /// manager. - void cleanup_i (void); + void cleanup_i (); /// Utility method to determine if a policy's scope is compatible with ours. CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const; diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index b4ae5a0b7ad..8b26beb62f3 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -54,7 +54,7 @@ public: TAO_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Policy_Validator (void); + virtual ~TAO_Policy_Validator (); /** * Validate that the policies in the specified set 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.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index b556fa72579..bd30f17ad50 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -116,11 +116,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); -#else - auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Lifespan_Strategy *lifespan_strategy = 0; @@ -144,11 +140,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); -#else - auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Id_Assignment_Strategy *id_assignment_strategy = 0; @@ -183,11 +175,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); -#else - auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy); -#endif /* ACE_HAS_CPP11 */ TAO_Id_Hint_Strategy *id_hint_strategy = 0; if ((user_id_policy @@ -209,11 +197,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); -#else - auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy); -#endif /* ACE_HAS_CPP11 */ servant_map *sm = 0; if (unique_id_policy) @@ -247,11 +231,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<servant_map> new_servant_map (sm); -#else - auto_ptr<servant_map> new_servant_map (sm); -#endif /* ACE_HAS_CPP11 */ user_id_map *uim = 0; if (user_id_policy @@ -321,11 +301,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<user_id_map> new_user_id_map (uim); -#else - auto_ptr<user_id_map> new_user_id_map (uim); -#endif /* ACE_HAS_CPP11 */ id_uniqueness_strategy->set_active_object_map (this); lifespan_strategy->set_active_object_map (this); @@ -333,21 +309,12 @@ TAO_Active_Object_Map::TAO_Active_Object_Map ( // Finally everything is fine. Make sure to take ownership away // from the auto pointer. -#if defined (ACE_HAS_CPP11) this->id_uniqueness_strategy_ = std::move(new_id_uniqueness_strategy); this->lifespan_strategy_ = std::move(new_lifespan_strategy); this->id_assignment_strategy_ = std::move(new_id_assignment_strategy); this->id_hint_strategy_ = std::move(new_id_hint_strategy); this->servant_map_ = std::move(new_servant_map); this->user_id_map_ = std::move(new_user_id_map); -#else - this->id_uniqueness_strategy_ = new_id_uniqueness_strategy; - this->lifespan_strategy_ = new_lifespan_strategy; - this->id_assignment_strategy_ = new_id_assignment_strategy; - this->id_hint_strategy_ = new_id_hint_strategy; - this->servant_map_ = new_servant_map; - this->user_id_map_ = new_user_id_map; -#endif /* ACE_HAS_CPP11 */ #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) ACE_NEW (this->monitor_, diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index a37e2fcaee5..d2b688d7dd6 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 @@ -237,46 +237,22 @@ public: #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */ /// Id map. -#if defined (ACE_HAS_CPP11) std::unique_ptr<user_id_map> user_id_map_; -#else - auto_ptr<user_id_map> user_id_map_; -#endif /* ACE_HAS_CPP11 */ /// Servant map. -#if defined (ACE_HAS_CPP11) std::unique_ptr<servant_map> servant_map_; -#else - auto_ptr<servant_map> servant_map_; -#endif /* ACE_HAS_CPP11 */ /// Id uniqueness strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; -#else - auto_ptr<TAO_Id_Uniqueness_Strategy> id_uniqueness_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Lifespan strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; -#else - auto_ptr<TAO_Lifespan_Strategy> lifespan_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Id assignment strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; -#else - auto_ptr<TAO_Id_Assignment_Strategy> id_assignment_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Id hint strategy. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; -#else - auto_ptr<TAO_Id_Hint_Strategy> id_hint_strategy_; -#endif /* ACE_HAS_CPP11 */ /// Flag to see if we are using active maps in this active object /// map. @@ -302,7 +278,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 +437,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 +509,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 +596,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 +618,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 +639,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 +656,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 +681,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 +698,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/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 2e38ebd132e..b683ed244eb 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -50,26 +50,26 @@ namespace TAO class Active_Policy_Strategies { public: - Active_Policy_Strategies (void); + Active_Policy_Strategies (); void update (Cached_Policies &policies, TAO_Root_POA* poa); - void cleanup (void); + void cleanup (); - ThreadStrategy *thread_strategy (void) const; + ThreadStrategy *thread_strategy () const; - RequestProcessingStrategy *request_processing_strategy (void) const; + RequestProcessingStrategy *request_processing_strategy () const; - IdAssignmentStrategy *id_assignment_strategy (void) const; + IdAssignmentStrategy *id_assignment_strategy () const; - IdUniquenessStrategy *id_uniqueness_strategy (void) const; + IdUniquenessStrategy *id_uniqueness_strategy () const; - LifespanStrategy *lifespan_strategy (void) const; + LifespanStrategy *lifespan_strategy () const; - ImplicitActivationStrategy *implicit_activation_strategy (void) const; + ImplicitActivationStrategy *implicit_activation_strategy () const; - ServantRetentionStrategy *servant_retention_strategy (void) const; + ServantRetentionStrategy *servant_retention_strategy () const; private: ThreadStrategy *thread_strategy_; @@ -97,9 +97,9 @@ namespace TAO { public: Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p); - ~Active_Policy_Strategies_Cleanup_Guard (void); + ~Active_Policy_Strategies_Cleanup_Guard (); - Active_Policy_Strategies *_retn (void); + Active_Policy_Strategies *_retn (); private: Active_Policy_Strategies *ptr_; 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_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index 5642928e9d0..e0f17e71dd4 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -35,7 +35,7 @@ public: TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_POA_Default_Policy_Validator (void); + ~TAO_POA_Default_Policy_Validator (); protected: /** 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/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index c2688b5f98a..82686e026dc 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdAssignmentPolicyValue value (void); + ::PortableServer::IdAssignmentPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// 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; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdAssignmentPolicyValue value_; 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/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index d621b5b9d17..3ecbf3b3492 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdUniquenessPolicyValue value (void); + ::PortableServer::IdUniquenessPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// 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; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdUniquenessPolicyValue value_; 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/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index 861d6b4645d..9a418378fea 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ImplicitActivationPolicyValue value (void); + ::PortableServer::ImplicitActivationPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// 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; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ImplicitActivationPolicyValue value_; 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/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index 330c219efc8..9bbc42e51ea 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -40,7 +40,7 @@ class TAO_Incremental_Key_Generator { public: - TAO_Incremental_Key_Generator (void); + TAO_Incremental_Key_Generator (); int operator() (PortableServer::ObjectId &id); 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/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 0caa634b327..20b90910f9a 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: LifespanPolicy (::PortableServer::LifespanPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::LifespanPolicyValue value (void); + ::PortableServer::LifespanPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// 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; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::LifespanPolicyValue value_; 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.h b/TAO/tao/PortableServer/ORT_Adapter.h index 3e7c6b12e3c..ed4e5f5d052 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -68,11 +68,11 @@ namespace TAO /// Accessor methods to ObjectReferenceTemplate template virtual PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void) = 0; + get_adapter_template () = 0; /// Accessor methods to PortableInterceptor::ObjectReferenceFactory virtual PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (void) = 0; + get_obj_ref_factory () = 0; /// Release any references on @c ObjectReferenceTemplate @a t. virtual void release ( 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..bc65cf1fbc3 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -166,11 +166,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ No_Hint_Strategy); // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#else - auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy); -#endif /* ACE_HAS_CPP11 */ new_hint_strategy->object_adapter (this); @@ -197,11 +193,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); -#else - auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm); -#endif /* ACE_HAS_CPP11 */ transient_poa_map *tpm = 0; switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_) @@ -231,11 +223,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ break; } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<transient_poa_map> new_transient_poa_map (tpm); -#else - auto_ptr<transient_poa_map> new_transient_poa_map (tpm); -#endif /* ACE_HAS_CPP11 */ this->hint_strategy_ = new_hint_strategy.release (); this->persistent_poa_name_map_ = new_persistent_poa_name_map.release (); @@ -292,7 +280,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 +540,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 +679,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 +816,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 +923,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 +938,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 +1011,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 +1102,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 +1128,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 +1136,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 +1144,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 +1161,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_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index d4d30ebd322..62415aefec9 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -85,7 +85,7 @@ public: TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_Object_Adapter (void); + ~TAO_Object_Adapter (); int dispatch_servant (const TAO::ObjectKey &key, TAO_ServerRequest &req, @@ -113,31 +113,31 @@ public: int activate_poa (const poa_name &folded_name, TAO_Root_POA *&poa); - ACE_Lock &lock (void); + ACE_Lock &lock (); - TAO_SYNCH_MUTEX &thread_lock (void); + TAO_SYNCH_MUTEX &thread_lock (); - ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void); + ACE_Reverse_Lock<ACE_Lock> &reverse_lock (); /// Access the root poa. - TAO_Root_POA *root_poa (void) const; + TAO_Root_POA *root_poa () const; /// Access to ORB Core. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Wait for non-servant upcalls to complete. - void wait_for_non_servant_upcalls_to_complete (void); + void wait_for_non_servant_upcalls_to_complete (); /// Non-exception throwing version. - void wait_for_non_servant_upcalls_to_complete_no_throw (void); + void wait_for_non_servant_upcalls_to_complete_no_throw (); - static CORBA::ULong transient_poa_name_size (void); + static CORBA::ULong transient_poa_name_size (); /// Return the validator. - TAO_Policy_Validator &validator (void); + TAO_Policy_Validator &validator (); /// Return the set of default policies. - TAO_POA_Policy_Set &default_poa_policies (void); + TAO_POA_Policy_Set &default_poa_policies (); /// Set the servant dispatcher method. Ownership is transferred to /// this Object Adapter. Note: This should only be called @@ -149,15 +149,15 @@ public: // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (void); + virtual void open (); virtual void close (int wait_for_completion); virtual void check_close (int wait_for_completion); - virtual int priority (void) const; + virtual int priority () const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to); - virtual const char *name (void) const; - virtual CORBA::Object_ptr root (void); + virtual const char *name () const; + virtual CORBA::Object_ptr root (); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); @@ -215,7 +215,7 @@ public: { public: - virtual ~Hint_Strategy (void); + virtual ~Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa) = 0; @@ -249,7 +249,7 @@ public: Active_Hint_Strategy (CORBA::ULong map_size); - virtual ~Active_Hint_Strategy (void); + virtual ~Active_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -286,7 +286,7 @@ public: { public: - virtual ~No_Hint_Strategy (void); + virtual ~No_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -403,7 +403,7 @@ public: ACE_CString operator* () const; /// Prefix advance. - poa_name_iterator &operator++ (void); + poa_name_iterator &operator++ (); protected: @@ -426,8 +426,8 @@ public: iteratable_poa_name (const poa_name &folded_name); - iterator begin (void) const; - iterator end (void) const; + iterator begin () const; + iterator end () const; protected: @@ -442,7 +442,7 @@ public: /// Pointer to the non-servant upcall in progress. If no non-servant /// upcall is in progress, this pointer is zero. - TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress (void) const; + TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const; private: 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_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index af484d586d1..491b9833d83 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -57,7 +57,7 @@ namespace TAO Cached_Policies (); - ~Cached_Policies (void); + ~Cached_Policies (); /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set); @@ -66,30 +66,30 @@ namespace TAO * @name Accessor methods to cached values. */ //@{ - ::PortableServer::ThreadPolicyValue thread (void) const; - ::PortableServer::LifespanPolicyValue lifespan (void) const; - ::PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const; - ::PortableServer::IdAssignmentPolicyValue id_assignment (void) const; - ::PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const; - ::PortableServer::ServantRetentionPolicyValue servant_retention (void) const; - ::PortableServer::RequestProcessingPolicyValue request_processing (void) const; - PriorityModel priority_model (void) const; - CORBA::Short server_priority (void) const; + ::PortableServer::ThreadPolicyValue thread () const; + ::PortableServer::LifespanPolicyValue lifespan () const; + ::PortableServer::IdUniquenessPolicyValue id_uniqueness () const; + ::PortableServer::IdAssignmentPolicyValue id_assignment () const; + ::PortableServer::ImplicitActivationPolicyValue implicit_activation () const; + ::PortableServer::ServantRetentionPolicyValue servant_retention () const; + ::PortableServer::RequestProcessingPolicyValue request_processing () const; + PriorityModel priority_model () const; + CORBA::Short server_priority () const; /// Returns the network priority model that was set using a policy /// by the server application. /// - NetworkPriorityModel network_priority_model (void) const; + NetworkPriorityModel network_priority_model () const; /// Returns the request DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long request_diffserv_codepoint (void) const; + CORBA::Long request_diffserv_codepoint () const; /// Returns the reply DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long reply_diffserv_codepoint (void) const; + CORBA::Long reply_diffserv_codepoint () const; /// Caches the network priority model that was set using a policy /// by the server application. diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl index 4c42ccef173..efa253591b3 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.inl +++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl @@ -6,55 +6,55 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::PortableServer::ThreadPolicyValue - Cached_Policies::thread (void) const + Cached_Policies::thread () const { return this->thread_; } ACE_INLINE ::PortableServer::LifespanPolicyValue - Cached_Policies::lifespan (void) const + Cached_Policies::lifespan () const { return this->lifespan_; } ACE_INLINE ::PortableServer::IdUniquenessPolicyValue - Cached_Policies::id_uniqueness (void) const + Cached_Policies::id_uniqueness () const { return this->id_uniqueness_; } ACE_INLINE ::PortableServer::IdAssignmentPolicyValue - Cached_Policies::id_assignment (void) const + Cached_Policies::id_assignment () const { return this->id_assignment_; } ACE_INLINE ::PortableServer::ImplicitActivationPolicyValue - Cached_Policies::implicit_activation (void) const + Cached_Policies::implicit_activation () const { return this->implicit_activation_; } ACE_INLINE ::PortableServer::ServantRetentionPolicyValue - Cached_Policies::servant_retention (void) const + Cached_Policies::servant_retention () const { return this->servant_retention_; } ACE_INLINE ::PortableServer::RequestProcessingPolicyValue - Cached_Policies::request_processing (void) const + Cached_Policies::request_processing () const { return this->request_processing_; } ACE_INLINE Cached_Policies::PriorityModel - Cached_Policies::priority_model (void) const + Cached_Policies::priority_model () const { return this->priority_model_; } ACE_INLINE CORBA::Short - Cached_Policies::server_priority (void) const + Cached_Policies::server_priority () const { return this->server_priority_; } @@ -72,19 +72,19 @@ namespace TAO } ACE_INLINE Cached_Policies::NetworkPriorityModel - Cached_Policies::network_priority_model (void) const + Cached_Policies::network_priority_model () const { return this->network_priority_model_; } ACE_INLINE CORBA::Long - Cached_Policies::request_diffserv_codepoint (void) const + Cached_Policies::request_diffserv_codepoint () const { return this->request_diffserv_codepoint_; } ACE_INLINE CORBA::Long - Cached_Policies::reply_diffserv_codepoint (void) const + Cached_Policies::reply_diffserv_codepoint () const { return this->reply_diffserv_codepoint_; } 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_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index deebafdfd71..46fd6c8b9dd 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -68,41 +68,41 @@ namespace TAO /// Return pointer to the invoking POA. Raises the /// CORBA::NoContext exception. - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Return pointer to the object id through which this was invoked. * This may be necessary in cases where a <Servant> is serving under * the guise of multiple object ids. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /** * This operation returns a locally manufactured reference to the object * in the context of which it is called. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /// Set the POA implementation. void poa (::TAO_Root_POA *); /// Get the POA implemantation - ::TAO_Root_POA *poa (void) const; + ::TAO_Root_POA *poa () const; /// ORB Core for this current. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Set the object ID. void object_id (const PortableServer::ObjectId &id); /// Get the object ID. - const PortableServer::ObjectId &object_id (void) const; + const PortableServer::ObjectId &object_id () const; /// Just replace the object id smartly void replace_object_id (const PortableServer::ObjectId &system_id); @@ -111,28 +111,28 @@ namespace TAO void object_key (const TAO::ObjectKey &key); /// Get the object key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Set the servant for the current upcall. void servant (PortableServer::Servant servant); /// Get the servant for the current upcall. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; /// Set the priority for the current upcall. void priority (CORBA::Short priority); /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; /// Convenience constructor combining construction & initialization. - POA_Current_Impl (void); + POA_Current_Impl (); /// Return the previous current implementation. - POA_Current_Impl *previous (void) const; + POA_Current_Impl *previous () const; /// Teardown the current for this request. - void teardown (void); + void teardown (); /// Setup the current. void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key); 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/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 373a3b9f1a8..8cc73b11ebe 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -29,18 +29,18 @@ class TAO_Policy_Validator; class TAO_PortableServer_Export TAO_POA_Policy_Set { public: - TAO_POA_Policy_Set (void); + TAO_POA_Policy_Set (); TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs); - ~TAO_POA_Policy_Set (void); + ~TAO_POA_Policy_Set (); /// Returns the policy at the specified index. /// CORBA::Policy::_nil () is returned if the policy doesn't exist CORBA::Policy *get_policy_by_index (CORBA::ULong index); /// Get the number of policies - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -55,7 +55,7 @@ public: /// Add all of the client exposed policies to the specified list. void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies); - TAO_Policy_Set &policies (void); + TAO_Policy_Set &policies (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); 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/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 6e9d1bd5d98..e236d7c607e 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -27,7 +27,7 @@ class TAO_PortableServer_Export TAO_POA_Initializer { public: /// Used to force the initialization of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); 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/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index a93afc63ece..3efefae3963 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::RequestProcessingPolicyValue value (void); + ::PortableServer::RequestProcessingPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// 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; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::RequestProcessingPolicyValue value_; 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..901ff5ca5a9 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_; @@ -2027,11 +2027,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } // Give ownership to the auto pointer. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Acceptor_Filter> new_filter (filter); -#else - auto_ptr<TAO_Acceptor_Filter> new_filter (filter); -#endif /* ACE_HAS_CPP11 */ TAO_Stub *data = this->create_stub_object ( @@ -2045,7 +2041,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 +2229,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 +2268,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 +2290,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 +2310,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 +2370,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 +2398,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 +2421,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 +2436,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 +2479,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 +2503,7 @@ TAO_Root_POA::ORT_adapter (void) } CORBA::Policy * -TAO_Root_POA::server_protocol (void) +TAO_Root_POA::server_protocol () { return 0; } @@ -2529,7 +2525,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 +2545,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 +2563,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 +2600,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 +2624,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/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 5e1124ae33c..37521aad56c 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -176,22 +176,22 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (void); + char * the_name (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); - PortableServer::POAList *the_children (void); + PortableServer::POAList *the_children (); - PortableServer::POAManager_ptr the_POAManager (void); + PortableServer::POAManager_ptr the_POAManager (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::POAManagerFactory_ptr the_POAManagerFactory (void); + PortableServer::POAManagerFactory_ptr the_POAManagerFactory (); #endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name (void); + PortableInterceptor::AdapterName *adapter_name (); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. @@ -204,15 +204,15 @@ public: IOP::ProfileId profile_id); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (void); + PortableServer::AdapterActivator_ptr the_activator (); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - 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); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ @@ -246,10 +246,10 @@ public: CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); - CORBA::OctetSeq *id (void); + CORBA::OctetSeq *id (); /// Accessor for POA policies. - TAO_POA_Policy_Set &policies (void); + TAO_POA_Policy_Set &policies (); /// Get the set policy of the given type. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); @@ -268,11 +268,11 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Root_POA (void); + virtual ~TAO_Root_POA (); - static char name_separator (void); + static char name_separator (); - static CORBA::ULong name_separator_length (void); + static CORBA::ULong name_separator_length (); enum { @@ -281,34 +281,34 @@ public: static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE]; - const TAO_Object_Adapter::poa_name &folded_name (void) const; + const TAO_Object_Adapter::poa_name &folded_name () const; - const TAO_Object_Adapter::poa_name &system_name (void) const; + const TAO_Object_Adapter::poa_name &system_name () const; static void check_for_valid_wait_for_completions ( const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion); /// ORB Core for POA. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// obtain a reference to the cached_profiles - TAO::Portable_Server::Cached_Policies& cached_policies (void); + TAO::Portable_Server::Cached_Policies& cached_policies (); /// obtain a handle to the network priority hooks - TAO_Network_Priority_Hook* network_priority_hook (void); + TAO_Network_Priority_Hook* network_priority_hook (); - TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const; + TAO::Portable_Server::Cached_Policies::PriorityModel priority_model () const; - CORBA::Boolean cleanup_in_progress (void); + CORBA::Boolean cleanup_in_progress (); /// Calls protected static method used when POACurrent is not appropriate. static int parse_ir_object_key (const TAO::ObjectKey &object_key, PortableServer::ObjectId &user_id); - TAO_Object_Adapter &object_adapter (void); + TAO_Object_Adapter &object_adapter (); - ACE_Lock &lock (void); + ACE_Lock &lock (); /// Create the correct stub, properly initialized with the /// attributes and policies attached to the current POA. @@ -321,33 +321,33 @@ public: * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE * and NON_EXISTENT states. */ - PortableInterceptor::AdapterState get_adapter_state (void); + PortableInterceptor::AdapterState get_adapter_state (); - virtual void *thread_pool (void) const; + virtual void *thread_pool () const; - virtual CORBA::Policy *server_protocol (void); + virtual CORBA::Policy *server_protocol (); - CORBA::ULong outstanding_requests (void) const; + CORBA::ULong outstanding_requests () const; - const ACE_CString &name (void) const; + const ACE_CString &name () const; - CORBA::Boolean waiting_destruction (void) const; + CORBA::Boolean waiting_destruction () const; static void ort_adapter_factory_name (const char *name); - static const char *ort_adapter_factory_name (void); + static const char *ort_adapter_factory_name (); /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. static void imr_client_adapter_name (const char *name); /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. - static const char *imr_client_adapter_name (void); + static const char *imr_client_adapter_name (); - CORBA::Object_ptr invoke_key_to_object (void); + CORBA::Object_ptr invoke_key_to_object (); - CORBA::Boolean system_id (void); + CORBA::Boolean system_id (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; /// Return the POA Manager related to this POA TAO_POA_Manager &tao_poa_manager (); @@ -373,9 +373,9 @@ public: CORBA::Boolean servant_has_remaining_activations ( PortableServer::Servant servant); - bool allow_implicit_activation (void) const; + bool allow_implicit_activation () const; - bool allow_multiple_activations (void) const; + bool allow_multiple_activations () const; int is_servant_active ( PortableServer::Servant servant, @@ -383,11 +383,11 @@ public: void deactivate_object_i (const PortableServer::ObjectId &oid); - CORBA::Boolean is_persistent (void) const; + CORBA::Boolean is_persistent () const; - CORBA::Short server_priority (void) const; + CORBA::Short server_priority () const; - bool has_system_id (void) const; + bool has_system_id () const; PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id); @@ -436,18 +436,18 @@ public: PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant); - TAO_SYNCH_CONDITION &servant_deactivation_condition (void); + TAO_SYNCH_CONDITION &servant_deactivation_condition (); int is_poa_generated_id (const PortableServer::ObjectId &id); /// Check the state of this POA - void check_state (void); + void check_state (); int delete_child (const String &child); PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// These hooks are needed by the CSD strategy to override /// and no-ops by default. @@ -469,9 +469,9 @@ public: protected: #if (TAO_HAS_MINIMUM_POA == 0) - int enter (void); + int enter (); - int exit (void); + int exit (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if ! defined (CORBA_E_MICRO) @@ -501,14 +501,14 @@ protected: void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); - void complete_destruction_i (void); + void complete_destruction_i (); - PortableServer::POAList *the_children_i (void); + PortableServer::POAList *the_children_i (); /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name_i (void); + PortableInterceptor::AdapterName *adapter_name_i (); /// Method to notify the IOR Interceptors when there is a state /// changed not related to POAManager. @@ -546,7 +546,7 @@ protected: TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry); - PortableServer::Servant get_servant_i (void); + PortableServer::Servant get_servant_i (); protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, @@ -554,7 +554,7 @@ protected: CORBA::Short priority, bool &wait_occurred_restart_call); - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects); @@ -585,7 +585,7 @@ protected: * IORInterceptor::components_established() once the former is * completed. */ - void establish_components (void); + void establish_components (); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. @@ -608,13 +608,13 @@ protected: protected: /// Accessor methods to ObjectReferenceTemplate PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void); + get_adapter_template (); /// Accessor methods to ObjectReferenceTemplate, non locked version - PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void); + PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (); /// Accessor methods to PortableInterceptor::ObjectReferenceFactory - PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void); + PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (); /// Set the object reference factory void set_obj_ref_factory ( @@ -640,39 +640,39 @@ protected: /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (void); + TAO::ORT_Adapter *ORT_adapter (); /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one but assumes the POA lock is already hold - TAO::ORT_Adapter *ORT_adapter_i (void); + TAO::ORT_Adapter *ORT_adapter_i (); - CORBA::Boolean persistent (void); + CORBA::Boolean persistent (); - static char persistent_key_char (void); + static char persistent_key_char (); - static char transient_key_char (void); + static char transient_key_char (); - static CORBA::ULong persistent_key_type_length (void); + static CORBA::ULong persistent_key_type_length (); - static char system_id_key_char (void); + static char system_id_key_char (); - static char user_id_key_char (void); + static char user_id_key_char (); - static CORBA::ULong system_id_key_type_length (void); + static CORBA::ULong system_id_key_type_length (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); - static char root_key_char (void); + static char root_key_char (); - static char non_root_key_char (void); + static char non_root_key_char (); - static CORBA::ULong root_key_type_length (void); + static CORBA::ULong root_key_type_length (); - CORBA::ULong increment_outstanding_requests (void); + CORBA::ULong increment_outstanding_requests (); - CORBA::ULong decrement_outstanding_requests (void); + CORBA::ULong decrement_outstanding_requests (); String name_; @@ -797,10 +797,10 @@ class TAO_PortableServer_Export TAO_POA_Static_Resources public: /// Return the singleton instance. - static TAO_POA_Static_Resources* instance (void); + static TAO_POA_Static_Resources* instance (); /// Cleanup the static singleton - static void fini (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE; + static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE; public: @@ -823,7 +823,7 @@ public: ACE_CString imr_client_adapter_name_; private: /// Constructor. - TAO_POA_Static_Resources (void); + TAO_POA_Static_Resources (); private: /// The singleton instance. 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/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index d62c550b224..b39152dad1c 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ServantRetentionPolicyValue value (void); + ::PortableServer::ServantRetentionPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ServantRetentionPolicyValue value_; 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..8d2e46f5336 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/PortableServer/Servant_Location.h" -#include "ace/Atomic_Op.h" +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -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); @@ -123,7 +123,7 @@ namespace TAO protected: TAO_Root_POA *poa_; - ACE_Atomic_Op<TAO_SYNCH_MUTEX,ACE_UINT32> sys_id_count_; + std::atomic<uint32_t> sys_id_count_; }; } } 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..a475bdb69ac 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); @@ -139,11 +139,7 @@ namespace TAO TAO_Active_Object_Map * get_active_object_map() const; private: -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Active_Object_Map> active_object_map_; -#else - auto_ptr<TAO_Active_Object_Map> active_object_map_; -#endif /* ACE_HAS_CPP11 */ CORBA::ULong waiting_servant_deactivation_; }; } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 9bd8738a623..531be3b10f4 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,13 +662,9 @@ 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_; -#else - return this->ref_count_.value (); -#endif /* ACE_HAS_CPP11 */ } void diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 1cc77f3bed1..9b15c1c26bb 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -22,11 +22,7 @@ #include "tao/PortableServer/PS_ForwardC.h" #include "tao/PortableServer/Servant_var.h" #include "tao/Abstract_Servant_Base.h" -#if defined (ACE_HAS_CPP11) #include <atomic> -#else -#include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -69,7 +65,7 @@ public: typedef CORBA::Object_var _stub_var_type; /// Destructor. - virtual ~TAO_ServantBase (void); + virtual ~TAO_ServantBase (); static void _is_a_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, @@ -108,29 +104,29 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id); #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Query the Interface Repository for the interface definition. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Default _get_component: always returns CORBA::Object::_nil(). - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #endif /* TAO_HAS_MINIMUM_CORBA */ /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void); + virtual TAO_Stub *_create_stub (); /** * Dispatches a request to the object: find the operation, cast the @@ -155,26 +151,26 @@ public: const size_t length = 0); /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; //@{ /** * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void); + virtual void _add_ref (); /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void); + virtual void _remove_ref (); /** * Returns the current reference count value. */ - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} virtual void _collocated_dispatch (::CORBA::Object_ptr obj, @@ -208,11 +204,7 @@ protected: protected: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> ref_count_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> ref_count_; -#endif /* ACE_HAS_CPP11 */ /// The operation table for this servant. It is initialized by the /// most derived class. 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/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index a7f5f2ae320..319a6074389 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -70,7 +70,7 @@ namespace TAO { public: /// Constructor. - Pre_Invoke_State (void); + Pre_Invoke_State (); enum State { @@ -93,7 +93,7 @@ namespace TAO explicit Servant_Upcall (TAO_ORB_Core *orb_core); /// Destructor. - ~Servant_Upcall (void); + ~Servant_Upcall (); /// Locate POA and servant. int prepare_for_upcall (const TAO::ObjectKey &key, @@ -110,41 +110,41 @@ namespace TAO void pre_invoke_remote_request (TAO_ServerRequest &req); /// Run pre_invoke for a collocated request. - void pre_invoke_collocated_request (void); + void pre_invoke_collocated_request (); /// Run post_invoke for a request. - void post_invoke (void); + void post_invoke (); /// Locate POA. ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key); /// POA accessor. - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; /// Object Adapter accessor. - TAO_Object_Adapter &object_adapter (void) const; + TAO_Object_Adapter &object_adapter () const; /// System ID accessor. - const PortableServer::ObjectId &id (void) const; + const PortableServer::ObjectId &id () const; /// User ID accessors. This is the same value returned by /// PortableServer::Current::get_object_id(). void user_id (const PortableServer::ObjectId *); - const PortableServer::ObjectId &user_id (void) const; + const PortableServer::ObjectId &user_id () const; /// Servant accessor. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; #if (TAO_HAS_MINIMUM_POA == 0) /// Get the Servant Locator's cookie - void* locator_cookie (void) const; + void* locator_cookie () const; /// Set the Servant Locator's cookie void locator_cookie (void* cookie); /// Get the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *); @@ -155,10 +155,10 @@ namespace TAO void active_object_map_entry (TAO_Active_Object_Map_Entry *entry); /// Get the active_object_map_entry. - TAO_Active_Object_Map_Entry *active_object_map_entry (void) const; + TAO_Active_Object_Map_Entry *active_object_map_entry () const; /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; enum State { @@ -170,24 +170,24 @@ namespace TAO }; /// Get the state. - State state (void) const; + State state () const; /// Set the state. void state (State); /// Increment the refcount - void increment_servant_refcount (void); + void increment_servant_refcount (); protected: - void post_invoke_servant_cleanup (void); - void single_threaded_poa_setup (void); - void single_threaded_poa_cleanup (void); - void servant_cleanup (void); - void poa_cleanup (void); + void post_invoke_servant_cleanup (); + void single_threaded_poa_setup (); + void single_threaded_poa_cleanup (); + void servant_cleanup (); + void poa_cleanup (); /// Clean-up / reset state of this Servant_Upcall object. - void upcall_cleanup (void); + void upcall_cleanup (); protected: diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 1c146dc0eb9..24f66407de2 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -55,7 +55,7 @@ namespace PortableServer /** * This destructor doesn't throw exceptions. */ - ~Servant_var (void); + ~Servant_var (); /// Assignment operator. Assumes ownership of @c p. Servant_var<T> & operator= (T * p); 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/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index 9de46c892bd..e48bee84d72 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ThreadPolicy (::PortableServer::ThreadPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ThreadPolicyValue value (void); + ::PortableServer::ThreadPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ThreadPolicyValue value_; 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/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 6184aa987dd..2b32a23d33e 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -41,10 +41,10 @@ namespace TAO { public: /// Destructor. - virtual ~Upcall_Command (void); + virtual ~Upcall_Command (); /// Execute the upcall. - virtual void execute (void) = 0; + virtual void execute () = 0; }; } // End namespace TAO 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/Principal.h b/TAO/tao/Principal.h index e961e8b419a..756aac6a9a6 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -25,11 +25,7 @@ #include "tao/OctetSeqC.h" #include "tao/Pseudo_VarOut_T.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -94,11 +90,7 @@ namespace CORBA private: /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index c1d2f4ed21a..8bb9ccdcdcc 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -22,11 +22,7 @@ #include "tao/GIOP_Message_Version.h" #include "tao/Refcounted_ObjectKey.h" #include "tao/Service_Callbacks.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Lock; @@ -66,32 +62,32 @@ public: */ //@{ /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Return a pointer to this profile's version. This object /// maintains ownership. - const TAO_GIOP_Message_Version &version (void) const; + const TAO_GIOP_Message_Version &version () const; /// Get a pointer to the TAO_ORB_Core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Increase the reference count by one on this object. - unsigned long _incr_refcnt (void); + unsigned long _incr_refcnt (); /// Decrement the object's reference count. When this count goes to /// 0 this object will be deleted. - unsigned long _decr_refcnt (void); + unsigned long _decr_refcnt (); /// Keep a pointer to the forwarded profile void forward_to (TAO_MProfile *mprofiles); /// MProfile accessor - TAO_MProfile* forward_to (void); + TAO_MProfile* forward_to (); /// Access the tagged components, notice that they they could be /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0) - const TAO_Tagged_Components& tagged_components (void) const; - TAO_Tagged_Components& tagged_components (void); + const TAO_Tagged_Components& tagged_components () const; + TAO_Tagged_Components& tagged_components (); /// Add the given tagged component to the profile. void add_tagged_component (const IOP::TaggedComponent &component); @@ -100,14 +96,14 @@ public: * Return the current addressing mode for this profile. * In almost all cases, this is TAO_Target_Specification::Key_Addr. */ - CORBA::Short addressing_mode (void) const; + CORBA::Short addressing_mode () const; /// @deprecated Return a reference to the Object Key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Obtain the object key, return 0 if the profile cannot be parsed. /// The memory is owned by the caller! - TAO::ObjectKey *_key (void) const; + TAO::ObjectKey *_key () const; //@} /** @@ -130,7 +126,7 @@ public: * return the reference to that. This method is necessary for GIOP * 1.2. */ - IOP::TaggedProfile *create_tagged_profile (void); + IOP::TaggedProfile *create_tagged_profile (); /// This method sets the client exposed policies, i.e., the ones /// propagated in the IOR, for this profile. @@ -140,10 +136,10 @@ public: virtual void get_policies (CORBA::PolicyList &policy_list); /// Returns true if this profile can specify multicast endpoints. - virtual int supports_multicast (void) const; + virtual int supports_multicast () const; /// Returns true if this profile supports non blocking oneways - virtual bool supports_non_blocking_oneways (void) const; + virtual bool supports_non_blocking_oneways () const; /** * Set the addressing mode if a remote servant replies with @@ -175,7 +171,7 @@ public: virtual void addressing_mode (CORBA::Short addr_mode); /// The object key delimiter. - virtual char object_key_delimiter (void) const = 0; + virtual char object_key_delimiter () const = 0; /// Initialize this object using the given input string. /// Supports URL style of object references @@ -184,14 +180,14 @@ public: /// Return a string representation for this profile. Client must /// deallocate memory. Only one endpoint is included into the /// string. - virtual char* to_string (void) const = 0; + virtual char* to_string () const = 0; /** * Encodes this profile's endpoints into a tagged component. * This is done only if RTCORBA is enabled, since currently this is * the only case when we have more than one endpoint per profile. */ - virtual int encode_endpoints (void) = 0; + virtual int encode_endpoints () = 0; /** * Encodes this profile's endpoints into protocol specific tagged @@ -199,14 +195,14 @@ public: * endpoints on profiles. The only known implementation is IIOP, using * TAG_ALTERNATE_IIOP_ADDRESS components. */ - virtual int encode_alternate_endpoints (void); + virtual int encode_alternate_endpoints (); /** * Return a pointer to this profile's endpoint. If the profile * contains more than one endpoint, i.e., a list, the method returns * the head of the list. */ - virtual TAO_Endpoint *endpoint (void) = 0; + virtual TAO_Endpoint *endpoint () = 0; /** @@ -219,17 +215,17 @@ public: * to facilitate the Endpoint Policy's filtering function. * The default implementation of base_endpoint simply returns endpoint. */ - virtual TAO_Endpoint *base_endpoint (void); + virtual TAO_Endpoint *base_endpoint (); /// Return how many endpoints this profile contains. - virtual CORBA::ULong endpoint_count (void) const = 0; + virtual CORBA::ULong endpoint_count () const = 0; /** * Return the first endpoint in the list that matches some filtering * constraint, such as IPv6 compatibility for IIOP endpoints. This * method is implemented in terms of TAO_Endpoint::next_filtered(). */ - TAO_Endpoint *first_filtered_endpoint (void); + TAO_Endpoint *first_filtered_endpoint (); /// Return the next filtered endpoint in the list after the one /// passed in. This method is implemented in terms of @@ -275,7 +271,7 @@ public: protected: /// If you have a virtual method you need a virtual dtor. - virtual ~TAO_Profile (void); + virtual ~TAO_Profile (); /** * @name Protected template methods. @@ -294,7 +290,7 @@ protected: * version of TAO or some other ORB. This is not an error, and we * must proceed. Return 0 on success and -1 on failure. */ - virtual int decode_endpoints (void) = 0; + virtual int decode_endpoints () = 0; /// Protocol specific implementation of parse_string () virtual void parse_string_i (const char *string) = 0; @@ -331,15 +327,15 @@ protected: private: /// This object keeps ownership of this object - TAO_MProfile *forward_to_i (void); + TAO_MProfile *forward_to_i (); /// Verify that the current ORB's configuration supports tagged /// components in IORs. - void verify_orb_configuration (void); + void verify_orb_configuration (); /// Verify that the given profile supports tagged components, /// i.e. is not a GIOP 1.0 profile. - void verify_profile_version (void); + void verify_profile_version (); // Profiles should not be copied or assigned! TAO_Profile (const TAO_Profile&); @@ -379,11 +375,7 @@ private: TAO_MProfile* forward_to_; /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) - std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ + std::atomic<uint32_t> refcount_; /// A lock that protects creation of the tagged profile TAO_SYNCH_MUTEX tagged_profile_lock_; @@ -425,19 +417,19 @@ public: // = The TAO_Profile methods look above virtual void parse_string (const char *string); - virtual char object_key_delimiter (void) const; - virtual char* to_string (void) const; + virtual char object_key_delimiter () const; + virtual char* to_string () const; virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; - virtual int encode_endpoints (void); + virtual int encode_endpoints (); - virtual TAO::ObjectKey *_key (void) const; - virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual TAO::ObjectKey *_key () const; + virtual TAO_Endpoint *endpoint (); + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); virtual int decode_profile (TAO_InputCDR &cdr); - virtual int decode_endpoints (void); + virtual int decode_endpoints (); protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile); 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/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 138cb64df7e..92d2bc07ca1 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -53,16 +53,16 @@ template <typename T> class TAO_Pseudo_Var_T : private TAO_Base_var { public: - TAO_Pseudo_Var_T (void); + TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T (typename T::_ptr_type); TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &); - ~TAO_Pseudo_Var_T (void); + ~TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T<T> & operator= (typename T::_ptr_type); TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &); - typename T::_ptr_type operator-> (void) const; + typename T::_ptr_type operator-> () const; operator typename T::_ptr_type const & () const; operator typename T::_ptr_type & (); @@ -72,13 +72,13 @@ public: typedef typename T::_ptr_type & _out_type; typedef typename T::_ptr_type _retn_type; - _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. - _retn_type ptr (void) const; + _retn_type ptr () const; private: // Unimplemented - prevents widening assignment. @@ -109,8 +109,8 @@ public: TAO_Pseudo_Out_T<T> & operator= (typename T::_ptr_type); operator typename T::_ptr_type & (); - typename T::_ptr_type & ptr (void); - typename T::_ptr_type operator-> (void); + typename T::_ptr_type & ptr (); + typename T::_ptr_type operator-> (); private: typename T::_ptr_type & ptr_; 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/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 622de35c11e..4648487aab2 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -890,11 +890,7 @@ RTCORBA::ThreadpoolId TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool) { // Make sure of safe deletion in case of errors. -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); -#else - auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool); -#endif /* ACE_HAS_CPP11 */ // Open the pool. thread_pool->open (); diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 53ea0dd8886..c8735b4bb16 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter; +std::atomic<long> TAO_RTScheduler_Current::guid_counter; u_long TAO_DTId_Hash::operator () (const IdType &id) const diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index f941512b9de..4edf9c5ceb9 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -78,7 +78,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current public ::CORBA::LocalObject { public: - static ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter; + static std::atomic<long> guid_counter; TAO_RTScheduler_Current (void); virtual ~TAO_RTScheduler_Current (void); diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 985e219d14a..e27c5b49172 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -53,7 +53,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) TAOLIB_DEBUG ((LM_DEBUG, "The Guid is %d %d\n", id, - TAO_RTScheduler_Current::guid_counter.value_i ())); + TAO_RTScheduler_Current::guid_counter.load ())); // Create new DT. RTScheduling::DistributableThread_var dt = diff --git a/TAO/tao/RTScheduling/Request_Interceptor.h b/TAO/tao/RTScheduling/Request_Interceptor.h index 48bfe663054..879d73a7876 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.h +++ b/TAO/tao/RTScheduling/Request_Interceptor.h @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -extern ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; +extern std::atomic<long> server_guid_counter; class TAO_RTScheduler_Export Client_Interceptor: public PortableInterceptor::ClientRequestInterceptor, diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index 96142a512d6..29eb3ab6030 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -42,20 +42,20 @@ namespace TAO Refcounted_ObjectKey (const ObjectKey &ref); /// Accessor for the underlying ObjectKey. - const ObjectKey &object_key (void) const; + const ObjectKey &object_key () const; protected: friend class ObjectKey_Table; /// Protected destructor - ~Refcounted_ObjectKey (void); + ~Refcounted_ObjectKey (); /// Methods for incrementing refcount. - void incr_refcount (void); + void incr_refcount (); /// Methods for decrementing refcount. Return the refcount, used by the /// ObjectKey table. - CORBA::ULong decr_refcount (void); + CORBA::ULong decr_refcount (); private: /// The object key diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 230b4c623e1..93c08198894 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -36,8 +36,8 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd) { if (rd != nullptr) { - long const tmp = --rd->refcount_; - if (tmp <= 0) + uint32_t const tmp = --rd->refcount_; + if (tmp == 0) { if (rd->allocator_) { diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 949bf0dfccd..0b6c39a311d 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*); @@ -103,7 +103,7 @@ protected: private: /// Support for intrusive reference counting - ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> refcount_; + std::atomic<uint32_t> refcount_; /// Allocator that was used to allocate this reply dispatcher. In case of /// zero we come from the heap. 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/RequestInterceptor_Adapter.h b/TAO/tao/RequestInterceptor_Adapter.h index 8ea064cf865..3a85af71c63 100644 --- a/TAO/tao/RequestInterceptor_Adapter.h +++ b/TAO/tao/RequestInterceptor_Adapter.h @@ -35,9 +35,9 @@ namespace TAO class TAO_Export RequestInterceptor_Adapter { public: - virtual ~RequestInterceptor_Adapter (void); + virtual ~RequestInterceptor_Adapter (); - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; virtual void popTSC (TAO_ORB_Core *orb_core_) = 0; virtual void pushTSC (TAO_ORB_Core *orb_core_) = 0; diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 40c96ebbdd8..ab672ad3aec 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -58,23 +58,23 @@ public: /// Destructor that deallocates the factory object if the /// Protocol_Item retains ownership. - ~TAO_Protocol_Item (void); + ~TAO_Protocol_Item (); /// Return a reference to the character representation of the protocol /// factories name. - const ACE_CString &protocol_name (void); + const ACE_CString &protocol_name (); /// Return a pointer to the protocol factory. - TAO_Protocol_Factory *factory (void); + TAO_Protocol_Factory *factory (); /// Set the factory pointer's value. void factory (TAO_Protocol_Factory *factory, int owner = 0); private: - - // Disallow copying and assignment. - TAO_Protocol_Item (const TAO_Protocol_Item&); - void operator= (const TAO_Protocol_Item&); + TAO_Protocol_Item (const TAO_Protocol_Item&) = delete; + void operator= (const TAO_Protocol_Item&) = delete; + TAO_Protocol_Item (TAO_Protocol_Item&&) = delete; + void operator= (TAO_Protocol_Item&&) = delete; private: /// Protocol factory name. @@ -133,52 +133,52 @@ public: TAO_LAZY }; - TAO_Resource_Factory (void); - virtual ~TAO_Resource_Factory (void); + TAO_Resource_Factory (); + virtual ~TAO_Resource_Factory (); // = Resource Retrieval /// @@ Backwards compatibility, return 1 if the ORB core should use /// Locked_Data_Blocks - virtual int use_locked_data_blocks (void) const; + virtual int use_locked_data_blocks () const; /// Return an ACE_Reactor to be utilized. - virtual ACE_Reactor *get_reactor (void); + virtual ACE_Reactor *get_reactor (); /// Reclaim reactor resources (e.g. deallocate, etc). virtual void reclaim_reactor (ACE_Reactor *reactor); /// Return a reference to the acceptor registry. - virtual TAO_Acceptor_Registry *get_acceptor_registry (void); + virtual TAO_Acceptor_Registry *get_acceptor_registry (); /// Return a connector to be utilized. - virtual TAO_Connector_Registry *get_connector_registry (void); + virtual TAO_Connector_Registry *get_connector_registry (); /// Return the Allocator's memory pool type virtual void use_local_memory_pool (bool); /// @name Access the input CDR allocators. //@{ - virtual ACE_Allocator* input_cdr_dblock_allocator (void); - virtual ACE_Allocator* input_cdr_buffer_allocator (void); - virtual ACE_Allocator* input_cdr_msgblock_allocator (void); + virtual ACE_Allocator* input_cdr_dblock_allocator (); + virtual ACE_Allocator* input_cdr_buffer_allocator (); + virtual ACE_Allocator* input_cdr_msgblock_allocator (); //@} // Return 1 when the input CDR allocator uses a lock else 0. - virtual int input_cdr_allocator_type_locked (void); + virtual int input_cdr_allocator_type_locked (); /// @name Access the output CDR allocators. //@{ - virtual ACE_Allocator* output_cdr_dblock_allocator (void); - virtual ACE_Allocator* output_cdr_buffer_allocator (void); - virtual ACE_Allocator* output_cdr_msgblock_allocator (void); + virtual ACE_Allocator* output_cdr_dblock_allocator (); + virtual ACE_Allocator* output_cdr_buffer_allocator (); + virtual ACE_Allocator* output_cdr_msgblock_allocator (); //@} /// Access the AMH response handler allocator - virtual ACE_Allocator* amh_response_handler_allocator (void); + virtual ACE_Allocator* amh_response_handler_allocator (); /// Access the AMI response handler allocator - virtual ACE_Allocator* ami_response_handler_allocator (void); + virtual ACE_Allocator* ami_response_handler_allocator (); /** * The protocol factory list is implemented in this class since @@ -186,7 +186,7 @@ public: * b) it is initialized at start up and then not altered. * Returns a container holding the list of loaded protocols. */ - virtual TAO_ProtocolFactorySet *get_protocol_factories (void); + virtual TAO_ProtocolFactorySet *get_protocol_factories (); /** * This method will loop through the protocol list and @@ -196,43 +196,43 @@ public: * that only one thread will call this method at ORB initialization. * NON-THREAD-SAFE */ - virtual int init_protocol_factories (void); + virtual int init_protocol_factories (); /// Gets the codeset manager. - virtual TAO_Codeset_Manager* codeset_manager (void); + virtual TAO_Codeset_Manager* codeset_manager (); /// This denotes the maximum number of connections that can be cached. - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// This denotes the amount of entries to remove from the connection /// cache. - virtual int purge_percentage (void) const; + virtual int purge_percentage () const; /// Return the number of muxed connections that are allowed for a /// remote endpoint - virtual int max_muxed_connections (void) const; + virtual int max_muxed_connections () const; virtual int get_parser_names (char **&names, int &number_of_names); /// Creates the lock for the lock needed in the Cache Map /// @deprecated - virtual ACE_Lock *create_cached_connection_lock (void); + virtual ACE_Lock *create_cached_connection_lock (); /// Should the transport cache have a lock or not? Return 1 if the /// transport cache needs to be locked else return 0 - virtual int locked_transport_cache (void); + virtual int locked_transport_cache (); /// Creates the flushing strategy. The new instance is owned by the /// caller. - virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0; + virtual TAO_Flushing_Strategy *create_flushing_strategy () = 0; /// Creates the connection purging strategy. - virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void) = 0; + virtual TAO_Connection_Purging_Strategy *create_purging_strategy () = 0; /// Creates the leader followers strategy. The new instance is owned by the /// caller. - virtual TAO_LF_Strategy *create_lf_strategy (void) = 0; + virtual TAO_LF_Strategy *create_lf_strategy () = 0; /// Outgoing fragment creation strategy. virtual TAO_GIOP_Fragmentation_Strategy* @@ -243,12 +243,12 @@ public: /// this function should be called on the previously used (default) /// factory. This should result in proper error reporting if the /// user attempts to set options on an unused factory. - virtual void disable_factory (void) = 0; + virtual void disable_factory () = 0; /// Return the resource usage strategy. virtual TAO_Resource_Factory::Resource_Usage - resource_usage_strategy (void) const = 0; + resource_usage_strategy () const = 0; /// Return the value of the strategy that indicates whether /// the ORB should wait for the replies during shutdown or drop @@ -261,7 +261,7 @@ protected: * advanced_resource.cpp can call the one in default_resource.cpp * without calling unnecessary functions. */ - virtual int load_default_protocols (void); + virtual int load_default_protocols (); }; diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 693b5508b24..e677d4e505e 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -42,10 +42,10 @@ public: TAO_Seq_Out_T &operator= (T *); operator T *& (); - T * operator-> (void); + T * operator-> (); T_elem operator[] (CORBA::ULong index); - T *& ptr (void); + T *& ptr (); private: T *& ptr_; diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 45cb0491254..7596db9730a 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -34,14 +34,14 @@ class TAO_Seq_Var_Base_T public: typedef typename T::subscript_type T_elem; - TAO_Seq_Var_Base_T (void); + TAO_Seq_Var_Base_T (); TAO_Seq_Var_Base_T (T *); TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> &); - ~TAO_Seq_Var_Base_T (void); + ~TAO_Seq_Var_Base_T (); - T *operator-> (void); - const T *operator-> (void) const; + T *operator-> (); + const T *operator-> () const; operator const T & () const; operator T & (); @@ -53,13 +53,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. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; @@ -78,7 +78,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_FixedSeq_Var_T (void); + TAO_FixedSeq_Var_T (); TAO_FixedSeq_Var_T (T *); TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> &); @@ -108,7 +108,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_VarSeq_Var_T (void); + TAO_VarSeq_Var_T (); TAO_VarSeq_Var_T (T *); TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> &); diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 9c2c354d595..d4d36949cad 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -66,7 +66,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ServerRequestInterceptor_Adapter (void); + virtual ~ServerRequestInterceptor_Adapter (); /** * @name PortableInterceptor Server Side Interception Points @@ -153,7 +153,7 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; + virtual TAO::PICurrent_Impl *allocate_pi_current () = 0; virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0; diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h index 9f0337c6e67..945ef4c9163 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h @@ -38,9 +38,9 @@ class TAO_Export TAO_ServerRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (); - virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0; + virtual TAO::ServerRequestInterceptor_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index c168c92acea..88a4491ffa6 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -49,7 +49,7 @@ public: struct Active_Object_Map_Creation_Parameters { /// Constructor. - Active_Object_Map_Creation_Parameters (void); + Active_Object_Map_Creation_Parameters (); /// Default size of object lookup table. CORBA::ULong active_object_map_size_; @@ -85,10 +85,10 @@ public: }; /// Constructor. - TAO_Server_Strategy_Factory (void); + TAO_Server_Strategy_Factory (); /// Destructor. - virtual ~TAO_Server_Strategy_Factory(void); + virtual ~TAO_Server_Strategy_Factory(); /** * Call <open> on various strategies. This is not performed in @@ -99,7 +99,7 @@ public: virtual int open (TAO_ORB_Core* orb_core) = 0; /// Are server connections active (i.e. run in their own thread) - virtual int activate_server_connections (void) = 0; + virtual int activate_server_connections () = 0; /** * Obtain the timeout value used by the thread-per-connection server @@ -111,13 +111,13 @@ public: virtual int thread_per_connection_timeout (ACE_Time_Value &timeout) = 0; /// The thread activation parameters - virtual int server_connection_thread_flags (void) = 0; - virtual int server_connection_thread_count (void) = 0; + virtual int server_connection_thread_flags () = 0; + virtual int server_connection_thread_count () = 0; /// Return the active object map creation parameters. virtual const Active_Object_Map_Creation_Parameters & - active_object_map_creation_parameters (void) const; + active_object_map_creation_parameters () const; protected: /// Active object map creation parameters. diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index 1fd5c281e78..5eddb99847f 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -67,7 +67,7 @@ public: }; /// Dtor - virtual ~TAO_Service_Callbacks (void); + virtual ~TAO_Service_Callbacks (); /// Select the profile from MProfile as the needs of the services /// may be. Return the profile in @a pfile diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h index 6232de26ba3..fc1668c4125 100644 --- a/TAO/tao/Service_Context.h +++ b/TAO/tao/Service_Context.h @@ -64,7 +64,7 @@ public: friend class TAO::CSD::FW_Server_Request_Wrapper; /// Constructor - TAO_Service_Context (void); + TAO_Service_Context (); /// = Generic components @@ -118,12 +118,12 @@ public: int decode (TAO_InputCDR& cdr); /// Return the underlying service context list - IOP::ServiceContextList &service_info (void); + IOP::ServiceContextList &service_info (); /// @note This method is only for backward comptiblity. We /// need to get this removed once RT folks have their service /// addition info done through this interface - const IOP::ServiceContextList &service_info (void) const; + const IOP::ServiceContextList &service_info () const; private: /// Helper methods to implement set_context() diff --git a/TAO/tao/Service_Context_Handler_Registry.h b/TAO/tao/Service_Context_Handler_Registry.h index 90295c80123..86277a13fd6 100644 --- a/TAO/tao/Service_Context_Handler_Registry.h +++ b/TAO/tao/Service_Context_Handler_Registry.h @@ -35,7 +35,7 @@ class TAO_Export TAO_Service_Context_Registry public: /// Destructor - ~TAO_Service_Context_Registry (void); + ~TAO_Service_Context_Registry (); /** * Bind a new entry in the registry diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 03f6ac34ec2..47b72cabd25 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -43,7 +43,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; protected: S const & x_; @@ -63,9 +63,9 @@ namespace TAO { public: In_Special_Basic_Clonable_Argument_T (S const &); - virtual ~In_Special_Basic_Clonable_Argument_T (void); + virtual ~In_Special_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -90,7 +90,7 @@ namespace TAO #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,7 +114,7 @@ namespace TAO #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_; @@ -132,16 +132,16 @@ namespace TAO class Ret_Special_Basic_Argument_T : public RetArgument { public: - Ret_Special_Basic_Argument_T (void); + Ret_Special_Basic_Argument_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); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index d9837cfdee1..d0a2d3c9f1d 100644 --- a/TAO/tao/String_Const_Sequence_Element_T.h +++ b/TAO/tao/String_Const_Sequence_Element_T.h @@ -51,7 +51,7 @@ public: return *this->element_; } - inline const character_type *in (void) const + inline const character_type *in () const { return *this->element_; } diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 2a596187c52..9a0905bff57 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -39,7 +39,7 @@ public: typedef TAO::details::string_traits_base <charT> s_traits; /// Default CTOR will initialize the underlying ptr_ to empty string. - inline String_Manager_T (void) : ptr_ (s_traits::default_initializer()) + inline String_Manager_T () : ptr_ (s_traits::default_initializer()) { } @@ -56,7 +56,7 @@ public: } /// Destructor - inline ~String_Manager_T (void) { + inline ~String_Manager_T () { s_traits::release (this->ptr_); } @@ -101,24 +101,24 @@ public: } /// For in parameter. - inline const character_type *in (void) const { + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) { + inline character_type *&inout () { return this->ptr_; } /// for out parameter. - inline character_type *&out (void) { + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; return this->ptr_; } /// For string of return type. - inline character_type *_retn (void) { + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; return temp; diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index b408e1c1685..1905bba57ad 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -96,15 +96,15 @@ public: return *this->element_; } - inline const character_type *in (void) const { + inline const character_type *in () const { return *this->element_; } - inline character_type *&inout (void) const { + inline character_type *&inout () const { return *this->element_; } - inline string_out out (void) const { + inline string_out out () const { if (release()) { @@ -114,7 +114,7 @@ public: return *this->element_; } - inline character_type *_retn (void) { + inline character_type *_retn () { character_type * copy = *this->element_; *this->element_ = traits::default_initializer(); return copy; diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 1be51e3c49c..c132daaeef9 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -456,11 +456,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add) { // Notice the use of an explicit constructor.... -#if defined (ACE_HAS_CPP11) std::unique_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); -#else - auto_ptr<TAO_Policy_Set> policy_manager (new TAO_Policy_Set (TAO_POLICY_OBJECT_SCOPE)); -#endif /* ACE_HAS_CPP11 */ if (set_add == CORBA::SET_OVERRIDE) { diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index a2b56708493..de3020ed58c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -22,11 +22,7 @@ #include "tao/MProfile.h" #include "tao/ORB_Core_Auto_Ptr.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h @@ -89,7 +85,7 @@ public: /// Return the queueing strategy to be used in by the transport. /// Selection will be based on the SyncScope policies. - TAO::Transport_Queueing_Strategy *transport_queueing_strategy (void); + TAO::Transport_Queueing_Strategy *transport_queueing_strategy (); /// All objref representations carry around a type ID. CORBA::String_var type_id; @@ -114,39 +110,39 @@ public: TAO_ORB_Core *orb_core); // = Memory management. - void _incr_refcnt (void); - void _decr_refcnt (void); + void _incr_refcnt (); + void _decr_refcnt (); /// Return the Profile lock. This lock can be used at places where /// profiles need to be edited. - const TAO_SYNCH_MUTEX& profile_lock (void) const; + const TAO_SYNCH_MUTEX& profile_lock () const; /// Manage the base (non-forwarded) profiles. /// Returns a pointer to the profile_in_use object. This object /// retains ownership of this profile. - TAO_Profile *profile_in_use (void); + TAO_Profile *profile_in_use (); /// Return the ObjectKey - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /** * Copy of the profile list, user must free memory when done. * although the user can call make_profiles() then reorder * the list and give it back to TAO_Stub. */ - TAO_MProfile *make_profiles (void); + TAO_MProfile *make_profiles (); /// Obtain a reference to the basic profile set. - const TAO_MProfile& base_profiles (void) const; + const TAO_MProfile& base_profiles () const; /// Obtain a reference to the basic profile set. - TAO_MProfile& base_profiles (void); + TAO_MProfile& base_profiles (); /// Obtain a pointer to the forwarded profile set - const TAO_MProfile *forward_profiles (void) const; + const TAO_MProfile *forward_profiles () const; /// Obtain a pointer to the forwarded profile set - TAO_MProfile *forward_profiles (void); + TAO_MProfile *forward_profiles (); /// True if permanent location forward occurred, in this case the lock must be set and the @@ -159,7 +155,7 @@ public: * profile_in_use_ is set to the first profile in the base_profiles * list. */ - TAO_Profile *next_profile (void); + TAO_Profile *next_profile (); /** * THREAD SAFE @@ -167,23 +163,23 @@ public: * profile and if there are anmy existing forward profiles they are * reset. */ - void reset_profiles (void); + void reset_profiles (); /// Returns true if the profile in use is /// the same as the profile in use after /// reset_profiles() is called. - CORBA::Boolean at_starting_profile (void) const; + CORBA::Boolean at_starting_profile () const; /// Returns true if a forward profile has successfully been used. /// profile_success_ && forward_profiles_ - CORBA::Boolean valid_forward_profile (void); + CORBA::Boolean valid_forward_profile (); /// NON-THREAD-SAFE. Will set profile_success_ to true. - void set_valid_profile (void); + void set_valid_profile (); /// Returns true if a connection was successful with at least /// one profile. - CORBA::Boolean valid_profile (void) const; + CORBA::Boolean valid_profile () const; /// Initialize the base_profiles_ and set profile_in_use_ to /// reference the first profile. @@ -207,22 +203,22 @@ public: * Used to get the next profile after the one being used has * failed during the initial connect or send of the message! */ - CORBA::Boolean next_profile_retry (void); + CORBA::Boolean next_profile_retry (); /// Accessor. - TAO_ORB_Core* orb_core (void) const; + TAO_ORB_Core* orb_core () const; /// Is this stub collocated with the servant? - CORBA::Boolean is_collocated (void) const; + CORBA::Boolean is_collocated () const; /// Mutator to mark this stub as being collocated with the servant. void is_collocated (CORBA::Boolean); /// This returns a duplicated ORB pointer. - CORBA::ORB_ptr servant_orb_ptr (void); + CORBA::ORB_ptr servant_orb_ptr (); /// This returns the ORB var itself (generally for temporary use). - CORBA::ORB_var &servant_orb_var (void); + CORBA::ORB_var &servant_orb_var (); /** * Accesor and mutator for the servant ORB. Notice that the mutator @@ -236,7 +232,7 @@ public: void collocated_servant (TAO_Abstract_ServantBase* servant); /// Accessor for the servant reference in collocated cases. - TAO_Abstract_ServantBase* collocated_servant (void) const; + TAO_Abstract_ServantBase* collocated_servant () const; /// Mutator for setting the object proxy broker pointer. /// CORBA::Objects using this stub will use this for standard calls @@ -246,7 +242,7 @@ public: /// Accessor for getting the object proxy broker pointer. /// CORBA::Objects using this stub use this for standard calls /// like is_a; get_interface; etc... - TAO::Object_Proxy_Broker *object_proxy_broker (void) const; + TAO::Object_Proxy_Broker *object_proxy_broker () const; /** * Create the IOP::IOR info. We will create the info at most once. @@ -259,14 +255,14 @@ public: * This method is intended to be used only by the CORBA::Object * class. */ - void destroy (void); + void destroy (); /// Return the cached value from the ORB_Core. /** * This flag indicates whether the stub code should make use of the * collocation opportunities that are available to the ORB. */ - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; /// Needed to avoid copying forward_profiles for thread safety CORBA::Boolean marshal (TAO_OutputCDR&); @@ -278,13 +274,13 @@ protected: /// Destructor is to be called only through _decr_refcnt() to /// enforce proper reference counting. - virtual ~TAO_Stub (void); + virtual ~TAO_Stub (); /// NON-THREAD SAFE version of reset_profiles (void); - void reset_profiles_i (void); + void reset_profiles_i (); /// NON-THREAD SAFE version of next_profile (void) - TAO_Profile *next_profile_i (void); + TAO_Profile *next_profile_i (); private: /// Makes a copy of the profile and frees the existing profile_in_use. @@ -297,14 +293,14 @@ private: /// NON-THREAD-SAFE. Utility method which unrolls (removes or pops) /// the top most forwarding profile list. - void forward_back_one (void); + void forward_back_one (); /// NOT THREAD-SAFE. Utility method which pops all forward profile /// lists and resets the forward_profiles_ pointer. void reset_forward (); /// NON-THREAD-SAFE. utility method for next_profile. - TAO_Profile *next_forward_profile (void); + TAO_Profile *next_forward_profile (); /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info); @@ -384,11 +380,7 @@ protected: CORBA::Boolean profile_success_; /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ /// The policy overrides in this object, if nil then use the default /// policies. @@ -418,7 +410,7 @@ protected: /// True if forwarding request upon some specific exceptions /// (e.g. OBJECT_NOT_EXIST) already happened. - ACE_Atomic_Op<TAO_SYNCH_MUTEX, bool> forwarded_on_exception_; + std::atomic<bool> forwarded_on_exception_; }; // Define a TAO_Stub auto_ptr class. @@ -434,12 +426,12 @@ public: explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0); TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap); TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs); - ~TAO_Stub_Auto_Ptr (void); + ~TAO_Stub_Auto_Ptr (); // = Accessor methods. TAO_Stub &operator *() const; - TAO_Stub *get (void) const; - TAO_Stub *release (void); + TAO_Stub *get () const; + TAO_Stub *release (); void reset (TAO_Stub *p = 0); TAO_Stub *operator-> () const; diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index 7c638ccf206..146414ac160 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -393,7 +393,7 @@ void TAO_Stub::forwarded_on_exception (bool forwarded) ACE_INLINE bool TAO_Stub::forwarded_on_exception () const { - return forwarded_on_exception_.value (); + return forwarded_on_exception_; } ACE_INLINE diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 69e7f948fac..ee073e085d3 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -580,11 +580,7 @@ namespace TAO // We must manage the memory allocated // by the call above to alloc(). -#if defined (ACE_HAS_CPP11) std::unique_ptr<CORBA::Exception> safety (exception); -#else - auto_ptr<CORBA::Exception> safety (exception); -#endif /* ACE_HAS_CPP11 */ exception->_raise (); @@ -731,11 +727,7 @@ namespace TAO // Without this, the call to create_system_exception() above // causes a memory leak. On platforms without native exceptions, // the CORBA::Environment class manages the memory. -#if defined (ACE_HAS_CPP11) std::unique_ptr<CORBA::SystemException> safety (ex); -#else - auto_ptr<CORBA::SystemException> safety (ex); -#endif /* ACE_HAS_CPP11 */ ex->minor (minor); ex->completed (CORBA::CompletionStatus (completion)); 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/SystemException.h b/TAO/tao/SystemException.h index 937c045e5ad..f52e0414820 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -55,7 +55,7 @@ namespace CORBA namespace TAO { - typedef CORBA::SystemException* (*excp_factory)(void); + typedef CORBA::SystemException* (*excp_factory)(); } namespace CORBA @@ -99,16 +99,16 @@ namespace CORBA SystemException (const SystemException & src); /// Destructor. - virtual ~SystemException (void); + virtual ~SystemException (); /// Get the minor status. - ULong minor (void) const; + ULong minor () const; /// Set the minor status. void minor (ULong m); /// Get the completion status. - CORBA::CompletionStatus completed (void) const; + CORBA::CompletionStatus completed () const; /// Set the operation completion status. void completed (CORBA::CompletionStatus c); @@ -119,7 +119,7 @@ namespace CORBA /// The const version of narrow operation to a SystemException static const SystemException *_downcast(const CORBA::Exception *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = TAO-specific extension. @@ -129,7 +129,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; virtual void _tao_encode (TAO_OutputCDR &cdr) const; @@ -143,12 +143,12 @@ namespace CORBA static CORBA::ULong _tao_errno (int errno_value); /// Deep copy - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; protected: /// Default constructor. - SystemException (void); + SystemException (); /// Assignment operator. SystemException & operator= (const SystemException &src); diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 0c0b15fd96a..db1720972d3 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -125,79 +125,79 @@ public: CORBA::Object_ptr target); /// Destructor. - ~TAO_ServerRequest (void); + ~TAO_ServerRequest (); /** * @name Request attributes. */ //@{ /// Return the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *operation, size_t length, int release); /// Return the length of the operation. - size_t operation_length (void) const; + size_t operation_length () const; //@} /// Return the underlying ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Return the ORB core pointer member. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Start a Reply message. - void init_reply (void); + void init_reply (); /// Retrieve the incoming stream. - TAO_InputCDR * incoming (void) const; + TAO_InputCDR * incoming () const; /// Retrieve the outgoing stream. - TAO_OutputCDR * outgoing (void) const; + TAO_OutputCDR * outgoing () const; /// Is the response expected? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Should the reply be deferred? - CORBA::Boolean deferred_reply (void) const; + CORBA::Boolean deferred_reply () const; /// Set the response expected flag. void response_expected (CORBA::Boolean response); /// Should we return before dispatching the servant? - CORBA::Boolean sync_with_server (void) const; + CORBA::Boolean sync_with_server () const; /// Set the sync_with_server flag. void sync_with_server (CORBA::Boolean sync_flag); /// Is the request at risk of being queued? - CORBA::Boolean is_queued (void) const; + CORBA::Boolean is_queued () const; /// Set the queued flag. void is_queued (CORBA::Boolean qeueued_flag); /// Send a sync reply if needed after _dispatch is called - void sync_after_dispatch (void); + void sync_after_dispatch (); /// Send a sync reply if needed before _dispatch is called to avoid /// possible queuing first. - void sync_before_dispatch (void); + void sync_before_dispatch (); /// Used with reliable oneway requests. - void send_no_exception_reply (void); + void send_no_exception_reply (); - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Return the request TAO_Service_Context - TAO_Service_Context &request_service_context (void); + TAO_Service_Context &request_service_context (); /// Return the reply TAO_Service_Context - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &reply_service_context (); - IOP::ServiceContextList &reply_service_info (void); + IOP::ServiceContextList &reply_service_info (); - IOP::ServiceContextList &request_service_info (void); + IOP::ServiceContextList &request_service_info (); /// Return the underlying transport TAO_Transport *transport (); @@ -205,7 +205,7 @@ public: /// To handle System Exceptions at the lowest level, a method /// returning the request_id_ is needed. //@{ - CORBA::ULong request_id (void); + CORBA::ULong request_id (); void request_id (CORBA::ULong req); //@} @@ -217,16 +217,16 @@ public: void forward_location (CORBA::Object_ptr forward_reference); /// Get the forward_location. - CORBA::Object_ptr forward_location (void); + CORBA::Object_ptr forward_location (); /** * Since forward location is allowed to be nil then this is a proper * method to check if the request is being forwarded. */ - bool is_forwarded (void) const; + bool is_forwarded () const; /// Get the reply status - GIOP::ReplyStatusType reply_status (void); + GIOP::ReplyStatusType reply_status (); /// Set the reply status void reply_status (GIOP::ReplyStatusType except_type); @@ -235,29 +235,29 @@ public: void requesting_principal (const CORBA::OctetSeq & principal); /// Return the reference to the tagged profile - TAO_Tagged_Profile &profile (void); + TAO_Tagged_Profile &profile (); - void tao_send_reply (void); + void tao_send_reply (); void tao_send_reply_exception (const CORBA::Exception& ex); /// Set the boolean member to true. - void is_dsi (void); + void is_dsi (); /// Set the member. void dsi_nvlist_align (ptrdiff_t alignment); /// Get the operation details for the current request. - TAO_Operation_Details const * operation_details (void) const; + TAO_Operation_Details const * operation_details () const; /// Set the argument_flag void argument_flag (CORBA::Boolean flag); /// Get the argument_flag - CORBA::Boolean argument_flag (void); + CORBA::Boolean argument_flag (); /// Returns @c true if the current request is collocated. - bool collocated (void) const; + bool collocated () const; #if TAO_HAS_INTERCEPTORS == 1 /// Send cached reply. Used in scenarios where the FTORB thinks that @@ -271,12 +271,12 @@ public: * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t & interceptor_count (void); + size_t & interceptor_count (); /// Return a reference to the "request scope" PICurrent object. - TAO::PICurrent_Impl *rs_pi_current (void); + TAO::PICurrent_Impl *rs_pi_current (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); void caught_exception (CORBA::Exception *exception); @@ -284,7 +284,7 @@ public: void pi_reply_status (PortableInterceptor::ReplyStatus s); /// Get the status of the received reply. - PortableInterceptor::ReplyStatus pi_reply_status (void); + PortableInterceptor::ReplyStatus pi_reply_status (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if TAO_HAS_ZIOP == 1 @@ -297,7 +297,7 @@ public: private: /// Default ctor only used to create a TAO_ServerRequest that is about /// to be the target of a clone operation. - TAO_ServerRequest (void); + TAO_ServerRequest (); TAO_GIOP_Message_Base *mesg_base_; diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 54a4460b858..5f1cc3274fc 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -125,12 +125,10 @@ protected: //@} private: - - /// Disallow copying by not implementing the following ... - //@{ - TAO_Singleton_Manager (const TAO_Singleton_Manager &); - TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &); - //@} + TAO_Singleton_Manager (const TAO_Singleton_Manager &) = delete; + TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &) = delete; + TAO_Singleton_Manager (TAO_Singleton_Manager &&) = delete; + TAO_Singleton_Manager &operator= (TAO_Singleton_Manager &&) = delete; /// Register an object or array for deletion at program termination. /// See description of static version above for return values. 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/Tagged_Components.h b/TAO/tao/Tagged_Components.h index aab03fea27d..89c4e2ac87d 100644 --- a/TAO/tao/Tagged_Components.h +++ b/TAO/tao/Tagged_Components.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Tagged_Components { public: /// Constructor - TAO_Tagged_Components (void); + TAO_Tagged_Components (); // = Standard OMG that require fast access. /// The the IOP::TAG_ORB_TYPE component value @@ -113,7 +113,7 @@ public: * MutipleComponentProfile. Added by request from Chris Hafey * <chris@stentorsoft.com> */ - IOP::MultipleComponentProfile &components (void); + IOP::MultipleComponentProfile &components (); private: /// Helper method to implement set_code_sets() diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h index d205ead432e..0b41fc1ec9c 100644 --- a/TAO/tao/Tagged_Profile.h +++ b/TAO/tao/Tagged_Profile.h @@ -58,27 +58,27 @@ public: CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr); /// Return the object key - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Save the object key void object_key (TAO::ObjectKey &object_key); /// Return a const object key - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Get the tagged_profile - const IOP::TaggedProfile &tagged_profile (void) const; + const IOP::TaggedProfile &tagged_profile () const; /// Get the profile index, that needs to be used in the /// sequnce of TaggedProfiles contained IOP::IOR that is /// received from the client. - CORBA::ULong profile_index (void) const; + CORBA::ULong profile_index () const; /// Accessor to the type_id contained in the IOP::IOR received from /// the client. - const char* type_id (void) const; + const char* type_id () const; - CORBA::Short discriminator (void) const; + CORBA::Short discriminator () const; private: /// Extract the object key from the TaggedProfile and store it in 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/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index fbc520aea4e..fa70136f350 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -64,22 +64,22 @@ namespace TAO Transport_Selection_Guard (TAO_Transport* t); /// Dtor - ~Transport_Selection_Guard (void); + ~Transport_Selection_Guard (); /// getter - TAO_Transport* operator-> (void) const + TAO_Transport* operator-> () const { return this->get (); }; /// getter - TAO_Transport& operator* (void) const + TAO_Transport& operator* () const { return *this->get (); }; /// Getter - TAO_Transport* get (void) const + TAO_Transport* get () const { return this->curr_; }; diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 6091692a48b..2f065c382d6 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -64,7 +64,7 @@ namespace TAO class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object { public: - virtual ~TAO_TypeCodeFactory_Adapter (void); + virtual ~TAO_TypeCodeFactory_Adapter (); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index fb5f23cb076..5221d90c31f 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -42,7 +42,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - const typename S_var::s_traits::char_type * arg (void) const; + const typename S_var::s_traits::char_type * arg () const; protected: typename S_var::s_traits::char_type const * x_; @@ -61,9 +61,9 @@ namespace TAO { public: In_UB_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x); - virtual ~In_UB_String_Clonable_Argument_T (void); + virtual ~In_UB_String_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -87,7 +87,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -110,7 +110,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -127,15 +127,15 @@ namespace TAO class Ret_UB_String_Argument_T : public RetArgument { public: - Ret_UB_String_Argument_T (void); + Ret_UB_String_Argument_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 */ - typename S_var::s_traits::char_type *& arg (void); - typename S_var::s_traits::char_type * excp (void); - typename S_var::s_traits::char_type * retn (void); + typename S_var::s_traits::char_type *& arg (); + typename S_var::s_traits::char_type * excp (); + typename S_var::s_traits::char_type * retn (); private: S_var x_; diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index c3ec3ec5bbd..d50b8b8be03 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -239,7 +239,7 @@ public: /// Returns the underlying message block, the caller must *not* /// release the copy. - inline ACE_Message_Block* mb (void) const { + inline ACE_Message_Block* mb () const { return mb_; } diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index f2461dd1142..6869abd5a47 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -44,7 +44,7 @@ namespace CORBA UserException (UserException const &rhs); /// Destructor. - virtual ~UserException (void); + virtual ~UserException (); /// Assignment operator. UserException &operator= (UserException const &rhs); @@ -55,9 +55,9 @@ namespace CORBA /// The const version of narrow operation static const UserException *_downcast (CORBA::Exception const *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; // = TAO specific extension. @@ -66,11 +66,11 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; protected: /// Default constructor. - UserException (void); + UserException (); }; } diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index d23b249e062..a67601acfed 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -25,11 +25,7 @@ #include "tao/Objref_VarOut_T.h" #include "tao/Object.h" /* For CORBA::Object_var */ #include "tao/Pseudo_VarOut_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -55,7 +51,6 @@ namespace CORBA class TAO_Valuetype_Export AbstractBase { public: - /// Constructor. /** * This constructor is only meant to be called by the @@ -127,7 +122,6 @@ namespace CORBA void _decr_refcount (void); protected: - AbstractBase (void); AbstractBase (const AbstractBase &); @@ -138,7 +132,6 @@ namespace CORBA CORBA::Boolean is_objref_; private: - AbstractBase & operator= (const AbstractBase &); virtual CORBA::ValueBase *_tao_to_value (void); @@ -146,13 +139,8 @@ namespace CORBA CORBA::Object_ptr create_object (TAO_Stub *stub); private: - /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ CORBA::Boolean is_collocated_; TAO_Abstract_ServantBase *servant_; diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index 1b348223320..4522590249d 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -58,11 +58,10 @@ namespace TAO // Don't allow default initializations AbstractBase_Invocation_Adapter (void); - // Disallow copying and assignment. - AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &); - AbstractBase_Invocation_Adapter & operator= ( - const AbstractBase_Invocation_Adapter &); - + AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &) = delete; + AbstractBase_Invocation_Adapter & operator= (const AbstractBase_Invocation_Adapter &) = delete; + AbstractBase_Invocation_Adapter (AbstractBase_Invocation_Adapter &&) = delete; + AbstractBase_Invocation_Adapter & operator= (AbstractBase_Invocation_Adapter &&) = delete; }; } // End namespace TAO diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index dd0a46c847e..0f4f33161b6 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1428,11 +1428,7 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void) CORBA::ULong CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const { -#if defined (ACE_HAS_CPP11) return this->refcount_; -#else - return this->refcount_.value (); -#endif /* ACE_HAS_CPP11 */ } // =========================================================== diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 25a68b6e00a..add847fabef 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -30,11 +30,7 @@ #include "ace/Basic_Types.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #include "ace/Null_Mutex.h" #include "ace/Vector_T.h" @@ -147,12 +143,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 +157,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 +234,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 +323,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 (); @@ -347,11 +343,7 @@ namespace CORBA private: // data /// Reference counter. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; // DefaultValueRefCountBase // which lock has the lowest memory overhead ? diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 6003f803086..ddfafde6f4c 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -26,11 +26,7 @@ #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" #include "ace/Null_Mutex.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -54,29 +50,25 @@ 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. -#if defined (ACE_HAS_CPP11) std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ }; } // End CORBA namespace 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.h b/TAO/tao/Valuetype_Adapter.h index db2f8c8539a..0b2dceb7b4f 100644 --- a/TAO/tao/Valuetype_Adapter.h +++ b/TAO/tao/Valuetype_Adapter.h @@ -51,7 +51,7 @@ class TAO_InputCDR; class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter (void); + virtual ~TAO_Valuetype_Adapter (); virtual CORBA::Object_ptr abstractbase_to_object ( CORBA::AbstractBase_ptr p) = 0; @@ -63,7 +63,7 @@ public: TAO_InputCDR &, CORBA::AbstractBase_ptr &) = 0; - virtual CORBA::Long type_info_single (void) const = 0; + virtual CORBA::Long type_info_single () const = 0; virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const = 0; virtual CORBA::Boolean is_type_info_single (CORBA::Long) const = 0; 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/VarOut_T.h b/TAO/tao/VarOut_T.h index a10d9bbe404..857399b3332 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -33,24 +33,24 @@ template<typename T> class TAO_Var_Base_T { public: - TAO_Var_Base_T (void); + TAO_Var_Base_T (); TAO_Var_Base_T (T *); TAO_Var_Base_T (const TAO_Var_Base_T<T> &); - ~TAO_Var_Base_T (void); + ~TAO_Var_Base_T (); - T * operator-> (void); - const T * operator-> (void) const; + T * operator-> (); + const T * operator-> () const; typedef const T & _in_type; typedef T & _inout_type; // Common mapping for fixed and variable size types. - _in_type in (void) const; - _inout_type inout (void); + _in_type in () const; + _inout_type inout (); // TAO extension. - T * ptr (void) const; + T * ptr () const; operator T *& (); protected: @@ -67,7 +67,7 @@ template<typename T> class TAO_Fixed_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Fixed_Var_T (void); + TAO_Fixed_Var_T (); TAO_Fixed_Var_T (T *); TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &); @@ -88,8 +88,8 @@ public: typedef T _retn_type; // Mapping for fixed size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -102,7 +102,7 @@ template<typename T> class TAO_Var_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Var_Var_T (void); + TAO_Var_Var_T (); TAO_Var_Var_T (T *); TAO_Var_Var_T (const TAO_Var_Var_T<T> &); @@ -117,8 +117,8 @@ public: typedef T * _retn_type; // Mapping for variable size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -141,8 +141,8 @@ public: TAO_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index d5425df51d5..404a03165a5 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -40,7 +40,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; protected: const S * x_; @@ -62,9 +62,9 @@ namespace TAO { public: In_Var_Size_Clonable_Argument_T (S const & x); - virtual ~In_Var_Size_Clonable_Argument_T (void); + virtual ~In_Var_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -88,7 +88,7 @@ namespace TAO #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_; @@ -111,7 +111,7 @@ namespace TAO #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_; @@ -128,16 +128,16 @@ namespace TAO class Ret_Var_Size_Argument_T : public RetArgument { public: - Ret_Var_Size_Argument_T (void); + Ret_Var_Size_Argument_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); + S *& arg (); - S * excp (void); - S * retn (void); + S * excp (); + S * retn (); protected: typename S::_var_type x_; 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); diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index d0094a94f67..11ce0f2f73a 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -63,9 +63,9 @@ namespace CORBA { public: - WrongTransaction (void); + WrongTransaction (); WrongTransaction (const WrongTransaction &); - ~WrongTransaction (void); + ~WrongTransaction (); WrongTransaction &operator= (const WrongTransaction &); @@ -74,11 +74,11 @@ namespace CORBA static WrongTransaction *_downcast (CORBA::Exception *); static const WrongTransaction *_downcast (CORBA::Exception const *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode ( TAO_OutputCDR & @@ -91,7 +91,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; }; #endif /* end #if !defined */ diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index 956f8559556..cedbe7c22c7 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -33,7 +33,7 @@ namespace CORBA /** * @note We tried with CORBA::default_environment() and others. */ -TAO_Export CORBA::Environment& TAO_default_environment (void); +TAO_Export CORBA::Environment& TAO_default_environment (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index d42e66213d8..9d85feb2355 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -78,46 +78,46 @@ public: const CORBA::ULong ex_count = 0); /// Operation name - const char* opname (void) const; + const char* opname () const; /// Length of the operation name - CORBA::ULong opname_len (void) const; + CORBA::ULong opname_len () const; /// Return the flag that indicates whether the operation has any /// arguments - CORBA::Boolean argument_flag (void) const; - CORBA::Boolean in_argument_flag (void) const; + CORBA::Boolean argument_flag () const; + CORBA::Boolean in_argument_flag () const; /// Set the response flags void response_flags (CORBA::Octet flags); /// Get the response flags - CORBA::Octet response_flags (void) const; + CORBA::Octet response_flags () const; /// Accessors for the service context list - IOP::ServiceContextList &request_service_info (void); - const IOP::ServiceContextList &request_service_info (void) const; - IOP::ServiceContextList &reply_service_info (void); - const IOP::ServiceContextList &reply_service_info (void) const; + IOP::ServiceContextList &request_service_info (); + const IOP::ServiceContextList &request_service_info () const; + IOP::ServiceContextList &reply_service_info (); + const IOP::ServiceContextList &reply_service_info () const; /// Access the TAO_Service_Context - TAO_Service_Context &request_service_context (void); - const TAO_Service_Context &request_service_context (void) const; - TAO_Service_Context &reply_service_context (void); - const TAO_Service_Context &reply_service_context (void) const; + TAO_Service_Context &request_service_context (); + const TAO_Service_Context &request_service_context () const; + TAO_Service_Context &reply_service_context (); + const TAO_Service_Context &reply_service_context () const; /// Reset the contents of the service context lists that we hold. - void reset_request_service_info (void); - void reset_reply_service_info (void); + void reset_request_service_info (); + void reset_reply_service_info (); /// Cache the request id. void request_id (CORBA::ULong id); /// Return the request ID associated with the operation - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Accessor method for the addressing mode - TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const; + TAO_Target_Specification::TAO_Target_Address addressing_mode () const; /// Set method for the addressing mode void addressing_mode (CORBA::Short addr); @@ -148,30 +148,30 @@ public: bool demarshal_args (TAO_InputCDR &cdr); /// Accessors for the argument list - TAO::Argument ** args (void) const; - CORBA::ULong args_num (void) const ; + TAO::Argument ** args () const; + CORBA::ULong args_num () const ; /// Exception count - CORBA::ULong ex_count (void) const; + CORBA::ULong ex_count () const; - TAO::Exception_Data const * ex_data (void) const; + TAO::Exception_Data const * ex_data () const; - CORBA::Boolean use_stub_args (void) const; + CORBA::Boolean use_stub_args () const; void use_stub_args (CORBA::Boolean use_stub_arguments); #if TAO_HAS_INTERCEPTORS == 1 void ft_expiration_time (TimeBase::TimeT time); - TimeBase::TimeT ft_expiration_time (void) const; + TimeBase::TimeT ft_expiration_time () const; void ft_retention_id (CORBA::Long request_id); - CORBA::Long ft_retention_id (void) const; + CORBA::Long ft_retention_id () const; #endif /*TAO_HAS_INTERCEPTORS == 1*/ /// Accessor for cac_ pointer. - TAO::Collocated_Arguments_Converter *cac (void) const; + TAO::Collocated_Arguments_Converter *cac () const; void cac (TAO::Collocated_Arguments_Converter *cac); - TAO_Reply_Dispatcher *reply_dispatcher (void) const; + TAO_Reply_Dispatcher *reply_dispatcher () const; void reply_dispatcher (TAO_Reply_Dispatcher *rd); private: diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 891e828d415..fe06a81b545 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -55,7 +55,7 @@ public: typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type; /// Constructor. - TAO_ORB_Parameters (void); + TAO_ORB_Parameters (); /// Specifies the endpoints on which this server is willing to /// listen for requests. @@ -70,41 +70,41 @@ public: /// Get/Set address:port for Multicast Discovery Protocol for /// the Naming Service. - const char *mcast_discovery_endpoint (void) const; + const char *mcast_discovery_endpoint () const; void mcast_discovery_endpoint (const char *mde); /// Set/Get the size to be used for a socket's receive buffer. - int sock_rcvbuf_size (void) const; + int sock_rcvbuf_size () const; void sock_rcvbuf_size (int); /// Set/Get the size to be used for a socket's send buffer. - int sock_sndbuf_size (void) const; + int sock_sndbuf_size () const; void sock_sndbuf_size (int); /// Set/Get the status of whether to use TCP_NODELAY or not. - int nodelay (void) const; + int nodelay () const; void nodelay (int); /// Set/Get whether we should set SO_KEEPALIVE on the socket or not. - int sock_keepalive (void); + int sock_keepalive (); void sock_keepalive (int); /// Set/Get whether we should set SO_DONTROUTE on the socket or not. - int sock_dontroute (void); + int sock_dontroute (); void sock_dontroute (int); /// Set/Get the number of hops to be used for datagrams sent through socket. - int ip_hoplimit (void); + int ip_hoplimit (); void ip_hoplimit (int); /// Set/Get whether we should set IP_MULTICAST_LOOP on the socket or not. - bool ip_multicastloop (void); + bool ip_multicastloop (); void ip_multicastloop (bool); /// Set/Get client side port span values - u_short iiop_client_port_base (void); + u_short iiop_client_port_base (); void iiop_client_port_base (u_short); - u_short iiop_client_port_span (void); + u_short iiop_client_port_span (); void iiop_client_port_span (u_short); /** @@ -113,7 +113,7 @@ public: * octet sequence is small enough and there is room in the current * message block it is more efficient just to copy the buffer. */ - int cdr_memcpy_tradeoff (void) const; + int cdr_memcpy_tradeoff () const; void cdr_memcpy_tradeoff (int); /** @@ -121,36 +121,36 @@ public: * kicks in. */ //@{ - ACE_CDR::ULong max_message_size (void) const; + ACE_CDR::ULong max_message_size () const; void max_message_size (ACE_CDR::ULong size); //@} /// The ORB will use the dotted decimal notation for addresses. By /// default we use the full ascii names. - int use_dotted_decimal_addresses (void) const; + int use_dotted_decimal_addresses () const; void use_dotted_decimal_addresses (int); /// The ORB will cache incoming connections against the dotted /// decimal form of the peer's address - int cache_incoming_by_dotted_decimal_address (void) const; + int cache_incoming_by_dotted_decimal_address () const; void cache_incoming_by_dotted_decimal_address (int); /// The ORB will turn off SO_LINGER if this is zero. - int linger (void) const; + int linger () const; void linger (int); /// The amount of time desired by the user to wait to accept /// connections after a particular type of accept() error. - time_t accept_error_delay (void) const; + time_t accept_error_delay () const; void accept_error_delay (time_t); /// Set/Get the Init Reference of an arbitrary ObjectID. - char *default_init_ref (void) const; + char *default_init_ref () const; void default_init_ref (const char *default_init_ref); /// Disable the OMG standard profile components, useful for /// homogenous environments. - bool std_profile_components (void) const; + bool std_profile_components () const; void std_profile_components (bool x); /// Scheduling policy. @@ -161,7 +161,7 @@ public: * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR, * ACE_SCHED_FIFO, and ACE_SCHED_OTHER. */ - int ace_sched_policy (void) const; + int ace_sched_policy () const; void ace_sched_policy (int x); /// Scheduling policy flag. @@ -171,7 +171,7 @@ public: * thread creation functions. Legal values are THR_SCHED_RR, * THR_SCHED_FIFO, and THR_SCHED_DEFAULT. */ - long sched_policy (void) const; + long sched_policy () const; void sched_policy (long x); /// Scheduling scope flag. @@ -181,47 +181,47 @@ public: * thread creation functions. Legal values are THR_SCOPE_SYSTEM and * THR_SCOPE_PROCESS. */ - long scope_policy (void) const; + long scope_policy () const; void scope_policy (long x); /// Thread creation flags. /** * Shorthand for OR'ing together the scope_policy and sched_policy. */ - long thread_creation_flags (void) const; + long thread_creation_flags () const; /// Single read optimization. - int single_read_optimization (void) const; + int single_read_optimization () const; void single_read_optimization (int x); /// Create shared profiles without priority - int shared_profile (void) const; + int shared_profile () const; void shared_profile (int x); /// Want to use parallel connection attempts when profiles have multiple /// endpoints. - bool use_parallel_connects(void) const; + bool use_parallel_connects() const; void use_parallel_connects (bool x); /// The milliseconds delay used to stagger individual connection starts /// when using parallel connects. - unsigned long parallel_connect_delay (void) const; + unsigned long parallel_connect_delay () const; void parallel_connect_delay (unsigned long x); /// Mutators and accessors for rt_collocation_resolver - bool disable_rt_collocation_resolver (void) const; + bool disable_rt_collocation_resolver () const; void disable_rt_collocation_resolver (bool); /// Accepts the list of preferred interfaces and does a simple /// semantic check on the string before setting. Also the getter. bool preferred_interfaces (const char *s); - const char *preferred_interfaces (void) const; + const char *preferred_interfaces () const; /// Utility function called by the preferred interfaces setter static bool check_preferred_interfaces_string (const char *); void enforce_pref_interfaces (bool p); - bool enforce_pref_interfaces (void) const; + bool enforce_pref_interfaces () const; #if defined (ACE_HAS_IPV6) void prefer_ipv6_interfaces (bool p); @@ -235,49 +235,49 @@ public: #endif /* ACE_HAS_IPV6 */ void negotiate_codesets (bool c); - bool negotiate_codesets (void) const; + bool negotiate_codesets () const; void ami_collication (bool opt); - bool ami_collication (void) const; + bool ami_collication () const; void protocols_hooks_name (const char *s); - const char *protocols_hooks_name (void) const; + const char *protocols_hooks_name () const; void thread_lane_resources_manager_factory_name (const char *s); - const char *thread_lane_resources_manager_factory_name (void) const; + const char *thread_lane_resources_manager_factory_name () const; void dynamic_thread_pool_config_name (const char *s); - const char *dynamic_thread_pool_config_name (void) const; + const char *dynamic_thread_pool_config_name () const; void stub_factory_name (const char *s); - const char *stub_factory_name (void) const; + const char *stub_factory_name () const; void poa_factory_name (const char *s); - const char *poa_factory_name (void) const; + const char *poa_factory_name () const; void poa_factory_directive (const ACE_TCHAR *s); - const ACE_TCHAR *poa_factory_directive (void) const; + const ACE_TCHAR *poa_factory_directive () const; void endpoint_selector_factory_name (const char *s); - const char *endpoint_selector_factory_name (void) const; + const char *endpoint_selector_factory_name () const; void collocation_resolver_name (const char *s); - const char *collocation_resolver_name (void) const; + const char *collocation_resolver_name () const; void forward_invocation_on_object_not_exist (bool opt); - bool forward_invocation_on_object_not_exist (void) const; + bool forward_invocation_on_object_not_exist () const; void forward_on_exception_limit (const int ef, const int limit); void forward_on_exception_delay (const ACE_Time_Value &delay); - TAO::Invocation_Retry_Params &invocation_retry_params (void); - const TAO::Invocation_Retry_Params &invocation_retry_params (void) const; + TAO::Invocation_Retry_Params &invocation_retry_params (); + const TAO::Invocation_Retry_Params &invocation_retry_params () const; void forward_once_exception (const int ef); int forward_once_exception () const; void allow_ziop_no_server_policies (bool opt); - bool allow_ziop_no_server_policies (void) const; + bool allow_ziop_no_server_policies () const; private: /// Each "endpoint" is of the form: diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index f8f816ec7fd..b4dc72e825b 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Target_Specification public: /// Ctor - TAO_Target_Specification (void); + TAO_Target_Specification (); enum TAO_Target_Address { // Note that this could be extended for other protocols @@ -86,14 +86,14 @@ public: * the stored specifier is not of the right type then this would * return a NULL */ - const TAO::ObjectKey* object_key (void); + const TAO::ObjectKey* object_key (); /** * Returns the IOP::TaggedProfile after a check of the stored specifier. If * the stored specifier is not of the right type then this would * return a NULL */ - const IOP::TaggedProfile *profile (void); + const IOP::TaggedProfile *profile (); /** * Returns a pointer to IOP::IOR through the parameters and the @@ -104,7 +104,7 @@ public: CORBA::ULong iop_ior (IOP::IOR *&ior); /// Access the TArget_Address specifier - TAO_Target_Address specifier (void); + TAO_Target_Address specifier (); private: /// The union of all the possibilities diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h index b07f0c1f906..6cb0b769609 100644 --- a/TAO/tao/varbase.h +++ b/TAO/tao/varbase.h @@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Base_var { public: - TAO_Base_var (void) {} + TAO_Base_var () {} private: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2af09d07db9..a51d948d3a1 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "client_interceptor.h" +Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,14 +25,13 @@ Echo_Client_ORBInitializer::post_init ( // Install the Echo client request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Client_Request_Interceptor, + Echo_Client_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 84cdaa3c472..4a6ed849fed 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Client_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index 095a32b08e0..f50e351c6f2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "server_interceptor.h" +Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,7 +25,7 @@ Echo_Server_ORBInitializer::post_init ( // Install the Echo server request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Server_Request_Interceptor, + Echo_Server_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ServerRequestInterceptor_var diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index d2c2e6de155..c611cdf28eb 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Server_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/README b/TAO/tests/Portable_Interceptors/Dynamic/README index 6f494bcdf76..a2e686c1941 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/README +++ b/TAO/tests/Portable_Interceptors/Dynamic/README @@ -1,5 +1,3 @@ - - This test allows you to visually check the correct invocation of TAO's pseudo-portable interceptors, especially the Dynamic interface. diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c0153f9e365..0917bb12eaf 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,12 +38,10 @@ run_test (Test_Interceptors::Visual_ptr server) { CORBA::String_var msg; - server->normal (10, - msg.out ()); + server->normal (10, msg.out ()); CORBA::Long one = 1, two = 1, result = 0; - result = server->calculate (one, - two); + result = server->calculate (one, two); ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", @@ -81,6 +79,8 @@ run_test (Test_Interceptors::Visual_ptr server) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; + try { #if TAO_HAS_INTERCEPTORS == 1 @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Client_ORBInitializer, + Echo_Client_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -128,5 +128,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index af4dab6e0b9..5249375a979 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -6,38 +6,32 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) - : myname_ ("Echo_Client_Interceptor") -{ -} - -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } void -Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) +Echo_Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) { // Do nothing } void -Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { bool catched_exception = false; try @@ -45,13 +39,15 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -64,17 +60,15 @@ Echo_Client_Request_Interceptor::send_request ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) All parameters not available\n")); - } CORBA::ULong first = 0, second = 1; // If you dont understand @@ -92,6 +86,7 @@ Echo_Client_Request_Interceptor::send_request ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -101,6 +96,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::TypeCode_var second_typecode = paramlist[second].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the type of the extracted out" @@ -110,10 +106,8 @@ Echo_Client_Request_Interceptor::send_request ( } void -Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -123,8 +117,7 @@ Echo_Client_Request_Interceptor::receive_other ( } void -Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) { CORBA::String_var op = ri->operation (); @@ -134,11 +127,9 @@ Echo_Client_Request_Interceptor::receive_reply ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { @@ -153,6 +144,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (paramlist[first].mode != CORBA::PARAM_IN || paramlist[second].mode != CORBA::PARAM_OUT) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in the extracted argument list\n")); } @@ -162,6 +154,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -174,9 +167,9 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::String_var transfer (str); - if (ACE_OS::strcmp (str, - "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) + if (std::strcmp (str, "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -184,10 +177,9 @@ Echo_Client_Request_Interceptor::receive_reply ( } } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -206,11 +198,11 @@ Echo_Client_Request_Interceptor::receive_reply ( result)); } - if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0) + if (std::strcmp (op.in (), "_get_the_structure") == 0) { CORBA::Any_var a = ri->result (); - const Test_Interceptors::Visual::VarLenStruct * v = 0; + const Test_Interceptors::Visual::VarLenStruct * v = nullptr; (a.in ()) >>= v; @@ -227,7 +219,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -235,9 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception ( "from \"%C\"\n", op.in ())); - - CORBA::String_var exception_id = - ri->received_exception_id (); + CORBA::String_var exception_id = ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index 5e340799c91..939e199f681 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -15,40 +15,34 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Client-side echo interceptor. For checking interceptor visually only. class Echo_Client_Request_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Client-side echo interceptor. For checking interceptor visually only. public: + Echo_Client_Request_Interceptor (int& result); - Echo_Client_Request_Interceptor (void); - // ctor. - - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); + void send_poll (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); + void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); + void receive_other (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) override; protected: - - virtual ~Echo_Client_Request_Interceptor (void); - // dtor. + ~Echo_Client_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl index 1113978c01a..3d1fb801bc5 100755 --- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl @@ -52,7 +52,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45); +$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval()); if ($client_status != 0) { print STDERR "ERROR: client returned $client_status\n"; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 6ca15eecd4b..809cd868d40 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "Echo_Server_ORBInitializer.h" #include "ace/OS_NS_stdio.h" - #include "tao/ORBInitializer_Registry.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -35,6 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; try { #if TAO_HAS_INTERCEPTORS == 1 @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Server_ORBInitializer, + Echo_Server_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::String_var ior = orb->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -115,5 +115,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 4f12e95e2d5..20671f6c34b 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -6,32 +6,99 @@ #include "testC.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) - : myname_ ("Echo_Server_Interceptor") -{ -} - -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) + PortableInterceptor::ServerRequestInfo_ptr ri) { + bool catched_exception = false; + try + { + CORBA::String_var tmdi = ri->target_most_derived_interface (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_most_derived_interface from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + CORBA::Boolean tmdi = ri->target_is_a ("FOO"); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_is_a from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + Dynamic::ParameterList_var paramlist = ri->arguments (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling arguments from receive_request_service_contexts\n")); + } } void @@ -44,13 +111,15 @@ Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -61,10 +130,26 @@ Echo_Server_Request_Interceptor::receive_request ( "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + CORBA::Boolean targetisa = ri->target_is_a ("FOO"); + if (targetisa) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it is not a FOO\n")); + } + targetisa = ri->target_is_a ("IDL:Test_Interceptors/Visual:1.0"); + if (!targetisa) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it should be IDL:Test_Interceptors/Visual:1.0\n")); + } + + if (std::strcmp (op.in (), "normal") == 0) + { + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -79,6 +164,7 @@ Echo_Server_Request_Interceptor::receive_request ( CORBA::TypeCode_var second_typecode = paramlist[i].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in receive_request while checking " "the type of the extracted out" @@ -86,29 +172,51 @@ Echo_Server_Request_Interceptor::receive_request ( } } - CORBA::String_var tmdi = - ri->target_most_derived_interface (); + CORBA::String_var tmdi = ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %C\n", tmdi.in ())); + + if (std::strcmp (tmdi.in (), "IDL:Test_Interceptors/Visual:1.0") != 0) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_most_derived_interface\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request\n")); + } } void -Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) +Echo_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -119,10 +227,9 @@ Echo_Server_Request_Interceptor::send_reply ( param)); } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -146,7 +253,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -154,17 +260,15 @@ Echo_Server_Request_Interceptor::send_exception ( "from \"%C\"\n", op.in ())); - - CORBA::Any_var any = - ri->sending_exception (); + CORBA::Any_var any = ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (); + CORBA::String_var exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", - exception_id)); + exception_id.in ())); } void diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index da47f879f3a..b0a99af2ab6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -15,38 +15,34 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Server-side echo interceptor. For checking interceptor visually only. class Echo_Server_Request_Interceptor : public PortableInterceptor::ServerRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); - // cotr. + Echo_Server_Request_Interceptor (int& result); - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); + void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) override; - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); + void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); + void send_other (PortableInterceptor::ServerRequestInfo_ptr) override; protected: - - virtual ~Echo_Server_Request_Interceptor (void); - // dotr. + ~Echo_Server_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 540b0e2ebd3..600905ee3ce 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -4,7 +4,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } - // ctor void Visual_i::normal (CORBA::Long arg, @@ -23,9 +22,9 @@ Visual_i::calculate (CORBA::Long one, } Test_Interceptors::Visual::VarLenStruct * -Visual_i::the_structure (void) +Visual_i::the_structure () { - Test_Interceptors::Visual::VarLenStruct * s; + Test_Interceptors::Visual::VarLenStruct * s = nullptr; ACE_NEW_THROW_EX (s, Test_Interceptors::Visual::VarLenStruct, @@ -40,21 +39,21 @@ Visual_i::the_structure (void) } void -Visual_i::user (void) +Visual_i::user () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index 2e8230b8576..03d5177ae04 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -19,24 +19,20 @@ class Visual_i : public POA_Test_Interceptors::Visual public: Visual_i (CORBA::ORB_ptr orb); - virtual CORBA::Long calculate (CORBA::Long one, - CORBA::Long two); + CORBA::Long calculate (CORBA::Long one, CORBA::Long two) override; - void normal (CORBA::Long arg, - CORBA::String_out msg); + void normal (CORBA::Long arg, CORBA::String_out msg) override; - virtual Test_Interceptors::Visual::VarLenStruct * the_structure (); + Test_Interceptors::Visual::VarLenStruct * the_structure () override; - virtual void user (void); + void user () override; - virtual void system (void); + void system () override; - virtual void shutdown (void); + void shutdown () override; private: - CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ |