diff options
| author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-19 14:37:02 +0200 |
|---|---|---|
| committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-22 16:20:53 +0200 |
| commit | 2aab75d5fddc126e8085c70fe8e1b875b75a30ef (patch) | |
| tree | 82498955ff2b3829d6597ed88a9eca1b1705df96 /TAO/tao | |
| parent | 5e96bb28fc7572f39b63ac2aca72800c45cdb1ee (diff) | |
| download | ATCD-2aab75d5fddc126e8085c70fe8e1b875b75a30ef.tar.gz | |
Part 2: Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'TAO/tao')
137 files changed, 502 insertions, 502 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.inl b/TAO/tao/Abstract_Servant_Base.inl index 022fac0a234..2d6b259a3b8 100644 --- a/TAO/tao/Abstract_Servant_Base.inl +++ b/TAO/tao/Abstract_Servant_Base.inl @@ -1,7 +1,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void) +TAO_Abstract_ServantBase::TAO_Abstract_ServantBase () { // No-Op. } diff --git a/TAO/tao/Acceptor_Registry.inl b/TAO/tao/Acceptor_Registry.inl index 00ea19bb559..ce6ebba429a 100644 --- a/TAO/tao/Acceptor_Registry.inl +++ b/TAO/tao/Acceptor_Registry.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_AcceptorSetIterator -TAO_Acceptor_Registry::begin (void) +TAO_Acceptor_Registry::begin () { return this->acceptors_; } ACE_INLINE TAO_AcceptorSetIterator -TAO_Acceptor_Registry::end (void) +TAO_Acceptor_Registry::end () { return this->acceptors_ + this->size_; } diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index 526ef5ae6d4..a7a0d0001b5 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -360,13 +360,13 @@ CORBA::Any_out::operator CORBA::Any *&() } ACE_INLINE CORBA::Any *& -CORBA::Any_out::ptr (void) +CORBA::Any_out::ptr () { return this->ptr_; } ACE_INLINE CORBA::Any * -CORBA::Any_out::operator-> (void) +CORBA::Any_out::operator-> () { return this->ptr_; } diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index 0ecd203dcc1..05749bc6fba 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::NamedValue::NamedValue (void) +CORBA::NamedValue::NamedValue () : refcount_ (1), flags_ (0), name_ (0) @@ -52,7 +52,7 @@ CORBA::NamedValue::_nil () // ************************************************************* ACE_INLINE -CORBA::NVList::NVList (void) +CORBA::NVList::NVList () : max_ (0), refcount_ (1), incoming_ (0), diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 6955c7cd1db..0effbfd29c1 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -42,8 +42,8 @@ namespace TAO * class MyHostClass : private RefCountPolicy * { * public: - * void my_add_ref (void) { this->RefCountPolicy::add_ref (); } - * void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); } + * void my_add_ref () { this->RefCountPolicy::add_ref (); } + * void my_remove_ref () { this->RefCountPolicy::remove_ref (); } * }; * @endcode * diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 45b27e67042..1fe416b2c16 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -46,8 +46,8 @@ namespace TAO * class MyHostClass : private RefCountPolicy * { * public: - * void my_add_ref (void) { this->RefCountPolicy::add_ref (); } - * void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); } + * void my_add_ref () { this->RefCountPolicy::add_ref (); } + * void my_remove_ref () { this->RefCountPolicy::remove_ref (); } * }; * @endcode * diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 0370bd091a4..c9cc3862c88 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -17,7 +17,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::Case ( template <typename StringType, typename TypeCodeType> ACE_INLINE -TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void) +TAO::TypeCode::Case<StringType, TypeCodeType>::Case () : name_ () , type_ () { diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index cc4e6c2b853..ad9da0d3585 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -48,7 +48,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_; } @@ -69,7 +69,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_; } @@ -81,7 +81,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>:: -Ret_BD_String_Argument_T (void) +Ret_BD_String_Argument_T () { } @@ -90,7 +90,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -100,7 +100,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn () { return this->x_._retn (); } @@ -110,7 +110,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl index a99880c12f8..4f7ce5ebd51 100644 --- a/TAO/tao/Base_Transport_Property.inl +++ b/TAO/tao/Base_Transport_Property.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Base_Transport_Property::TAO_Base_Transport_Property (void) +TAO_Base_Transport_Property::TAO_Base_Transport_Property () { } diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index c0cd04fa721..f3fb2f2bd83 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -38,7 +38,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -66,7 +66,7 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T () { } @@ -74,7 +74,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -83,7 +83,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp () { return this->x_; } @@ -92,7 +92,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 89958d671dd..2180ec07e88 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_OutputCDR::~TAO_OutputCDR (void) +TAO_OutputCDR::~TAO_OutputCDR () { } @@ -262,7 +262,7 @@ TAO_InputCDR::TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, ACE_INLINE -TAO_InputCDR::~TAO_InputCDR (void) +TAO_InputCDR::~TAO_InputCDR () { } diff --git a/TAO/tao/CORBALOC_Parser.inl b/TAO/tao/CORBALOC_Parser.inl index 399a02a53bb..7545b3b3e2b 100644 --- a/TAO/tao/CORBALOC_Parser.inl +++ b/TAO/tao/CORBALOC_Parser.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void) +TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint () { if (this->profile_ != 0) this->profile_->_decr_refcnt(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl index 0dc311aa3c6..89f5e6db715 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl @@ -24,7 +24,7 @@ TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_Request::wait(void) +TAO::CSD::TP_Collocated_Synch_Request::wait() { bool dispatched = this->synch_helper_.wait_while_pending(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl index 51599163276..3cbc3791ae0 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl @@ -21,7 +21,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Serv ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(void) +TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait() { return this->synch_helper_.wait_while_pending(); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl index b6ed1be9bcd..c89c9dc6128 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl @@ -26,7 +26,7 @@ TAO::CSD::TP_Corba_Request::do_clone() ACE_INLINE void -TAO::CSD::TP_Corba_Request::do_dispatch(void) +TAO::CSD::TP_Corba_Request::do_dispatch() { // Pass 0 for the upcall wrapper. If we have it here, we can change the // upcall wrapper to a reference in the full TAO Core diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl index 385ea47cd30..45af5315cbe 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl @@ -12,7 +12,7 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation ACE_INLINE void -TAO::CSD::TP_Custom_Request_Operation::execute (void) +TAO::CSD::TP_Custom_Request_Operation::execute () { this->execute_i(); } diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index a5cfb657886..cf7e09a8d87 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -84,8 +84,8 @@ public: virtual void open (TAO_ORB_Core& core) = 0; - virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void) = 0; - virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void) = 0; + virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor () = 0; + virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor () = 0; virtual void get_ncs (CONV_FRAME::CodeSetId &ncsc, CONV_FRAME::CodeSetId &ncsw) = 0; diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp index 241de9ed7c2..7f5cc30d6b1 100644 --- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp +++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Bzip2_CompressorFactory::Bzip2_CompressorFactory (void) : +Bzip2_CompressorFactory::Bzip2_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_BZIP2), compressor_ (::Compression::Compressor::_nil ()) { diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp index 2f03fb2554c..5acf3010b2d 100644 --- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp +++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Lzo_CompressorFactory::Lzo_CompressorFactory (void) : +Lzo_CompressorFactory::Lzo_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_LZO), compressor_ (::Compression::Compressor::_nil ()) { diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 95bd5e40504..41857b7799c 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Zlib_CompressorFactory::Zlib_CompressorFactory (void) : +Zlib_CompressorFactory::Zlib_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_ZLIB) { } diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index c51494ec098..dc169d494f8 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::wait (void) +TAO_Condition<MUTEX>::wait () { return this->cond_->wait (); } @@ -27,25 +27,25 @@ TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) } template<class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::remove (void) +TAO_Condition<MUTEX>::remove () { return this->cond_->remove (); } template<class MUTEX> ACE_INLINE MUTEX * -TAO_Condition<MUTEX>::mutex (void) +TAO_Condition<MUTEX>::mutex () { return this->mutex_; } template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::signal (void) +TAO_Condition<MUTEX>::signal () { return this->cond_->signal (); } template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::broadcast (void) +TAO_Condition<MUTEX>::broadcast () { return this->cond_->broadcast (); } diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index bf79e292ab4..ecc2a877c11 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -80,7 +80,7 @@ public: * @return Return 0 if the connection was already closed, non-zero * otherwise. */ - virtual int close_connection (void) = 0; + virtual int close_connection () = 0; /// The event handler calls, here so that other objects who hold a /// reference to this object can call the event handler methods. diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index dcdf2eb1e5d..a001bdf90f0 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_Connection_Handler::orb_core (void) +TAO_Connection_Handler::orb_core () { return this->orb_core_; } ACE_INLINE TAO_Transport * -TAO_Connection_Handler::transport (void) +TAO_Connection_Handler::transport () { return this->transport_; } @@ -42,7 +42,7 @@ TAO_Connection_Handler::is_connecting () const } ACE_INLINE void -TAO_Connection_Handler::connection_pending (void) +TAO_Connection_Handler::connection_pending () { if (!this->connection_pending_) { @@ -52,7 +52,7 @@ TAO_Connection_Handler::connection_pending (void) } ACE_INLINE void -TAO_Connection_Handler::cancel_pending_connection (void) +TAO_Connection_Handler::cancel_pending_connection () { if (this->connection_pending_) { diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index ce049017227..d192e327e5d 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -229,7 +229,7 @@ TAO_AMH_DSI_Exception_Holder_out::operator TAO_AMH_DSI_Exception_Holder*& () } TAO_AMH_DSI_Exception_Holder *& -TAO_AMH_DSI_Exception_Holder_out::ptr (void) // ptr +TAO_AMH_DSI_Exception_Holder_out::ptr () // ptr { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl index 3562b7c9a19..5e900a10bd7 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl @@ -27,7 +27,7 @@ TAO_AMH_DSI_Response_Handler::_duplicate (TAO_AMH_DSI_Response_Handler_ptr x) // Inline operations for class TAO_AMH_DSI_Response_Handler_var ACE_INLINE -TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (void) +TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var () : ptr_ (TAO_AMH_DSI_Response_Handler::_nil ()) { } @@ -38,7 +38,7 @@ TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_ {} ACE_INLINE -TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void) +TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var () { CORBA::release(ptr_); } @@ -98,13 +98,13 @@ TAO_AMH_DSI_Response_Handler_var::in () const } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr & -TAO_AMH_DSI_Response_Handler_var::inout (void) +TAO_AMH_DSI_Response_Handler_var::inout () { return this->ptr_; } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr & -TAO_AMH_DSI_Response_Handler_var::out (void) +TAO_AMH_DSI_Response_Handler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_AMH_DSI_Response_Handler::_nil (); @@ -112,7 +112,7 @@ TAO_AMH_DSI_Response_Handler_var::out (void) } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::_retn (void) +TAO_AMH_DSI_Response_Handler_var::_retn () { // yield ownership TAO_AMH_DSI_Response_Handler_ptr val = this->ptr_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index 8d17f479750..d516a6c03a4 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -50,7 +50,7 @@ public: virtual void connection_closed (); /// The following methods are not needed for this class.. - virtual void reply_timed_out (void) {} + virtual void reply_timed_out () {} virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &) { return 0; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl index 736cd4372d5..5fb4984b60e 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl @@ -14,7 +14,7 @@ TAO_DII_Reply_Handler::_duplicate (TAO_DII_Reply_Handler_ptr x) // Inline operations for class TAO_DII_Reply_Handler_var ACE_INLINE -TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (void) +TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var () : ptr_ (TAO_DII_Reply_Handler::_nil ()) { } @@ -26,7 +26,7 @@ TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var ( {} ACE_INLINE -TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void) +TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var () { CORBA::release (this->ptr_); } @@ -87,13 +87,13 @@ TAO_DII_Reply_Handler_var::in () const } ACE_INLINE TAO_DII_Reply_Handler_ptr & -TAO_DII_Reply_Handler_var::inout (void) +TAO_DII_Reply_Handler_var::inout () { return this->ptr_; } ACE_INLINE TAO_DII_Reply_Handler_ptr & -TAO_DII_Reply_Handler_var::out (void) +TAO_DII_Reply_Handler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_DII_Reply_Handler::_nil (); @@ -101,7 +101,7 @@ TAO_DII_Reply_Handler_var::out (void) } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::_retn (void) +TAO_DII_Reply_Handler_var::_retn () { // yield ownership TAO_DII_Reply_Handler_ptr val = this->ptr_; diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 2a1c368d58b..5d9e7136aea 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -33,35 +33,35 @@ CORBA::Request::operation () const // Return the arguments for the request. ACE_INLINE CORBA::NVList_ptr -CORBA::Request::arguments (void) +CORBA::Request::arguments () { return this->args_; } // Return the result for the request. ACE_INLINE CORBA::NamedValue_ptr -CORBA::Request::result (void) +CORBA::Request::result () { return this->result_; } // Return the exceptions resulting from this request. ACE_INLINE CORBA::ExceptionList_ptr -CORBA::Request::exceptions (void) +CORBA::Request::exceptions () { return this->exceptions_.in (); } // Return the request's contexts ACE_INLINE CORBA::ContextList_ptr -CORBA::Request::contexts (void) +CORBA::Request::contexts () { return this->contexts_; } // The argument manipulation helper functions ACE_INLINE CORBA::Any & -CORBA::Request::add_in_arg (void) +CORBA::Request::add_in_arg () { return this->args_->add_element (CORBA::ARG_IN)->any_; } @@ -73,7 +73,7 @@ CORBA::Request::add_in_arg (const CORBA::Char *name) } ACE_INLINE CORBA::Any & -CORBA::Request::add_inout_arg (void) +CORBA::Request::add_inout_arg () { return this->args_->add_element (CORBA::ARG_INOUT)->any_; } @@ -85,7 +85,7 @@ CORBA::Request::add_inout_arg (const CORBA::Char *name) } ACE_INLINE CORBA::Any & -CORBA::Request::add_out_arg (void) +CORBA::Request::add_out_arg () { return this->args_->add_element (CORBA::ARG_OUT)->any_; } @@ -147,13 +147,13 @@ CORBA::Request::raw_user_exception (TAO_InputCDR &cdr) } ACE_INLINE ACE_CString & -CORBA::Request::raw_user_exception (void) +CORBA::Request::raw_user_exception () { return this->raw_user_exception_; } ACE_INLINE CORBA::Boolean -CORBA::Request::response_received (void) +CORBA::Request::response_received () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 13efdb7d4fb..25bd3df8d45 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -55,7 +55,7 @@ CORBA::ServerRequest::_tao_reply_byte_order (int byte_order) } ACE_INLINE TAO_ServerRequest & -CORBA::ServerRequest::_tao_server_request (void) +CORBA::ServerRequest::_tao_server_request () { return this->orb_server_request_; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl index f12a2537209..54b0390fb81 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl @@ -2,7 +2,7 @@ // **************************************************************** ACE_INLINE -TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (void) +TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint () : any_ (0) { } diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index 8119ff6643b..cd93ab8f352 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -76,7 +76,7 @@ public: /** * @return The next endpoint in the list, if any. */ - virtual TAO_Endpoint *next (void) = 0; + virtual TAO_Endpoint *next () = 0; /** * Return the next endpoint in the list, but use protocol-specific diff --git a/TAO/tao/Fault_Tolerance_Service.inl b/TAO/tao/Fault_Tolerance_Service.inl index ef19160391b..832bf39de0d 100644 --- a/TAO/tao/Fault_Tolerance_Service.inl +++ b/TAO/tao/Fault_Tolerance_Service.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Service_Callbacks * -TAO_Fault_Tolerance_Service::service_callback (void) +TAO_Fault_Tolerance_Service::service_callback () { return this->ft_service_callback_; } diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 9f7ac53d101..c6afd417205 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -44,7 +44,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.inout (); } @@ -65,7 +65,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.out (); } @@ -77,7 +77,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: -Ret_Fixed_Array_Argument_T (void) +Ret_Fixed_Array_Argument_T () {} template<typename S_var, @@ -85,7 +85,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg () { return this->x_._retn_arg (); } @@ -95,7 +95,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -105,7 +105,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index 09a8bd2d4c6..e1d79d3bbce 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -42,7 +42,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return *this->x_; } @@ -62,7 +62,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -73,7 +73,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>:: -Ret_Fixed_Size_Argument_T (void) +Ret_Fixed_Size_Argument_T () { } @@ -81,7 +81,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -90,7 +90,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp () { return this->x_; } @@ -99,7 +99,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl index 4d38b855e10..b32a26cda9b 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.inl +++ b/TAO/tao/GIOP_Message_Locate_Header.inl @@ -31,19 +31,19 @@ TAO_GIOP_Locate_Request_Header::object_key () const } ACE_INLINE TAO::ObjectKey & -TAO_GIOP_Locate_Request_Header::object_key (void) +TAO_GIOP_Locate_Request_Header::object_key () { return this->profile_.object_key (); } ACE_INLINE TAO_Tagged_Profile & -TAO_GIOP_Locate_Request_Header::profile (void) +TAO_GIOP_Locate_Request_Header::profile () { return this->profile_; } ACE_INLINE TAO_InputCDR & -TAO_GIOP_Locate_Request_Header::incoming_stream (void) +TAO_GIOP_Locate_Request_Header::incoming_stream () { return *this->incoming_; } diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index efdba8c1a79..2add83bc660 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -54,7 +54,7 @@ namespace TAO * Please note that this call is NOT synchronized. Left to the * higher level versions to synchronize access. */ - virtual ACE_Reactor *get_reactor (void) ; + virtual ACE_Reactor *get_reactor () ; /** * Reclaim the reactor if allocated by this factory. @@ -69,7 +69,7 @@ namespace TAO * Please note that this call is NOT synchronized. Left to the * get_reactor() to synchronize access. */ - virtual ACE_Reactor_Impl *reactor_impl (void) = 0; + virtual ACE_Reactor_Impl *reactor_impl () = 0; private: /** diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl index b5ca077b2aa..2b9ce3418e7 100644 --- a/TAO/tao/IIOP_Acceptor.inl +++ b/TAO/tao/IIOP_Acceptor.inl @@ -17,7 +17,7 @@ TAO_IIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_IIOP_Acceptor::endpoints (void) +TAO_IIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl index 645750acf18..2a8ad1ac007 100644 --- a/TAO/tao/IORInterceptor/IORInfo.inl +++ b/TAO/tao/IORInterceptor/IORInfo.inl @@ -3,13 +3,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_IORInfo::invalidate (void) +TAO_IORInfo::invalidate () { this->poa_ = 0; } ACE_INLINE void -TAO_IORInfo::components_established (void) +TAO_IORInfo::components_established () { this->components_established_ = true; } diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index 2ad58f50390..c963caeda4e 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -41,7 +41,7 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory public: virtual ~TAO_IORInterceptor_Adapter_Factory (); - virtual TAO_IORInterceptor_Adapter * create (void) = 0; + virtual TAO_IORInterceptor_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h index 4f57a752bdd..e5ce2e137a6 100644 --- a/TAO/tao/IORTable/Async_IOR_Table_Impl.h +++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h @@ -41,7 +41,7 @@ public: TAO_Async_IOR_Table_Impl (); virtual ~TAO_Async_IOR_Table_Impl (); - virtual bool async_available (void) { return true; } + virtual bool async_available () { return true; } virtual void async_find (::IORTable::Locate_ResponseHandler rh, const char *object_key); diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl index 0049174c13a..129c89310ba 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.inl +++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl @@ -15,7 +15,7 @@ TAO_AMH_Locate_ResponseHandler::_duplicate (TAO_AMH_Locate_ResponseHandler_ptr x // Inline operations for class TAO_AMH_Locate_ResponseHandler_var ACE_INLINE -TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (void) +TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var () : ptr_ (TAO_AMH_Locate_ResponseHandler::_nil ()) { } @@ -26,7 +26,7 @@ TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_ {} ACE_INLINE -TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void) +TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var () { CORBA::release(ptr_); } @@ -86,13 +86,13 @@ TAO_AMH_Locate_ResponseHandler_var::in () const } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr & -TAO_AMH_Locate_ResponseHandler_var::inout (void) +TAO_AMH_Locate_ResponseHandler_var::inout () { return this->ptr_; } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr & -TAO_AMH_Locate_ResponseHandler_var::out (void) +TAO_AMH_Locate_ResponseHandler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_AMH_Locate_ResponseHandler::_nil (); @@ -100,7 +100,7 @@ TAO_AMH_Locate_ResponseHandler_var::out (void) } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::_retn (void) +TAO_AMH_Locate_ResponseHandler_var::_retn () { // yield ownership TAO_AMH_Locate_ResponseHandler_ptr val = this->ptr_; diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl index 336e713d1d7..bf378bd9a0e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) +TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base () : refcount_(1) {} @@ -11,7 +11,7 @@ TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) +TAO_Intrusive_Ref_Count_Base<T>::_add_ref () { ++this->refcount_; } @@ -20,7 +20,7 @@ TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void) +TAO_Intrusive_Ref_Count_Base<T>::_remove_ref () { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl index c06193db780..ef37073a8b2 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void) +TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle () : ptr_(0) { } diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.inl b/TAO/tao/Intrusive_Ref_Count_Object_T.inl index 818e51e2faa..6f5705d854f 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename OBJ, typename ACE_LOCK> ACE_INLINE -TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object (void) +TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object () {} template <typename OBJ, typename ACE_LOCK> diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index 17e2988230e..b60e6fc44d1 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -17,13 +17,13 @@ namespace TAO } ACE_INLINE CORBA::Object_ptr - Invocation_Base::forwarded_reference (void) + Invocation_Base::forwarded_reference () { return CORBA::Object::_duplicate (this->forwarded_to_.in ()); } ACE_INLINE CORBA::Object_ptr - Invocation_Base::steal_forwarded_reference (void) + Invocation_Base::steal_forwarded_reference () { this->reply_status_ = GIOP::NO_EXCEPTION; return this->forwarded_to_._retn (); @@ -60,20 +60,20 @@ namespace TAO } ACE_INLINE TAO_Operation_Details & - Invocation_Base::operation_details (void) + Invocation_Base::operation_details () { return this->details_; } #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE size_t & - Invocation_Base::stack_size (void) + Invocation_Base::stack_size () { return this->stack_size_; } ACE_INLINE CORBA::Exception * - Invocation_Base::caught_exception (void) + Invocation_Base::caught_exception () { return this->caught_exception_; } diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index 57ca9424aca..877dd2526cf 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -14,7 +14,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper ( } ACE_INLINE -TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void) +TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper () { int const call_reset = (this->event_loop_return_ == 0); this->lf_strategy_.reset_event_loop_thread (call_reset, diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl index 907a90ebea0..d96c60fe1a3 100644 --- a/TAO/tao/LF_Follower.inl +++ b/TAO/tao/LF_Follower.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Leader_Follower & -TAO_LF_Follower::leader_follower (void) +TAO_LF_Follower::leader_follower () { return this->leader_follower_; } diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl index 06586ae2fa0..bd91b66420f 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.inl +++ b/TAO/tao/LF_Follower_Auto_Ptr.inl @@ -9,19 +9,19 @@ TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf) } ACE_INLINE TAO_LF_Follower * -TAO_LF_Follower_Auto_Ptr::get (void) +TAO_LF_Follower_Auto_Ptr::get () { return this->follower_; } ACE_INLINE TAO_LF_Follower * -TAO_LF_Follower_Auto_Ptr::operator-> (void) +TAO_LF_Follower_Auto_Ptr::operator-> () { return this->follower_; } ACE_INLINE -TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void) +TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * () { return this->follower_; } diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 02586bbac00..e7555173d32 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -96,11 +96,11 @@ public: /// The current thread has become the leader thread in the /// client side leader-follower set. - void set_client_leader_thread (void) ; + void set_client_leader_thread (); /// The current thread is no longer the leader thread in the client /// side leader-follower set. - void reset_client_leader_thread (void) ; + void reset_client_leader_thread (); /// Sets the thread ID of the leader thread in the leader-follower /// model diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl index c49cb5d2bb4..104bd0a5fa0 100644 --- a/TAO/tao/Leader_Follower.inl +++ b/TAO/tao/Leader_Follower.inl @@ -29,7 +29,7 @@ TAO_Leader_Follower::get_tss_resources () const } ACE_INLINE void -TAO_Leader_Follower::set_avoid_client_leader (void) +TAO_Leader_Follower::set_avoid_client_leader () { this->avoid_client_leader_ = true; } @@ -41,7 +41,7 @@ TAO_Leader_Follower::follower_available () const } ACE_INLINE bool -TAO_Leader_Follower::no_leaders_available (void) +TAO_Leader_Follower::no_leaders_available () { if (this->new_leader_generator_) return this->new_leader_generator_->no_leaders_available (); @@ -49,7 +49,7 @@ TAO_Leader_Follower::no_leaders_available (void) } ACE_INLINE int -TAO_Leader_Follower::elect_new_leader (void) +TAO_Leader_Follower::elect_new_leader () { if (this->leaders_ == 0) { @@ -119,7 +119,7 @@ TAO_Leader_Follower::reset_event_loop_thread_i (TAO_ORB_Core_TSS_Resources *tss) } ACE_INLINE void -TAO_Leader_Follower::reset_event_loop_thread (void) +TAO_Leader_Follower::reset_event_loop_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss->event_loop_thread_ > 0) @@ -127,13 +127,13 @@ TAO_Leader_Follower::reset_event_loop_thread (void) } ACE_INLINE TAO_SYNCH_MUTEX & -TAO_Leader_Follower::lock (void) +TAO_Leader_Follower::lock () { return this->lock_; } ACE_INLINE void -TAO_Leader_Follower::set_upcall_thread (void) +TAO_Leader_Follower::set_upcall_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); @@ -164,7 +164,7 @@ TAO_Leader_Follower::leader_available () const } ACE_INLINE void -TAO_Leader_Follower::set_client_leader_thread (void) +TAO_Leader_Follower::set_client_leader_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); ++this->leaders_; @@ -173,7 +173,7 @@ TAO_Leader_Follower::set_client_leader_thread (void) } ACE_INLINE void -TAO_Leader_Follower::reset_client_leader_thread (void) +TAO_Leader_Follower::reset_client_leader_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); // We may be called twice when we gave up leadership from @@ -207,7 +207,7 @@ TAO_Leader_Follower::remove_follower (TAO_LF_Follower *follower) } ACE_INLINE ACE_Reverse_Lock<TAO_SYNCH_MUTEX> & -TAO_Leader_Follower::reverse_lock (void) +TAO_Leader_Follower::reverse_lock () { return this->reverse_lock_; } @@ -234,7 +234,7 @@ TAO_LF_Client_Thread_Helper::TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &l } ACE_INLINE -TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper (void) +TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper () { this->leader_follower_.reset_client_thread (); } @@ -247,7 +247,7 @@ TAO_LF_Client_Leader_Thread_Helper::TAO_LF_Client_Leader_Thread_Helper (TAO_Lead } ACE_INLINE -TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void) +TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper () { this->leader_follower_.reset_client_leader_thread (); } diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl index 7d2715b166e..63da214f852 100644 --- a/TAO/tao/LocalObject.inl +++ b/TAO/tao/LocalObject.inl @@ -34,7 +34,7 @@ CORBA::LocalObject::_narrow (CORBA::Object_ptr obj) } ACE_INLINE -CORBA::LocalObject::LocalObject (void) +CORBA::LocalObject::LocalObject () : Object (0) { } diff --git a/TAO/tao/MCAST_Parser.inl b/TAO/tao/MCAST_Parser.inl index db49f4704a8..deb0827869c 100644 --- a/TAO/tao/MCAST_Parser.inl +++ b/TAO/tao/MCAST_Parser.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_MCAST_Parser::TAO_MCAST_Parser (void) +TAO_MCAST_Parser::TAO_MCAST_Parser () : mcast_address_ () , mcast_port_ (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT) , mcast_nic_ () diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl index 83707de5eef..985b10ab1b3 100644 --- a/TAO/tao/MProfile.inl +++ b/TAO/tao/MProfile.inl @@ -39,7 +39,7 @@ TAO_MProfile::operator= (const TAO_MProfile& rhs) /// Cyclic get next. It will simply cycle through the complete list. ACE_INLINE TAO_Profile * -TAO_MProfile::get_cnext (void) +TAO_MProfile::get_cnext () { if (last_ == 0) return 0; @@ -53,7 +53,7 @@ TAO_MProfile::get_cnext (void) /// This will return the next element until either null is found or the /// end of list. It then continues to return NULL until rewind. ACE_INLINE TAO_Profile * -TAO_MProfile::get_next (void) +TAO_MProfile::get_next () { // Nolist or EndOfList if (last_ == 0 || current_ == last_) @@ -63,7 +63,7 @@ TAO_MProfile::get_next (void) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_cprev (void) +TAO_MProfile::get_cprev () { if (last_ == 0) return 0; @@ -78,7 +78,7 @@ TAO_MProfile::get_cprev (void) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_prev (void) +TAO_MProfile::get_prev () { if (last_ == 0 || current_ <= 1) // No List of BeginningOfList @@ -100,7 +100,7 @@ TAO_MProfile::get_profile (TAO_PHandle handle) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_current_profile (void) +TAO_MProfile::get_current_profile () { if (last_ == 0) return 0; @@ -112,7 +112,7 @@ TAO_MProfile::get_current_profile (void) } ACE_INLINE TAO_PHandle -TAO_MProfile::get_current_handle (void) +TAO_MProfile::get_current_handle () { if (current_ > 0) return current_ - 1; @@ -130,7 +130,7 @@ TAO_MProfile::get_current_handle () const } ACE_INLINE void -TAO_MProfile::rewind (void) +TAO_MProfile::rewind () { current_ = 0; } @@ -158,7 +158,7 @@ TAO_MProfile::forward_from (TAO_MProfile *from) ACE_INLINE TAO_MProfile * -TAO_MProfile::forward_from (void) +TAO_MProfile::forward_from () { return this->forward_from_; } diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h index 13e11e15785..e77d57587aa 100644 --- a/TAO/tao/New_Leader_Generator.h +++ b/TAO/tao/New_Leader_Generator.h @@ -38,7 +38,7 @@ public: /// Leader/Follower class uses this method to notify the system that /// we are out of leaders. - virtual bool no_leaders_available (void) = 0; + virtual bool no_leaders_available () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h index fa8fb0c5beb..820187de548 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.h +++ b/TAO/tao/Null_Fragmentation_Strategy.h @@ -40,7 +40,7 @@ class TAO_Null_Fragmentation_Strategy : public TAO_GIOP_Fragmentation_Strategy { public: - TAO_Null_Fragmentation_Strategy (void) {} + TAO_Null_Fragmentation_Strategy () {} virtual ~TAO_Null_Fragmentation_Strategy (); virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 81e5633180d..07bc49d43dd 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -95,7 +95,7 @@ namespace CORBA typedef CORBA::ULong PolicyType; - // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'. + // TODO - implement OMG's 'ORBid CORBA::ORB::id ()'. typedef TAO_VarSeq_Var_T< diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index e66f3a52033..3d52dce87ab 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // --------------------------------------------------------------------------- ACE_INLINE ACE_Time_Value * -CORBA::ORB::get_timeout (void) +CORBA::ORB::get_timeout () { return this->timeout_; } @@ -68,7 +68,7 @@ CORBA::ORB::_use_omg_ior_format (CORBA::Boolean ior) } ACE_INLINE CORBA::Boolean -CORBA::ORB::_use_omg_ior_format (void) +CORBA::ORB::_use_omg_ior_format () { return this->use_omg_ior_format_; } diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 2b2091241ac..acf22b2eb44 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -11,7 +11,7 @@ TAO_ORB_Core::configuration () const } ACE_INLINE unsigned long -TAO_ORB_Core::_incr_refcnt (void) +TAO_ORB_Core::_incr_refcnt () { return this->refcount_++; } @@ -23,7 +23,7 @@ TAO_ORB_Core::_refcnt () const } ACE_INLINE unsigned long -TAO_ORB_Core::_decr_refcnt (void) +TAO_ORB_Core::_decr_refcnt () { unsigned long const count = --this->refcount_; if (count != 0) @@ -34,7 +34,7 @@ TAO_ORB_Core::_decr_refcnt (void) } ACE_INLINE ACE_Lock * -TAO_ORB_Core::locking_strategy (void) +TAO_ORB_Core::locking_strategy () { if (this->resource_factory ()->use_locked_data_blocks ()) return &this->data_block_lock_; @@ -43,7 +43,7 @@ TAO_ORB_Core::locking_strategy (void) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::bidir_giop_policy (void) +TAO_ORB_Core::bidir_giop_policy () { return this->bidir_giop_policy_; } @@ -55,31 +55,31 @@ TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val) } ACE_INLINE TAO_Object_Ref_Table & -TAO_ORB_Core::object_ref_table (void) +TAO_ORB_Core::object_ref_table () { return this->object_ref_table_; } ACE_INLINE TAO::ObjectKey_Table & -TAO_ORB_Core::object_key_table (void) +TAO_ORB_Core::object_key_table () { return this->object_key_table_; } ACE_INLINE TAO_Flushing_Strategy * -TAO_ORB_Core::flushing_strategy (void) +TAO_ORB_Core::flushing_strategy () { return this->flushing_strategy_; } ACE_INLINE TAO_Protocols_Hooks * -TAO_ORB_Core::get_protocols_hooks (void) +TAO_ORB_Core::get_protocols_hooks () { return this->protocols_hooks_; } ACE_INLINE TAO_Network_Priority_Protocols_Hooks * -TAO_ORB_Core::get_network_priority_protocols_hooks (void) +TAO_ORB_Core::get_network_priority_protocols_hooks () { return this->network_priority_protocols_hooks_; } @@ -142,43 +142,43 @@ TAO_ORB_Core::hash_service (TAO_Profile *p, CORBA::ULong m) } ACE_INLINE TAO_Fault_Tolerance_Service & -TAO_ORB_Core::fault_tolerance_service (void) +TAO_ORB_Core::fault_tolerance_service () { return this->ft_service_; } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::ft_send_extended_sc (void) +TAO_ORB_Core::ft_send_extended_sc () { return this->ft_send_extended_sc_; } ACE_INLINE ACE_Thread_Manager * -TAO_ORB_Core::thr_mgr (void) +TAO_ORB_Core::thr_mgr () { return &this->tm_; } ACE_INLINE CORBA::ORB_ptr -TAO_ORB_Core::orb (void) +TAO_ORB_Core::orb () { return this->orb_; } ACE_INLINE TAO_Adapter_Registry & -TAO_ORB_Core::adapter_registry (void) +TAO_ORB_Core::adapter_registry () { return this->adapter_registry_; } ACE_INLINE TAO_Request_Dispatcher * -TAO_ORB_Core::request_dispatcher (void) +TAO_ORB_Core::request_dispatcher () { return this->request_dispatcher_; } ACE_INLINE TAO_ORB_Core::InitRefMap * -TAO_ORB_Core::init_ref_map (void) +TAO_ORB_Core::init_ref_map () { return &this->init_ref_map_; } @@ -228,7 +228,7 @@ TAO_ORB_Core::get_collocation_strategy () const } ACE_INLINE TAO_ORB_Parameters * -TAO_ORB_Core::orb_params(void) +TAO_ORB_Core::orb_params() { return &(this->orb_params_); } @@ -239,13 +239,13 @@ TAO_ORB_Core::orb_params(void) : (this->member##_)) ACE_INLINE TAO_ProtocolFactorySet * -TAO_ORB_Core::protocol_factories (void) +TAO_ORB_Core::protocol_factories () { return TAO_OC_RETRIEVE (protocol_factories); } ACE_INLINE TAO_Parser_Registry * -TAO_ORB_Core::parser_registry (void) +TAO_ORB_Core::parser_registry () { return &this->parser_registry_; } @@ -255,7 +255,7 @@ TAO_ORB_Core::parser_registry (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Manager * -TAO_ORB_Core::policy_manager (void) +TAO_ORB_Core::policy_manager () { return this->policy_manager_; } @@ -263,7 +263,7 @@ TAO_ORB_Core::policy_manager (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE TAO_ORB_Core_TSS_Resources* -TAO_ORB_Core::get_tss_resources (void) +TAO_ORB_Core::get_tss_resources () { return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources); } @@ -353,19 +353,19 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::use_implrepo (void) +TAO_ORB_Core::use_implrepo () { return use_implrepo_; } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::imr_endpoints_in_ior (void) +TAO_ORB_Core::imr_endpoints_in_ior () { return imr_endpoints_in_ior_; } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_typecodefactory (void) +TAO_ORB_Core::resolve_typecodefactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -379,7 +379,7 @@ TAO_ORB_Core::resolve_typecodefactory (void) #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_picurrent (void) +TAO_ORB_Core::resolve_picurrent () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -393,7 +393,7 @@ TAO_ORB_Core::resolve_picurrent (void) #endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_codecfactory (void) +TAO_ORB_Core::resolve_codecfactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -405,7 +405,7 @@ TAO_ORB_Core::resolve_codecfactory (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_compression_manager (void) +TAO_ORB_Core::resolve_compression_manager () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -464,7 +464,7 @@ TAO_ORB_Core::orbinitializer_registry () } ACE_INLINE TAO_Service_Context_Registry & -TAO_ORB_Core::service_context_registry (void) +TAO_ORB_Core::service_context_registry () { return this->service_context_registry_; } @@ -482,7 +482,7 @@ TAO_ORB_Core::policy_factory_registry () } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_dynanyfactory (void) +TAO_ORB_Core::resolve_dynanyfactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -494,7 +494,7 @@ TAO_ORB_Core::resolve_dynanyfactory (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_manipulation (void) +TAO_ORB_Core::resolve_ior_manipulation () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -506,7 +506,7 @@ TAO_ORB_Core::resolve_ior_manipulation (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_table (void) +TAO_ORB_Core::resolve_ior_table () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -518,7 +518,7 @@ TAO_ORB_Core::resolve_ior_table (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_async_ior_table (void) +TAO_ORB_Core::resolve_async_ior_table () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -530,7 +530,7 @@ TAO_ORB_Core::resolve_async_ior_table (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_monitor (void) +TAO_ORB_Core::resolve_monitor () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -546,7 +546,7 @@ TAO_ORB_Core::resolve_monitor (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Current & -TAO_ORB_Core::policy_current (void) +TAO_ORB_Core::policy_current () { return *this->policy_current_; } @@ -554,7 +554,7 @@ TAO_ORB_Core::policy_current (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_poa_current (void) +TAO_ORB_Core::resolve_poa_current () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -568,7 +568,7 @@ TAO_ORB_Core::resolve_poa_current (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Set * -TAO_ORB_Core::get_default_policies (void) +TAO_ORB_Core::get_default_policies () { return this->default_policies_; } @@ -577,7 +577,7 @@ TAO_ORB_Core::get_default_policies (void) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_rt_orb (void) +TAO_ORB_Core::resolve_rt_orb () { if (CORBA::is_nil (this->rt_orb_.in ())) { @@ -598,7 +598,7 @@ TAO_ORB_Core::resolve_rt_orb (void) #if (TAO_HAS_INTERCEPTORS == 1) ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::pi_current (void) +TAO_ORB_Core::pi_current () { // A pointer/reference to PICurrent is cached in the ORB Core since // it is accessed in the critical path (i.e. the request invocation @@ -616,13 +616,13 @@ TAO_ORB_Core::pi_current (CORBA::Object_ptr current) } ACE_INLINE TAO::ClientRequestInterceptor_Adapter * -TAO_ORB_Core::clientrequestinterceptor_adapter (void) +TAO_ORB_Core::clientrequestinterceptor_adapter () { return this->client_request_interceptor_adapter_; } ACE_INLINE TAO::ServerRequestInterceptor_Adapter * -TAO_ORB_Core::serverrequestinterceptor_adapter (void) +TAO_ORB_Core::serverrequestinterceptor_adapter () { return this->server_request_interceptor_adapter_; } @@ -657,7 +657,7 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook) ACE_INLINE Messaging::SyncScope -TAO_ORB_Core::default_sync_scope (void) +TAO_ORB_Core::default_sync_scope () { return this->default_sync_scope_; } diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index a44313f7874..5381056e570 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -15,7 +15,7 @@ TAO_ORB_Core_Auto_Ptr::get () const } ACE_INLINE TAO_ORB_Core * -TAO_ORB_Core_Auto_Ptr::release (void) +TAO_ORB_Core_Auto_Ptr::release () { TAO_ORB_Core *old = this->p_; this->p_ = 0; diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl index 8994755cbb4..cb896f50cf6 100644 --- a/TAO/tao/ORB_Table.inl +++ b/TAO/tao/ORB_Table.inl @@ -6,32 +6,32 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ::TAO_ORB_Core * -TAO::ORB_Table::first_orb (void) +TAO::ORB_Table::first_orb () { return this->first_orb_; } ACE_INLINE TAO::ORB_Table::iterator -TAO::ORB_Table::begin (void) +TAO::ORB_Table::begin () { return this->table_.begin (); } ACE_INLINE TAO::ORB_Table::iterator -TAO::ORB_Table::end (void) +TAO::ORB_Table::end () { return this->table_.end (); } /// Accessor to the underlying table_ ACE_INLINE TAO::ORB_Table::Table * -TAO::ORB_Table::table (void) +TAO::ORB_Table::table () { return &this->table_; } ACE_INLINE TAO_SYNCH_MUTEX & -TAO::ORB_Table::lock (void) +TAO::ORB_Table::lock () { return this->lock_; } @@ -39,7 +39,7 @@ TAO::ORB_Table::lock (void) // **************************************************************** ACE_INLINE -TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (void) +TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter () : core_ (0) { } @@ -58,7 +58,7 @@ TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (::TAO_ORB_Core * core) } ACE_INLINE -TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter (void) +TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter () { if (this->core_) (void) this->core_->_decr_refcnt (); // Should never throw. diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index 06bb71e0764..f54fa40f739 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -42,7 +42,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void) +TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg () { return this->x_; } @@ -62,7 +62,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_out -TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void) +TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg () { return this->x_; } @@ -73,7 +73,7 @@ template<typename S_ptr, typename S_var, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T () {} template<typename S_ptr, @@ -81,7 +81,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.out (); } @@ -91,7 +91,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -101,7 +101,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index 1f053542e9d..c69c8fbf510 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) +TAO_Object_Ref_Table::TAO_Object_Ref_Table () : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE) , lock_ () { @@ -21,7 +21,7 @@ TAO_Object_Ref_Table::find_i (const char *id) } ACE_INLINE void -TAO_Object_Ref_Table::destroy (void) +TAO_Object_Ref_Table::destroy () { Table tmp; @@ -33,13 +33,13 @@ TAO_Object_Ref_Table::destroy (void) } ACE_INLINE TAO_Object_Ref_Table::iterator -TAO_Object_Ref_Table::begin (void) +TAO_Object_Ref_Table::begin () { return this->table_.begin (); } ACE_INLINE TAO_Object_Ref_Table::iterator -TAO_Object_Ref_Table::end (void) +TAO_Object_Ref_Table::end () { return this->table_.end (); } diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl index 04a89167a0d..2e55e442c79 100644 --- a/TAO/tao/PI/ClientRequestDetails.inl +++ b/TAO/tao/PI/ClientRequestDetails.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ClientRequestDetails::ClientRequestDetails (void) + ClientRequestDetails::ClientRequestDetails () : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) { } diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl index c8e3770dccd..561aa6c284e 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl (void) + ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl () { } } diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index 6dbf4a37bdf..9a4e71b5a58 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -9,7 +9,7 @@ TAO_ORBInitInfo::orb_core () const } ACE_INLINE void -TAO_ORBInitInfo::invalidate (void) +TAO_ORBInitInfo::invalidate () { this->orb_core_ = 0; } diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl index 741f4e88481..bc039b36ffe 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.inl +++ b/TAO/tao/PI_Server/ServerRequestDetails.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ServerRequestDetails::ServerRequestDetails (void) + ServerRequestDetails::ServerRequestDetails () : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) { } diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 836e40c0572..b8fcfc01812 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -44,7 +44,7 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj) } ACE_INLINE TAO_ServerRequest & -TAO::ServerRequestInfo::server_request (void) +TAO::ServerRequestInfo::server_request () { return this->server_request_; } diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl index e067d668d8f..aaef69fee3a 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.inl +++ b/TAO/tao/Pluggable_Messaging_Utils.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) +TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base () : svc_ctx_ (), request_id_ (0), is_dsi_ (0), @@ -47,7 +47,7 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned ( } ACE_INLINE IOP::ServiceContextList & -TAO_Pluggable_Reply_Params_Base::service_context_notowned (void) +TAO_Pluggable_Reply_Params_Base::service_context_notowned () { return *this->service_context_; } diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl index 7342464a589..3cb318f2544 100644 --- a/TAO/tao/Policy_Current.inl +++ b/TAO/tao/Policy_Current.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Current::TAO_Policy_Current (void) +TAO_Policy_Current::TAO_Policy_Current () { } diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl index b946ea2f974..032654f700e 100644 --- a/TAO/tao/Policy_Current_Impl.inl +++ b/TAO/tao/Policy_Current_Impl.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) +TAO_Policy_Current_Impl::TAO_Policy_Current_Impl () : manager_impl_ (TAO_POLICY_THREAD_SCOPE) { } diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl index 5d1a7f602fa..6b30f704e2c 100644 --- a/TAO/tao/Policy_Manager.inl +++ b/TAO/tao/Policy_Manager.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Manager::TAO_Policy_Manager (void) +TAO_Policy_Manager::TAO_Policy_Manager () : impl_ (TAO_POLICY_ORB_SCOPE) { } diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl index fad3a561bd3..079939283d5 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.inl +++ b/TAO/tao/PortableServer/Active_Object_Map.inl @@ -275,14 +275,14 @@ TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant) } ACE_INLINE size_t -TAO_Active_Object_Map::current_size (void) +TAO_Active_Object_Map::current_size () { return this->user_id_map_->current_size (); } /* static */ ACE_INLINE size_t -TAO_Active_Object_Map::system_id_size (void) +TAO_Active_Object_Map::system_id_size () { return TAO_Active_Object_Map::system_id_size_; } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index 61d2bb711a6..b28b53ea4a5 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -63,7 +63,7 @@ namespace TAO ACE_INLINE Active_Policy_Strategies_Cleanup_Guard - ::~Active_Policy_Strategies_Cleanup_Guard (void) + ::~Active_Policy_Strategies_Cleanup_Guard () { if (this->ptr_) { @@ -73,7 +73,7 @@ namespace TAO ACE_INLINE Active_Policy_Strategies * - Active_Policy_Strategies_Cleanup_Guard::_retn (void) + Active_Policy_Strategies_Cleanup_Guard::_retn () { Active_Policy_Strategies *temp = this->ptr_; this->ptr_ = 0; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index 6616af35a12..def47e46280 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -6,7 +6,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -In_BD_String_SArgument_T (void) +In_BD_String_SArgument_T () {} template<typename S_var, @@ -27,7 +27,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Inout_BD_String_SArgument_T (void) +Inout_BD_String_SArgument_T () {} template<typename S_var, @@ -36,7 +36,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.inout (); } @@ -48,7 +48,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Out_BD_String_SArgument_T (void) +Out_BD_String_SArgument_T () {} template<typename S_var, @@ -57,7 +57,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.out (); } @@ -69,7 +69,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Ret_BD_String_SArgument_T (void) +Ret_BD_String_SArgument_T () {} template<typename S_var, @@ -78,7 +78,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index b9d5f96a1f4..b508d924a29 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void) +TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T () {} template<typename S, @@ -21,14 +21,14 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void) +TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -38,14 +38,14 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void) +TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -55,14 +55,14 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void) +TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index 7308e632c6f..5a4785c550c 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -9,7 +9,7 @@ namespace TAO namespace Portable_Server { ACE_INLINE CORBA::ULong - Creation_Time::creation_time_length (void) + Creation_Time::creation_time_length () { return 2 * sizeof (CORBA::ULong); } @@ -22,7 +22,7 @@ namespace TAO } ACE_INLINE - Creation_Time::Creation_Time (void) + Creation_Time::Creation_Time () { this->time_stamp_[Creation_Time::SEC_FIELD] = 0; this->time_stamp_[Creation_Time::USEC_FIELD] = 0; @@ -107,7 +107,7 @@ namespace TAO } ACE_INLINE - Temporary_Creation_Time::Temporary_Creation_Time (void) + Temporary_Creation_Time::Temporary_Creation_Time () : time_stamp_ (0) { } diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 11e778ca6a9..3147aefa654 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::In_Fixed_Array_SArgument_T (void) + Insert_Policy>::In_Fixed_Array_SArgument_T () { } @@ -27,7 +27,7 @@ template<typename S_forany, ACE_INLINE TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: -Inout_Fixed_Array_SArgument_T (void) +Inout_Fixed_Array_SArgument_T () { } @@ -36,7 +36,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type * TAO::Inout_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -49,7 +49,7 @@ template<typename S_forany, ACE_INLINE TAO::Out_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: -Out_Fixed_Array_SArgument_T (void) +Out_Fixed_Array_SArgument_T () { } @@ -58,7 +58,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type * TAO::Out_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -73,7 +73,7 @@ ACE_INLINE TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Ret_Fixed_Array_SArgument_T (void) +Ret_Fixed_Array_SArgument_T () { } @@ -84,7 +84,7 @@ ACE_INLINE typename S_forany::_slice_type *& TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_._retn_arg (); } diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index c93447fbe10..59e21f17e74 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -16,7 +16,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>:: -Inout_Fixed_Size_SArgument_T (void) +Inout_Fixed_Size_SArgument_T () { } @@ -24,7 +24,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -36,14 +36,14 @@ template<typename S, ACE_INLINE TAO::Out_Fixed_Size_SArgument_T<S, Insert_Policy>:: -Out_Fixed_Size_SArgument_T (void) +Out_Fixed_Size_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -53,14 +53,14 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void) +TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 603fac7b612..7acba182498 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -5,31 +5,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Policy_Validator & -TAO_Object_Adapter::validator (void) +TAO_Object_Adapter::validator () { return this->default_validator_; } ACE_INLINE TAO_POA_Policy_Set & -TAO_Object_Adapter::default_poa_policies (void) +TAO_Object_Adapter::default_poa_policies () { return this->default_poa_policies_; } ACE_INLINE ACE_Lock & -TAO_Object_Adapter::lock (void) +TAO_Object_Adapter::lock () { return *this->lock_; } ACE_INLINE TAO_SYNCH_MUTEX & -TAO_Object_Adapter::thread_lock (void) +TAO_Object_Adapter::thread_lock () { return this->thread_lock_; } ACE_INLINE ACE_Reverse_Lock<ACE_Lock> & -TAO_Object_Adapter::reverse_lock (void) +TAO_Object_Adapter::reverse_lock () { return this->reverse_lock_; } diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index d7e8a6fa572..86b4ff3497e 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -19,7 +19,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: -Inout_Object_SArgument_T (void) +Inout_Object_SArgument_T () { } @@ -28,7 +28,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr& -TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.inout (); } @@ -41,7 +41,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>:: -Out_Object_SArgument_T (void) +Out_Object_SArgument_T () { } @@ -51,7 +51,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_out -TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void) +TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg () { return this->x_.out (); } @@ -63,7 +63,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: -Ret_Object_SArgument_T (void) +Ret_Object_SArgument_T () { } @@ -72,7 +72,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index 05fc7d21eb6..ed6f6683457 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Lock & -TAO_POA_Manager::lock (void) +TAO_POA_Manager::lock () { return this->lock_; } ACE_INLINE void -TAO_POA_Manager::activate (void) +TAO_POA_Manager::activate () { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -52,13 +52,13 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state_i (void) +TAO_POA_Manager::get_state_i () { return this->state_; } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (void) +TAO_POA_Manager::get_state () { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_); @@ -113,7 +113,7 @@ TAO_POA_Manager::generate_manager_id () const #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ACE_INLINE -CORBA::PolicyList& TAO_POA_Manager::get_policies (void) +CORBA::PolicyList& TAO_POA_Manager::get_policies () { return this->policies_; } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl index 26a39c0ec81..8b01c32593b 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.inl +++ b/TAO/tao/PortableServer/POA_Policy_Set.inl @@ -39,7 +39,7 @@ TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy) } ACE_INLINE TAO_Policy_Set & -TAO_POA_Policy_Set::policies (void) +TAO_POA_Policy_Set::policies () { return this->impl_; } diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index 7be5db2b0a2..73727ad3843 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr -TAO_Regular_POA::the_parent (void) +TAO_Regular_POA::the_parent () { return PortableServer::POA::_duplicate (this->parent_); } diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index e3dabccb7ac..8e7290de43d 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -2,37 +2,37 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_Root_POA::cleanup_in_progress (void) +TAO_Root_POA::cleanup_in_progress () { return this->cleanup_in_progress_; } ACE_INLINE ACE_Lock & -TAO_Root_POA::lock (void) +TAO_Root_POA::lock () { return this->lock_; } ACE_INLINE TAO_POA_Policy_Set & -TAO_Root_POA::policies (void) +TAO_Root_POA::policies () { return this->policies_; } ACE_INLINE PortableServer::POA_ptr -TAO_Root_POA::the_parent (void) +TAO_Root_POA::the_parent () { return PortableServer::POA::_nil (); } ACE_INLINE PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name (void) +TAO_Root_POA::adapter_name () { return this->adapter_name_i (); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * -TAO_Root_POA::get_adapter_template (void) +TAO_Root_POA::get_adapter_template () { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -56,7 +56,7 @@ TAO_Root_POA::get_adapter_template_i () } ACE_INLINE PortableInterceptor::ObjectReferenceFactory * -TAO_Root_POA::get_obj_ref_factory (void) +TAO_Root_POA::get_obj_ref_factory () { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -69,13 +69,13 @@ TAO_Root_POA::get_obj_ref_factory (void) } ACE_INLINE CORBA::Boolean -TAO_Root_POA::system_id (void) +TAO_Root_POA::system_id () { return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID); } ACE_INLINE CORBA::Boolean -TAO_Root_POA::persistent (void) +TAO_Root_POA::persistent () { return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT); } @@ -87,7 +87,7 @@ TAO_Root_POA::name () const } ACE_INLINE char * -TAO_Root_POA::the_name (void) +TAO_Root_POA::the_name () { return CORBA::string_dup (this->name_.c_str ()); } @@ -105,73 +105,73 @@ TAO_Root_POA::system_name () const } ACE_INLINE char -TAO_Root_POA::name_separator (void) +TAO_Root_POA::name_separator () { return '\0'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::name_separator_length (void) +TAO_Root_POA::name_separator_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::persistent_key_char (void) +TAO_Root_POA::persistent_key_char () { return 'P'; } ACE_INLINE char -TAO_Root_POA::transient_key_char (void) +TAO_Root_POA::transient_key_char () { return 'T'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::persistent_key_type_length (void) +TAO_Root_POA::persistent_key_type_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::system_id_key_char (void) +TAO_Root_POA::system_id_key_char () { return 'S'; } ACE_INLINE char -TAO_Root_POA::user_id_key_char (void) +TAO_Root_POA::user_id_key_char () { return 'U'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::system_id_key_type_length (void) +TAO_Root_POA::system_id_key_type_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::root_key_char (void) +TAO_Root_POA::root_key_char () { return 'R'; } ACE_INLINE char -TAO_Root_POA::non_root_key_char (void) +TAO_Root_POA::non_root_key_char () { return 'N'; } ACE_INLINE char -TAO_Root_POA::root_key_type (void) +TAO_Root_POA::root_key_type () { return TAO_Root_POA::root_key_char (); } ACE_INLINE CORBA::ULong -TAO_Root_POA::root_key_type_length (void) +TAO_Root_POA::root_key_type_length () { return sizeof (char); } @@ -183,13 +183,13 @@ TAO_Root_POA::outstanding_requests () const } ACE_INLINE CORBA::ULong -TAO_Root_POA::increment_outstanding_requests (void) +TAO_Root_POA::increment_outstanding_requests () { return ++this->outstanding_requests_; } ACE_INLINE CORBA::ULong -TAO_Root_POA::decrement_outstanding_requests (void) +TAO_Root_POA::decrement_outstanding_requests () { return --this->outstanding_requests_; } @@ -207,7 +207,7 @@ TAO_Root_POA::orb_core () const } ACE_INLINE PortableInterceptor::AdapterState -TAO_Root_POA::get_adapter_state (void) +TAO_Root_POA::get_adapter_state () { return this->adapter_state_; } @@ -219,7 +219,7 @@ TAO_Root_POA::thread_pool () const } ACE_INLINE TAO_SYNCH_CONDITION & -TAO_Root_POA::servant_deactivation_condition (void) +TAO_Root_POA::servant_deactivation_condition () { return servant_deactivation_condition_; } diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index 7786d181e32..3b1a63f7512 100644 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp @@ -31,7 +31,7 @@ PortableServer::Servant_var<T>::_duplicate (T * p) } template <class T> -PortableServer::Servant_var<T>::~Servant_var (void) /* throw () */ +PortableServer::Servant_var<T>::~Servant_var () /* throw () */ { // Unfortunately, there is no throw spec on _remove_ref, so we // can't assume that it will not throw. If it does, then we are in diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index 8b27ee076d7..c3a78412637 100644 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl @@ -88,14 +88,14 @@ PortableServer::Servant_var<T>::in () const template <class T> ACE_INLINE T *& -PortableServer::Servant_var<T>::inout (void) +PortableServer::Servant_var<T>::inout () { return this->ptr_; } template <class T> ACE_INLINE T *& -PortableServer::Servant_var<T>::out (void) +PortableServer::Servant_var<T>::out () { PortableServer::Servant_var<T> tmp; this->swap (tmp); @@ -104,7 +104,7 @@ PortableServer::Servant_var<T>::out (void) template <class T> ACE_INLINE T * -PortableServer::Servant_var<T>::_retn (void) +PortableServer::Servant_var<T>::_retn () { T * const rval = ptr_; this->ptr_ = 0; diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index e08e74db721..96bbee514b6 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -7,7 +7,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -In_Special_Basic_SArgument_T (void) +In_Special_Basic_SArgument_T () { } @@ -30,7 +30,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Inout_Special_Basic_SArgument_T (void) +Inout_Special_Basic_SArgument_T () { } @@ -40,7 +40,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -53,7 +53,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Out_Special_Basic_SArgument_T (void) +Out_Special_Basic_SArgument_T () { } @@ -62,7 +62,7 @@ template<typename S, typename from_S, template <typename> class Insert_Policy> S & -TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -75,7 +75,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Ret_Special_Basic_SArgument_T (void) +Ret_Special_Basic_SArgument_T () { } @@ -85,7 +85,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index 1dca942a25d..20ad47f1a84 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var> ACE_INLINE -TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) +TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T () {} template<typename S, typename S_var> @@ -17,13 +17,13 @@ TAO::In_UB_String_SArgument_T<S,S_var>::arg () const template<typename S, typename S_var> ACE_INLINE -TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T (void) +TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T () {} template<typename S, typename S_var> ACE_INLINE S *& -TAO::Inout_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Inout_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.inout (); } @@ -40,7 +40,7 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::Out_UB_String_SArgument_T ( template<typename S, typename S_var> ACE_INLINE S *& -TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Out_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.out (); } @@ -49,12 +49,12 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void) template<typename S, typename S_var> ACE_INLINE -TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T (void) +TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T () {} template<typename S, typename S_var> S *& -TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Ret_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index c4655848d33..fa47a64f158 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Array_SArgument_T<S_forany, - Insert_Policy>::In_Var_Array_SArgument_T (void) + Insert_Policy>::In_Var_Array_SArgument_T () {} template<typename S_forany, @@ -26,7 +26,7 @@ template<typename S_forany, ACE_INLINE TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>:: -Inout_Var_Array_SArgument_T (void) +Inout_Var_Array_SArgument_T () { } @@ -34,7 +34,7 @@ template<typename S_forany, template <typename> class Insert_Policy> typename S_forany::_slice_type * TAO::Inout_Var_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -49,7 +49,7 @@ ACE_INLINE TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Out_Var_Array_SArgument_T (void) +Out_Var_Array_SArgument_T () { } @@ -59,7 +59,7 @@ template<typename S_var, typename S_forany::_slice_type *& TAO::Out_Var_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_.out (); } @@ -73,7 +73,7 @@ ACE_INLINE TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Ret_Var_Array_SArgument_T (void) +Ret_Var_Array_SArgument_T () { } @@ -84,7 +84,7 @@ ACE_INLINE typename S_forany::_slice_type *& TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 015c9c1c053..fb2426aeb5b 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -14,14 +14,14 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void) +TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -31,14 +31,14 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T (void) +TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S *& -TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_.out (); } @@ -48,7 +48,7 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T (void) +TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T () { } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl index 1ade6aa3b16..5b77b5f3272 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.inl +++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl @@ -14,14 +14,14 @@ TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T (void) +TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -31,14 +31,14 @@ TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T (void) +TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -48,7 +48,7 @@ TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T (void) +TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T () { } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl index 733cb9d93c8..b2ba7477f99 100644 --- a/TAO/tao/Profile.inl +++ b/TAO/tao/Profile.inl @@ -26,13 +26,13 @@ TAO_Profile::forward_to (TAO_MProfile *mprofiles) } ACE_INLINE TAO_MProfile * -TAO_Profile::forward_to (void) +TAO_Profile::forward_to () { return this->forward_to_; } ACE_INLINE TAO_MProfile * -TAO_Profile::forward_to_i (void) +TAO_Profile::forward_to_i () { return this->forward_to_; } @@ -44,7 +44,7 @@ TAO_Profile::tagged_components () const } ACE_INLINE TAO_Tagged_Components& -TAO_Profile::tagged_components (void) +TAO_Profile::tagged_components () { return this->tagged_components_; } @@ -62,13 +62,13 @@ TAO_Profile::object_key () const } ACE_INLINE unsigned long -TAO_Profile::_incr_refcnt (void) +TAO_Profile::_incr_refcnt () { return ++this->refcount_; } ACE_INLINE unsigned long -TAO_Profile::_decr_refcnt (void) +TAO_Profile::_decr_refcnt () { unsigned long count = --this->refcount_; if (count == 0) diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index 4b066ac14f1..285a59014d0 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -62,7 +62,7 @@ namespace TAO } ACE_INLINE CORBA::PolicyList * - Profile_Transport_Resolver::steal_inconsistent_policies (void) + Profile_Transport_Resolver::steal_inconsistent_policies () { CORBA::PolicyList *tmp = this->inconsistent_policies_; this->inconsistent_policies_ = 0; diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 56cd91973f1..2a74074622a 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -54,10 +54,10 @@ public: // Factory methods /// Create an acceptor - virtual TAO_Acceptor *make_acceptor (void) = 0; + virtual TAO_Acceptor *make_acceptor () = 0; /// Create a connector - virtual TAO_Connector *make_connector (void) = 0; + virtual TAO_Connector *make_connector () = 0; /** * Some protocols should not create a default endpoint unless the diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index b311939f02a..3590f7f53ae 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void) +TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T () : ptr_ (T::_nil ()) {} @@ -24,7 +24,7 @@ TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p) template <typename T> ACE_INLINE -TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void) +TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T () { CORBA::release (this->ptr_); } @@ -72,7 +72,7 @@ TAO_Pseudo_Var_T<T>::in () const template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Var_T<T>::inout (void) +TAO_Pseudo_Var_T<T>::inout () { return this->ptr_; } @@ -80,7 +80,7 @@ TAO_Pseudo_Var_T<T>::inout (void) template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Var_T<T>::out (void) +TAO_Pseudo_Var_T<T>::out () { CORBA::release (this->ptr_); this->ptr_ = T::_nil (); @@ -90,7 +90,7 @@ TAO_Pseudo_Var_T<T>::out (void) template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::_retn (void) +TAO_Pseudo_Var_T<T>::_retn () { typename T::_ptr_type val = this->ptr_; this->ptr_ = T::_nil (); @@ -152,7 +152,7 @@ TAO_Pseudo_Out_T<T>::operator= (typename T::_ptr_type p) template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Out_T<T>::ptr (void) +TAO_Pseudo_Out_T<T>::ptr () { return this->ptr_; } @@ -167,7 +167,7 @@ TAO_Pseudo_Out_T<T>::operator typename T::_ptr_type & () template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Out_T<T>::operator-> (void) +TAO_Pseudo_Out_T<T>::operator-> () { return this->ptr_; } diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index 093c3e4ab62..037c3a1ca0e 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -190,7 +190,7 @@ public: * Asynchronous (SYNC_NONE) messages are allocated from the heap (or * a pool), they need to be reclaimed explicitly. */ - virtual void destroy (void) = 0; + virtual void destroy () = 0; /// Check for timeout /** diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index 419f43b2f3b..f0a06efa705 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -89,10 +89,10 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var : private TAO_Base_var { public: - TAO_Network_Priority_Mapping_Manager_var (void); // default constructor + TAO_Network_Priority_Mapping_Manager_var (); // default constructor TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr); TAO_Network_Priority_Mapping_Manager_var (const TAO_Network_Priority_Mapping_Manager_var &); // copy constructor - ~TAO_Network_Priority_Mapping_Manager_var (void); // destructor + ~TAO_Network_Priority_Mapping_Manager_var (); // destructor TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr); TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl index fc1de165745..4480f599715 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (void) // default constructor +TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var () // default constructor : ptr_ (TAO_Network_Priority_Mapping_Manager::_nil ()) {} @@ -28,7 +28,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v {} ACE_INLINE -TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var (void) // destructor +TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var () // destructor { CORBA::release (this->ptr_); } @@ -77,13 +77,13 @@ TAO_Network_Priority_Mapping_Manager_var::in () const } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_var::inout (void) +TAO_Network_Priority_Mapping_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_var::out (void) +TAO_Network_Priority_Mapping_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil (); @@ -91,7 +91,7 @@ TAO_Network_Priority_Mapping_Manager_var::out (void) } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::_retn (void) +TAO_Network_Priority_Mapping_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_Network_Priority_Mapping_Manager_ptr val = this->ptr_; @@ -112,7 +112,7 @@ TAO_Network_Priority_Mapping_Manager_var::release (TAO_Network_Priority_Mapping_ } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::nil (void) +TAO_Network_Priority_Mapping_Manager_var::nil () { return ::TAO_Network_Priority_Mapping_Manager::_nil (); } @@ -187,13 +187,13 @@ TAO_Network_Priority_Mapping_Manager_out::operator ::TAO_Network_Priority_Mappin } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_out::ptr (void) // ptr +TAO_Network_Priority_Mapping_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_out::operator-> (void) +TAO_Network_Priority_Mapping_Manager_out::operator-> () { return this->ptr_; } @@ -206,7 +206,7 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO } ACE_INLINE RTCORBA::NetworkPriorityMapping * -TAO_Network_Priority_Mapping_Manager::mapping (void) +TAO_Network_Priority_Mapping_Manager::mapping () { return this->mapping_; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 23d56faba1e..a0652c6cbf4 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -84,10 +84,10 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var : private TAO_Base_var { public: - TAO_Priority_Mapping_Manager_var (void); // default constructor + TAO_Priority_Mapping_Manager_var (); // default constructor TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var (const TAO_Priority_Mapping_Manager_var &); // copy constructor - ~TAO_Priority_Mapping_Manager_var (void); // destructor + ~TAO_Priority_Mapping_Manager_var (); // destructor TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl index dffaea89b8e..00c8e79465d 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (void) // default constructor +TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var () // default constructor : ptr_ (TAO_Priority_Mapping_Manager::_nil ()) {} @@ -28,7 +28,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (const ::TAO_ {} ACE_INLINE -TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var (void) // destructor +TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var () // destructor { CORBA::release (this->ptr_); } @@ -77,13 +77,13 @@ TAO_Priority_Mapping_Manager_var::in () const } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_var::inout (void) +TAO_Priority_Mapping_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_var::out (void) +TAO_Priority_Mapping_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil (); @@ -91,7 +91,7 @@ TAO_Priority_Mapping_Manager_var::out (void) } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::_retn (void) +TAO_Priority_Mapping_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_Priority_Mapping_Manager_ptr val = this->ptr_; @@ -112,7 +112,7 @@ TAO_Priority_Mapping_Manager_var::release (TAO_Priority_Mapping_Manager_ptr p) } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::nil (void) +TAO_Priority_Mapping_Manager_var::nil () { return ::TAO_Priority_Mapping_Manager::_nil (); } @@ -187,13 +187,13 @@ TAO_Priority_Mapping_Manager_out::operator ::TAO_Priority_Mapping_Manager_ptr &( } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_out::ptr (void) // ptr +TAO_Priority_Mapping_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_out::operator-> (void) +TAO_Priority_Mapping_Manager_out::operator-> () { return this->ptr_; } @@ -206,7 +206,7 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap } ACE_INLINE RTCORBA::PriorityMapping * -TAO_Priority_Mapping_Manager::mapping (void) +TAO_Priority_Mapping_Manager::mapping () { return this->mapping_; } diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index cc67413602e..57fabb889fe 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -39,7 +39,7 @@ public: /// Destructor virtual ~TAO_RT_Transport_Descriptor_Property (); - virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0; + virtual TAO_RT_Transport_Descriptor_Property *duplicate () = 0; virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) = 0; diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl index e2bc9763f4e..f1c575573cf 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void) +TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property () : next_ (0) { } /*************************************************************************************************/ ACE_INLINE -TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (void) +TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property () : object_id_ (-1) { } @@ -29,7 +29,7 @@ TAO_RT_Transport_Descriptor_Private_Connection_Property::init (long object_id) /*************************************************************************************************/ ACE_INLINE -TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (void) +TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property () : low_priority_ (-1) , high_priority_ (-1) { diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index a08e0dffc39..8b37bbb0a0b 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -52,7 +52,7 @@ TAO_Thread_Lane::dynamic_threads () const ACE_INLINE TAO_Thread_Lane_Resources & -TAO_Thread_Lane::resources (void) +TAO_Thread_Lane::resources () { return this->resources_; } @@ -129,7 +129,7 @@ TAO_Thread_Pool::max_request_buffer_size () const ACE_INLINE TAO_Thread_Lane ** -TAO_Thread_Pool::lanes (void) +TAO_Thread_Pool::lanes () { return this->lanes_; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 05aeab03674..9810a123198 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -72,10 +72,10 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var : private TAO_Base_var { public: - TAO_RTScheduler_Manager_var (void); // default constructor + TAO_RTScheduler_Manager_var (); // default constructor TAO_RTScheduler_Manager_var (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var (const TAO_RTScheduler_Manager_var &); // copy constructor - ~TAO_RTScheduler_Manager_var (void); // destructor + ~TAO_RTScheduler_Manager_var (); // destructor TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &); diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index 7c8698b9c60..cefa3b75997 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (void) +TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var () : ptr_ (TAO_RTScheduler_Manager::_nil ()) {} @@ -33,7 +33,7 @@ TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var ( {} ACE_INLINE -TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var (void) +TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var () { CORBA::release (this->ptr_); } @@ -83,13 +83,13 @@ TAO_RTScheduler_Manager_var::in () const } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_var::inout (void) +TAO_RTScheduler_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_var::out (void) +TAO_RTScheduler_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_RTScheduler_Manager::_nil (); @@ -97,7 +97,7 @@ TAO_RTScheduler_Manager_var::out (void) } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::_retn (void) +TAO_RTScheduler_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_RTScheduler_Manager_ptr val = this->ptr_; @@ -118,7 +118,7 @@ TAO_RTScheduler_Manager_var::release (TAO_RTScheduler_Manager_ptr p) } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::nil (void) +TAO_RTScheduler_Manager_var::nil () { return ::TAO_RTScheduler_Manager::_nil (); } @@ -192,13 +192,13 @@ TAO_RTScheduler_Manager_out::operator ::TAO_RTScheduler_Manager_ptr &() // cast } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_out::ptr (void) // ptr +TAO_RTScheduler_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_out::operator-> (void) +TAO_RTScheduler_Manager_out::operator-> () { return this->ptr_; } @@ -211,7 +211,7 @@ TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (TAO_ORB_Core* orb) } ACE_INLINE RTScheduling::Scheduler_ptr -TAO_RTScheduler_Manager::rtscheduler (void) +TAO_RTScheduler_Manager::rtscheduler () { return RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in()); } diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index aef3dc53236..2b8449f3ec0 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO::Refcounted_ObjectKey::incr_refcount (void) +TAO::Refcounted_ObjectKey::incr_refcount () { ++this->refcount_; } @@ -14,7 +14,7 @@ TAO::Refcounted_ObjectKey::object_key () const } ACE_INLINE CORBA::ULong -TAO::Refcounted_ObjectKey::decr_refcount (void) +TAO::Refcounted_ObjectKey::decr_refcount () { if (--this->refcount_ > 0) { diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl index bf3c8e973a2..af1a5ebb158 100644 --- a/TAO/tao/Resume_Handle.inl +++ b/TAO/tao/Resume_Handle.inl @@ -12,7 +12,7 @@ TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core, } ACE_INLINE -TAO_Resume_Handle::~TAO_Resume_Handle (void) +TAO_Resume_Handle::~TAO_Resume_Handle () { if (this->flag_ == TAO_HANDLE_RESUMABLE) this->resume_handle (); diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl index f2cb3f6e078..12508008d02 100644 --- a/TAO/tao/Service_Context.inl +++ b/TAO/tao/Service_Context.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Service_Context::TAO_Service_Context (void) +TAO_Service_Context::TAO_Service_Context () : service_context_ () { } ACE_INLINE IOP::ServiceContextList & -TAO_Service_Context::service_info (void) +TAO_Service_Context::service_info () { return this->service_context_; } diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl index 3b181689cb5..23323281dd5 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.inl +++ b/TAO/tao/SmartProxies/Smart_Proxies.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void) +TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base () { } diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index 0fe4c12ecc3..2b64a08c261 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -53,7 +53,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -76,7 +76,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -89,7 +89,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>:: -Ret_Special_Basic_Argument_T (void) +Ret_Special_Basic_Argument_T () { } @@ -99,7 +99,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -110,7 +110,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp () { return this->x_; } @@ -121,7 +121,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h index dc5a6422002..bc1e1d351c8 100644 --- a/TAO/tao/Storable_Base.h +++ b/TAO/tao/Storable_Base.h @@ -65,7 +65,7 @@ namespace TAO virtual int funlock (int whence, int start, int len) = 0; - virtual time_t last_changed(void) = 0; + virtual time_t last_changed() = 0; // Mimic a portion of the std::ios interface. We need to be able // to indicate error states from the extraction operators below. @@ -91,13 +91,13 @@ namespace TAO static ACE_CString state_as_string (Storable_State state); - virtual void rewind (void) = 0; + virtual void rewind () = 0; - virtual bool flush (void) = 0; + virtual bool flush () = 0; /// Force write of storable data to storage. /// Returns 0 on success, otherwise EOF - virtual int sync (void) = 0; + virtual int sync () = 0; virtual Storable_Base& operator << (const ACE_CString&) = 0; virtual Storable_Base& operator >> (ACE_CString&) = 0; diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl index 88346814360..b7ea67f1218 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.inl +++ b/TAO/tao/Strategies/DIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO_DIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_DIOP_Acceptor::endpoints (void) +TAO_DIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index ead5690cc3d..cc3a2e8af6a 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -65,7 +65,7 @@ public: CORBA::Short priority); /// Destructor. - ~TAO_DIOP_Endpoint (void) = default; + ~TAO_DIOP_Endpoint () = default; /** * @name TAO_Endpoint Methods diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 1dbab86231a..b30659f7d8d 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -39,7 +39,7 @@ public: TAO_DIOP_Protocol_Factory (); /// Destructor. - virtual ~TAO_DIOP_Protocol_Factory (void) = default; + virtual ~TAO_DIOP_Protocol_Factory () = default; // = Service Configurator hooks. /// Dynamic linking hook diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl index 840862e2710..86cc2f06e57 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.inl +++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO_SCIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_SCIOP_Acceptor::endpoints (void) +TAO_SCIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index e62e0601f05..0ea264db14b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -68,7 +68,7 @@ public: CORBA::Short priority); /// Destructor. - ~TAO_SCIOP_Endpoint (void) = default; + ~TAO_SCIOP_Endpoint () = default; // = Implementation of abstract TAO_Endpoint methods. See // Endpoint.h for their documentation. diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index b02fff98755..30c4653160b 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_Stub::reset_base (void) +TAO_Stub::reset_base () { this->base_profiles_.rewind (); this->profile_success_ = false; @@ -21,7 +21,7 @@ TAO_Stub::profile_lock () const } ACE_INLINE void -TAO_Stub::reset_forward (void) +TAO_Stub::reset_forward () { while (this->forward_profiles_ != 0 && this->forward_profiles_ != this->forward_profiles_perm_) // Disturbingly the permanent @@ -31,7 +31,7 @@ TAO_Stub::reset_forward (void) } ACE_INLINE void -TAO_Stub::reset_profiles_i (void) +TAO_Stub::reset_profiles_i () { this->reset_forward (); this->reset_base (); @@ -49,7 +49,7 @@ TAO_Stub::reset_profiles_i (void) } ACE_INLINE void -TAO_Stub::reset_profiles (void) +TAO_Stub::reset_profiles () { ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, @@ -66,13 +66,13 @@ TAO_Stub::reset_profiles (void) } ACE_INLINE TAO_Profile * -TAO_Stub::profile_in_use (void) +TAO_Stub::profile_in_use () { return this->profile_in_use_; } ACE_INLINE TAO_MProfile * -TAO_Stub::make_profiles (void) +TAO_Stub::make_profiles () { TAO_MProfile *mp = 0; @@ -84,7 +84,7 @@ TAO_Stub::make_profiles (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_forward_profile (void) +TAO_Stub::next_forward_profile () { TAO_Profile *pfile_next = 0; @@ -99,7 +99,7 @@ TAO_Stub::next_forward_profile (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_profile_i (void) +TAO_Stub::next_profile_i () { TAO_Profile *pfile_next = 0; @@ -181,7 +181,7 @@ TAO_Stub::next_profile_i (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_profile (void) +TAO_Stub::next_profile () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -196,13 +196,13 @@ TAO_Stub::next_profile (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::valid_forward_profile (void) +TAO_Stub::valid_forward_profile () { return (this->profile_success_ && this->forward_profiles_); } ACE_INLINE void -TAO_Stub::set_valid_profile (void) +TAO_Stub::set_valid_profile () { this->profile_success_ = true; } @@ -240,7 +240,7 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles) } ACE_INLINE CORBA::Boolean -TAO_Stub::next_profile_retry (void) +TAO_Stub::next_profile_retry () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -280,7 +280,7 @@ TAO_Stub::base_profiles () const } ACE_INLINE TAO_MProfile& -TAO_Stub::base_profiles (void) +TAO_Stub::base_profiles () { return this->base_profiles_; } @@ -292,7 +292,7 @@ TAO_Stub::forward_profiles () const } ACE_INLINE TAO_MProfile * -TAO_Stub::forward_profiles (void) +TAO_Stub::forward_profiles () { return this->forward_profiles_; } @@ -310,14 +310,14 @@ TAO_Stub::orb_core () const } ACE_INLINE CORBA::ORB_var & -TAO_Stub::servant_orb_var (void) +TAO_Stub::servant_orb_var () { // Simply pass back the ORB pointer for temporary use. return this->servant_orb_; } ACE_INLINE CORBA::ORB_ptr -TAO_Stub::servant_orb_ptr (void) +TAO_Stub::servant_orb_ptr () { // Simply pass back the ORB pointer for temporary use. return CORBA::ORB::_duplicate (this->servant_orb_.in ()); @@ -354,7 +354,7 @@ TAO_Stub::object_proxy_broker (TAO::Object_Proxy_Broker * object_proxy_broker) } ACE_INLINE void -TAO_Stub::destroy (void) +TAO_Stub::destroy () { // The reference count better be zero at this point! delete this; @@ -367,7 +367,7 @@ TAO_Stub::optimize_collocation_objects () const } ACE_INLINE TAO::Transport_Queueing_Strategy * -TAO_Stub::transport_queueing_strategy (void) +TAO_Stub::transport_queueing_strategy () { #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -398,14 +398,14 @@ bool TAO_Stub::forwarded_on_exception () const ACE_INLINE void -TAO_Stub::_incr_refcnt (void) +TAO_Stub::_incr_refcnt () { ++this->refcount_; } ACE_INLINE void -TAO_Stub::_decr_refcnt (void) +TAO_Stub::_decr_refcnt () { if (--this->refcount_ == 0) delete this; @@ -436,7 +436,7 @@ TAO_Stub_Auto_Ptr::get () const } ACE_INLINE TAO_Stub * -TAO_Stub_Auto_Ptr::release (void) +TAO_Stub_Auto_Ptr::release () { ACE_TRACE ("TAO_Stub_Auto_Ptr::release"); TAO_Stub *old = this->p_; @@ -479,7 +479,7 @@ TAO_Stub_Auto_Ptr::operator= (TAO_Stub_Auto_Ptr &rhs) } ACE_INLINE -TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void) +TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr () { ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr"); if (this->get() != nullptr) diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 486f1cf2eed..f8aa2c5beec 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -912,7 +912,7 @@ TAO::excp_factory excp_array [] = { // Concrete SystemException constructors #define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::name ::name (void) \ +CORBA::name ::name () \ : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ #name, \ 0, \ @@ -989,7 +989,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::SystemException * \ -CORBA::name ::_tao_create (void) \ +CORBA::name ::_tao_create () \ { \ CORBA::name *result = 0; \ ACE_NEW_RETURN (result, CORBA::name (), 0); \ diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 21909c5383b..1aeb7636e07 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -176,7 +176,7 @@ namespace CORBA class TAO_Export name : public SystemException \ { \ public: \ - name (void); \ + name (); \ name (CORBA::ULong code, \ CORBA::CompletionStatus completed); \ static name * _downcast (CORBA::Exception* exception); \ @@ -185,7 +185,7 @@ namespace CORBA virtual CORBA::TypeCode_ptr _tao_type () const; \ static void _tao_any_destructor (void*); \ virtual CORBA::Exception *_tao_duplicate () const; \ - static CORBA::SystemException *_tao_create (void); \ + static CORBA::SystemException *_tao_create (); \ }; \ TAO_SYSTEM_EXCEPTION(UNKNOWN) // the unknown exception diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl index 8b9a1519556..b7feb853996 100644 --- a/TAO/tao/TAO_Server_Request.inl +++ b/TAO/tao/TAO_Server_Request.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This constructor is used by the CSD clone. ACE_INLINE -TAO_ServerRequest::TAO_ServerRequest (void) +TAO_ServerRequest::TAO_ServerRequest () : mesg_base_ (0), operation_ (0), operation_len_ (0), @@ -98,7 +98,7 @@ TAO_ServerRequest::response_expected (CORBA::Boolean response) } ACE_INLINE void -TAO_ServerRequest::sync_before_dispatch (void) +TAO_ServerRequest::sync_before_dispatch () { if (this->sync_with_server_ && this->transport_ != 0 && @@ -109,7 +109,7 @@ TAO_ServerRequest::sync_before_dispatch (void) } ACE_INLINE void -TAO_ServerRequest::sync_after_dispatch (void) +TAO_ServerRequest::sync_after_dispatch () { if (this->sync_with_server_ && this->transport_ != 0 && @@ -144,37 +144,37 @@ TAO_ServerRequest::is_queued (CORBA::Boolean queued_flag) } ACE_INLINE TAO::ObjectKey & -TAO_ServerRequest::object_key (void) +TAO_ServerRequest::object_key () { return this->profile_.object_key (); } ACE_INLINE TAO_Service_Context & -TAO_ServerRequest::request_service_context (void) +TAO_ServerRequest::request_service_context () { return this->request_service_context_; } ACE_INLINE IOP::ServiceContextList & -TAO_ServerRequest::reply_service_info (void) +TAO_ServerRequest::reply_service_info () { return this->reply_service_context ().service_info (); } ACE_INLINE IOP::ServiceContextList & -TAO_ServerRequest::request_service_info (void) +TAO_ServerRequest::request_service_info () { return this->request_service_context ().service_info (); } ACE_INLINE TAO_Transport * -TAO_ServerRequest::transport (void) +TAO_ServerRequest::transport () { return this->transport_.get (); } ACE_INLINE CORBA::ULong -TAO_ServerRequest::request_id (void) +TAO_ServerRequest::request_id () { return this->request_id_; } @@ -192,7 +192,7 @@ TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal) } ACE_INLINE TAO_Tagged_Profile & -TAO_ServerRequest::profile (void) +TAO_ServerRequest::profile () { return this->profile_; } @@ -206,7 +206,7 @@ TAO_ServerRequest::forward_location (CORBA::Object_ptr forward_reference) } ACE_INLINE CORBA::Object_ptr -TAO_ServerRequest::forward_location (void) +TAO_ServerRequest::forward_location () { return CORBA::Object::_duplicate (this->forward_location_.in ()); } @@ -218,7 +218,7 @@ TAO_ServerRequest::is_forwarded () const } ACE_INLINE GIOP::ReplyStatusType -TAO_ServerRequest::reply_status (void) +TAO_ServerRequest::reply_status () { return this->reply_status_; } @@ -230,7 +230,7 @@ TAO_ServerRequest::reply_status (GIOP::ReplyStatusType reply_status) } ACE_INLINE void -TAO_ServerRequest::is_dsi (void) +TAO_ServerRequest::is_dsi () { this->is_dsi_ = true; } @@ -248,7 +248,7 @@ TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::argument_flag (void) +TAO_ServerRequest::argument_flag () { return this->argument_flag_; } @@ -268,13 +268,13 @@ TAO_ServerRequest::collocated () const #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE size_t & -TAO_ServerRequest::interceptor_count (void) +TAO_ServerRequest::interceptor_count () { return this->interceptor_count_; } ACE_INLINE CORBA::Exception * -TAO_ServerRequest::caught_exception (void) +TAO_ServerRequest::caught_exception () { return this->caught_exception_; } @@ -286,7 +286,7 @@ TAO_ServerRequest::pi_reply_status (PortableInterceptor::ReplyStatus s) } ACE_INLINE PortableInterceptor::ReplyStatus -TAO_ServerRequest::pi_reply_status (void) +TAO_ServerRequest::pi_reply_status () { return this->pi_reply_status_; } diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl index 530fc7ce38c..5bf773cd6ae 100644 --- a/TAO/tao/TAO_Singleton.inl +++ b/TAO/tao/TAO_Singleton.inl @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // have a default constructor. Let the compiler figure it out . . . template <class TYPE, class ACE_LOCK> ACE_INLINE -TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton (void) +TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void) +TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton () { } diff --git a/TAO/tao/Tagged_Components.inl b/TAO/tao/Tagged_Components.inl index 00332ee2d49..36547daa148 100644 --- a/TAO/tao/Tagged_Components.inl +++ b/TAO/tao/Tagged_Components.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Tagged_Components::TAO_Tagged_Components (void) +TAO_Tagged_Components::TAO_Tagged_Components () : orb_type_ (0), orb_type_set_ (0), code_sets_set_ (0) @@ -71,7 +71,7 @@ TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const } ACE_INLINE IOP::MultipleComponentProfile& -TAO_Tagged_Components::components (void) +TAO_Tagged_Components::components () { return this->components_; } diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl index 683ead394da..1122f0402eb 100644 --- a/TAO/tao/Tagged_Profile.inl +++ b/TAO/tao/Tagged_Profile.inl @@ -15,7 +15,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core) } ACE_INLINE TAO::ObjectKey & -TAO_Tagged_Profile::object_key (void) +TAO_Tagged_Profile::object_key () { if (!this->object_key_extracted_) this->object_key_extracted_ = this->extract_object_key (this->profile_); diff --git a/TAO/tao/Time_Policy_Strategy.h b/TAO/tao/Time_Policy_Strategy.h index e9e5aaef573..2322ffa5a2e 100644 --- a/TAO/tao/Time_Policy_Strategy.h +++ b/TAO/tao/Time_Policy_Strategy.h @@ -42,11 +42,11 @@ class TAO_Export TAO_Time_Policy_Strategy public: virtual ~TAO_Time_Policy_Strategy () {} - virtual ACE_Timer_Queue * create_timer_queue (void) = 0; + virtual ACE_Timer_Queue * create_timer_queue () = 0; virtual void destroy_timer_queue (ACE_Timer_Queue *tmq) = 0; - virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void) = 0; + virtual ACE_Dynamic_Time_Policy_Base * get_time_policy () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index cadf737ec18..fa95a606d0a 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -57,7 +57,7 @@ TAO_Transport::opened_as (TAO::Connection_Role role) } ACE_INLINE TAO::Transport_Cache_Manager::HASH_MAP_ENTRY * -TAO_Transport::cache_map_entry (void) +TAO_Transport::cache_map_entry () { return this->cache_map_entry_; } @@ -100,7 +100,7 @@ TAO_Transport::id (size_t id) } ACE_INLINE bool -TAO_Transport::queue_is_empty (void) +TAO_Transport::queue_is_empty () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, @@ -116,14 +116,14 @@ TAO_Transport::flush_timer_pending () const } ACE_INLINE void -TAO_Transport::reset_flush_timer (void) +TAO_Transport::reset_flush_timer () { this->flush_timer_id_ = -1; this->current_deadline_ = ACE_Time_Value::zero; } ACE_INLINE TAO_GIOP_Message_Base * -TAO_Transport::messaging_object (void) +TAO_Transport::messaging_object () { return this->messaging_object_; } @@ -185,7 +185,7 @@ TAO_Transport::is_connected () const } ACE_INLINE TAO_Connection_Handler * -TAO_Transport::connection_handler (void) +TAO_Transport::connection_handler () { return this->connection_handler_i(); } @@ -289,7 +289,7 @@ TAO::Transport::Stats::opened_since () const #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ ACE_INLINE int -TAO_Transport::notify_reactor (void) +TAO_Transport::notify_reactor () { if (!this->ws_->is_registered ()) { diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 4cb153f66b1..ed1b61d819c 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -86,7 +86,7 @@ public: virtual int open (TAO_ORB_Core *orb_core) = 0; /// Shutdown Connector bridge and concrete Connector. - virtual int close (void) = 0; + virtual int close () = 0; /** * To support pluggable we need to abstract away the details of the @@ -121,7 +121,7 @@ protected: virtual int supports_parallel_connects () const; /// Create a profile with a given endpoint. - virtual TAO_Profile *make_profile (void) = 0; + virtual TAO_Profile *make_profile () = 0; /// Set and validate endpoint. We need to do this to initialize our /// remote *_Addr's which have not been done during IOR decode. diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl index 802e7bfdf1f..7cb887f5a9c 100644 --- a/TAO/tao/Transport_Connector.inl +++ b/TAO/tao/Transport_Connector.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_Connector::orb_core (void) +TAO_Connector::orb_core () { return this->orb_core_; } diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h index 45561221ee4..e05a3f035cf 100644 --- a/TAO/tao/Transport_Descriptor_Interface.h +++ b/TAO/tao/Transport_Descriptor_Interface.h @@ -50,7 +50,7 @@ public: /// This call allocates and copies the contents of this class and /// returns the pointer - virtual TAO_Transport_Descriptor_Interface *duplicate (void) = 0; + virtual TAO_Transport_Descriptor_Interface *duplicate () = 0; /// Try to determine if this object is same as the @a other_prop. virtual CORBA::Boolean is_equivalent ( diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl index 53a1cf35bf1..579af9390f5 100644 --- a/TAO/tao/Transport_Descriptor_Interface.inl +++ b/TAO/tao/Transport_Descriptor_Interface.inl @@ -13,7 +13,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface ( } ACE_INLINE -TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void) +TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface () : endpoint_ (0), bidir_flag_ (false), release_ (false) @@ -22,7 +22,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void) ACE_INLINE TAO_Endpoint * -TAO_Transport_Descriptor_Interface::endpoint (void) +TAO_Transport_Descriptor_Interface::endpoint () { return this->endpoint_; } diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index 957afc63702..aac13e1880b 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -43,7 +43,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_; } @@ -62,7 +62,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_; } @@ -72,7 +72,7 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T () { } @@ -80,7 +80,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_.out (); } @@ -89,7 +89,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -98,7 +98,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl index 3bba257dd04..0596a2fcd0e 100644 --- a/TAO/tao/UserException.inl +++ b/TAO/tao/UserException.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::UserException::UserException (void) +CORBA::UserException::UserException () { } diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index 8b2fd7d0529..29f634049a2 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -43,7 +43,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.inout (); } @@ -65,7 +65,7 @@ template<typename S_out, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg (void) +TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg () { return this->x_; } @@ -77,7 +77,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>:: -Ret_Var_Array_Argument_T (void) +Ret_Var_Array_Argument_T () {} template<typename S_var, @@ -85,7 +85,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg () { return this->x_.out (); } @@ -95,7 +95,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -105,7 +105,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index 82cb065b1de..d82ceea4184 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -40,7 +40,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg () { return *this->x_; } @@ -60,7 +60,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -70,7 +70,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T () { } @@ -78,7 +78,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_.out (); } @@ -87,7 +87,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S * -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -96,7 +96,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S * -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Vector_Argument_T.inl b/TAO/tao/Vector_Argument_T.inl index ced1dda2f53..ad9ca1feae6 100644 --- a/TAO/tao/Vector_Argument_T.inl +++ b/TAO/tao/Vector_Argument_T.inl @@ -69,7 +69,7 @@ TAO::Out_Vector_Argument_T<S,Insert_Policy>::arg () template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T () { } @@ -77,7 +77,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -86,7 +86,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp () { return this->x_; } @@ -95,7 +95,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl index 3db521b5de2..b1cc3fa16c9 100644 --- a/TAO/tao/operation_details.inl +++ b/TAO/tao/operation_details.inl @@ -71,7 +71,7 @@ TAO_Operation_Details::in_argument_flag () const #endif // TAO_IGNORE_IN_ARGS ACE_INLINE TAO_Service_Context & -TAO_Operation_Details::request_service_context (void) +TAO_Operation_Details::request_service_context () { return this->request_service_info_; } @@ -83,7 +83,7 @@ TAO_Operation_Details::request_service_context () const } ACE_INLINE IOP::ServiceContextList & -TAO_Operation_Details::request_service_info (void) +TAO_Operation_Details::request_service_info () { return this->request_service_context ().service_info (); } @@ -95,7 +95,7 @@ TAO_Operation_Details::request_service_info () const } ACE_INLINE TAO_Service_Context & -TAO_Operation_Details::reply_service_context (void) +TAO_Operation_Details::reply_service_context () { return this->reply_service_info_; } @@ -107,7 +107,7 @@ TAO_Operation_Details::reply_service_context () const } ACE_INLINE IOP::ServiceContextList & -TAO_Operation_Details::reply_service_info (void) +TAO_Operation_Details::reply_service_info () { return this->reply_service_context ().service_info (); } @@ -119,12 +119,12 @@ TAO_Operation_Details::reply_service_info () const } ACE_INLINE void -TAO_Operation_Details::reset_request_service_info (void) +TAO_Operation_Details::reset_request_service_info () { this->request_service_context ().service_info ().length (0); } ACE_INLINE void -TAO_Operation_Details::reset_reply_service_info (void) +TAO_Operation_Details::reset_reply_service_info () { this->reply_service_context ().service_info ().length (0); } diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl index e2ede8c30bf..2d5dcd6632c 100644 --- a/TAO/tao/params.inl +++ b/TAO/tao/params.inl @@ -161,7 +161,7 @@ TAO_ORB_Parameters::nodelay (int x) } ACE_INLINE int -TAO_ORB_Parameters::sock_keepalive (void) +TAO_ORB_Parameters::sock_keepalive () { return this->sock_keepalive_; } @@ -173,7 +173,7 @@ TAO_ORB_Parameters::sock_keepalive (int x) } ACE_INLINE int -TAO_ORB_Parameters::sock_dontroute (void) +TAO_ORB_Parameters::sock_dontroute () { return this->sock_dontroute_; } @@ -185,7 +185,7 @@ TAO_ORB_Parameters::sock_dontroute (int x) } ACE_INLINE int -TAO_ORB_Parameters::ip_hoplimit (void) +TAO_ORB_Parameters::ip_hoplimit () { return this->ip_hoplimit_; } @@ -197,7 +197,7 @@ TAO_ORB_Parameters::ip_hoplimit (int x) } ACE_INLINE bool -TAO_ORB_Parameters::ip_multicastloop (void) +TAO_ORB_Parameters::ip_multicastloop () { return this->ip_multicastloop_; } @@ -209,7 +209,7 @@ TAO_ORB_Parameters::ip_multicastloop (bool x) } ACE_INLINE u_short -TAO_ORB_Parameters::iiop_client_port_base (void) +TAO_ORB_Parameters::iiop_client_port_base () { return this->iiop_client_port_base_; } @@ -221,7 +221,7 @@ TAO_ORB_Parameters::iiop_client_port_base (u_short b) } ACE_INLINE u_short -TAO_ORB_Parameters::iiop_client_port_span (void) +TAO_ORB_Parameters::iiop_client_port_span () { return this->iiop_client_port_base_ ? this->iiop_client_port_span_ : 0; diff --git a/TAO/tao/target_specification.inl b/TAO/tao/target_specification.inl index cd58417e335..0dbefafc9d4 100644 --- a/TAO/tao/target_specification.inl +++ b/TAO/tao/target_specification.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Target_Specification::TAO_Target_Specification (void) +TAO_Target_Specification::TAO_Target_Specification () :specifier_ (TAO_Target_Specification::Key_Addr), profile_index_ (0) { @@ -46,7 +46,7 @@ TAO_Target_Specification::target_specifier (IOP::IOR &ior, } ACE_INLINE const TAO::ObjectKey* -TAO_Target_Specification::object_key (void) +TAO_Target_Specification::object_key () { if (this->specifier_ == TAO_Target_Specification::Key_Addr) return this->u_.object_key_; @@ -55,7 +55,7 @@ TAO_Target_Specification::object_key (void) } ACE_INLINE const IOP::TaggedProfile * -TAO_Target_Specification::profile (void) +TAO_Target_Specification::profile () { if (this->specifier_ == TAO_Target_Specification::Profile_Addr) return this->u_.profile_; @@ -77,7 +77,7 @@ TAO_Target_Specification::iop_ior (IOP::IOR *& ior) } ACE_INLINE TAO_Target_Specification::TAO_Target_Address -TAO_Target_Specification::specifier (void) +TAO_Target_Specification::specifier () { return this->specifier_; } |