diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:52:29 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-17 10:52:29 +0100 |
| commit | 104d9f8a30c479fe661883b295f120ab035645d9 (patch) | |
| tree | aa39aaa576d8ce2e1666df7a750d77df1a33232e /TAO/tao | |
| parent | 2d22ad2099d46d44fa05778313a8d4c9c4a4eba3 (diff) | |
| download | ATCD-104d9f8a30c479fe661883b295f120ab035645d9.tar.gz | |
Removed redundant void
Diffstat (limited to 'TAO/tao')
246 files changed, 753 insertions, 753 deletions
diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index a00da5e1a22..0ecd203dcc1 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -62,7 +62,7 @@ CORBA::NVList::NVList (void) ACE_INLINE CORBA::ULong -CORBA::NVList::count (void) const +CORBA::NVList::count () const { (const_cast<CORBA::NVList *> (this))->evaluate (); diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp index bf7cedff22d..2b803184a4c 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp @@ -76,7 +76,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i ( template <typename StringType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Objref<StringType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -122,7 +122,7 @@ TAO::TypeCode::Objref<StringType, template <typename StringType, class RefCountPolicy> char const * -TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const +TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -131,7 +131,7 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (void) const template <typename StringType, class RefCountPolicy> char const * -TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (void) const +TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index bd81dd1ea7a..8af341e0ea8 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -103,7 +103,7 @@ TAO::TypeCode::Sequence<TypeCodeType, template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -121,14 +121,14 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (v template <typename TypeCodeType, class RefCountPolicy> CORBA::ULong -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i () const { return this->length_; } template <typename TypeCodeType, class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (void) const +TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.cpp b/TAO/tao/AnyTypeCode/String_TypeCode.cpp index b1424e84b7d..f1a3399c936 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp @@ -61,7 +61,7 @@ TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) con template <class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -75,7 +75,7 @@ TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (void) const template <class RefCountPolicy> CORBA::ULong -TAO::TypeCode::String<RefCountPolicy>::length_i (void) const +TAO::TypeCode::String<RefCountPolicy>::length_i () const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index 882ddd9bfef..797b5469fd9 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -113,7 +113,7 @@ const FieldArrayType& TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::fields (void) const + RefCountPolicy>::fields () const { return fields_; } @@ -210,7 +210,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -260,7 +260,7 @@ char const * TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -275,7 +275,7 @@ char const * TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -290,7 +290,7 @@ CORBA::ULong TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nfields_; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index 9b8f98173ee..3308443c50d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -20,7 +20,7 @@ template <typename StringType, typename TypeCodeType> TAO::TypeCode::Case<StringType, TypeCodeType> * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::clone (void) const + TypeCodeType>::clone () const { Case<StringType, TypeCodeType> * p = 0; @@ -74,7 +74,7 @@ template <typename StringType, typename TypeCodeType> CORBA::Any * TAO::TypeCode::Case_Enum_T<StringType, - TypeCodeType>::label (void) const + TypeCodeType>::label () const { TAO_OutputCDR out_cdr; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp index faf3d0745af..7bee7becd9a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp @@ -76,7 +76,7 @@ template <typename DiscriminatorType, TAO::TypeCode::Case<StringType, TypeCodeType> * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::clone (void) const + TypeCodeType>::clone () const { Case<StringType, TypeCodeType> * p = 0; @@ -138,7 +138,7 @@ template <typename DiscriminatorType, CORBA::Any * TAO::TypeCode::Case_T<DiscriminatorType, StringType, - TypeCodeType>::label (void) const + TypeCodeType>::label () const { CORBA::Any * value = 0; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index dbb16217c47..0942b2988ac 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -109,7 +109,7 @@ const CaseArrayType & TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::cases (void) const + RefCountPolicy>::cases () const { return cases_; } @@ -234,7 +234,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -289,7 +289,7 @@ char const * TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -304,7 +304,7 @@ char const * TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -319,7 +319,7 @@ CORBA::ULong TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->ncases_; } @@ -403,7 +403,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::discriminator_type_i (void) const + RefCountPolicy>::discriminator_type_i () const { return CORBA::TypeCode::_duplicate ( @@ -418,7 +418,7 @@ CORBA::Long TAO::TypeCode::Union<StringType, TypeCodeType, CaseArrayType, - RefCountPolicy>::default_index_i (void) const + RefCountPolicy>::default_index_i () const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index 32e79789204..5d5fa5dbc72 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -118,7 +118,7 @@ const TypeCodeType& TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base (void) const + RefCountPolicy>::concrete_base () const { return concrete_base_; } @@ -131,7 +131,7 @@ const FieldArrayType& TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::fields (void) const + RefCountPolicy>::fields () const { return fields_; } @@ -275,7 +275,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -328,7 +328,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -343,7 +343,7 @@ char const * TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -358,7 +358,7 @@ CORBA::ULong TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nfields_; } @@ -423,7 +423,7 @@ CORBA::ValueModifier TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::type_modifier_i (void) const + RefCountPolicy>::type_modifier_i () const { return this->type_modifier_; } @@ -436,7 +436,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Value<StringType, TypeCodeType, FieldArrayType, - RefCountPolicy>::concrete_base_type_i (void) const + RefCountPolicy>::concrete_base_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index e7e793c952c..0a0a90daa93 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -110,7 +110,7 @@ public: TAO_SYSTEM_EXCEPTION (InvalidPolicies) #define TAO_SYSTEM_EXCEPTION(name) \ - virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type_ ## name () const = 0; ANYTYPECODE__EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h index 3ff6041fdd3..b782fb89cea 100644 --- a/TAO/tao/Asynch_Queued_Message.h +++ b/TAO/tao/Asynch_Queued_Message.h @@ -64,8 +64,8 @@ public: * @name Implement the Template Methods from TAO_Queued_Message */ //@{ - virtual size_t message_length (void) const; - virtual int all_data_sent (void) const; + virtual size_t message_length () const; + virtual int all_data_sent () const; virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; virtual void bytes_transferred (size_t &byte_count); /// @note No reason to believe why this would be called. But have diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h index 5990bb81f54..b7031f3623a 100644 --- a/TAO/tao/BD_String_Argument_T.h +++ b/TAO/tao/BD_String_Argument_T.h @@ -47,7 +47,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type const * arg (void) const; + typename S_var::s_traits::char_type const * arg () const; protected: typename S_var::s_traits::char_type const * x_; diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index be53dfee5bf..cc4e6c2b853 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -16,7 +16,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * -TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) const +TAO::In_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Base_Transport_Property.h b/TAO/tao/Base_Transport_Property.h index f3ce69b4a54..b499969a3df 100644 --- a/TAO/tao/Base_Transport_Property.h +++ b/TAO/tao/Base_Transport_Property.h @@ -58,7 +58,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop); /// Generate hash value for our class - virtual u_long hash (void) const; + virtual u_long hash () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index 7cf80980fa3..c0cd04fa721 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -12,7 +12,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const +TAO::In_Basic_Argument_T<S, Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index 0f3d7ebcf06..28530309a67 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -37,7 +37,7 @@ TAO_BidirectionalPolicy::policy_type (void) TAO_BidirectionalPolicy * -TAO_BidirectionalPolicy::clone (void) const +TAO_BidirectionalPolicy::clone () const { TAO_BidirectionalPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -72,7 +72,7 @@ TAO_BidirectionalPolicy::value (void) TAO_Cached_Policy_Type -TAO_BidirectionalPolicy::_tao_cached_type (void) const +TAO_BidirectionalPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP; } diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index 718ae38a5f5..d75c47d80ff 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -49,7 +49,7 @@ public: TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs); /// Returns a copy of <this>. - virtual TAO_BidirectionalPolicy *clone (void) const; + virtual TAO_BidirectionalPolicy *clone () const; /// = The BiDir::BidirectionalPolicy methods virtual BiDirPolicy::BidirectionalPolicyValue value (void); @@ -60,7 +60,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 0bbc9aa51a3..89958d671dd 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -10,7 +10,7 @@ TAO_OutputCDR::~TAO_OutputCDR (void) } ACE_INLINE bool -TAO_OutputCDR::more_fragments (void) const +TAO_OutputCDR::more_fragments () const { return this->more_fragments_; } @@ -34,25 +34,25 @@ TAO_OutputCDR::message_attributes (CORBA::ULong request_id, } ACE_INLINE CORBA::ULong -TAO_OutputCDR::request_id (void) const +TAO_OutputCDR::request_id () const { return this->request_id_; } ACE_INLINE TAO_Stub * -TAO_OutputCDR::stub (void) const +TAO_OutputCDR::stub () const { return this->stub_; } ACE_INLINE TAO_Message_Semantics -TAO_OutputCDR::message_semantics (void) const +TAO_OutputCDR::message_semantics () const { return this->message_semantics_; } ACE_INLINE ACE_Time_Value * -TAO_OutputCDR::timeout (void) const +TAO_OutputCDR::timeout () const { return this->timeout_; } @@ -267,7 +267,7 @@ TAO_InputCDR::~TAO_InputCDR (void) } ACE_INLINE TAO_ORB_Core* -TAO_InputCDR::orb_core (void) const +TAO_InputCDR::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index c9ab1052c91..08f821911df 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -79,7 +79,7 @@ public: /// Servant Dispatching Strategy proxy accessor. TAO::CSD::Strategy_Proxy& - servant_dispatching_strategy_proxy (void) const; + servant_dispatching_strategy_proxy () const; private: TAO::CSD::Strategy_Proxy* sds_proxy_; diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl index bfc547f58cd..948d7f064cd 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.inl +++ b/TAO/tao/CSD_Framework/CSD_POA.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::CSD::Strategy_Proxy& -TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const +TAO_CSD_POA::servant_dispatching_strategy_proxy () const { return *sds_proxy_; } diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl index d8b868cd666..3fd2e46a546 100644 --- a/TAO/tao/Cleanup_Func_Registry.inl +++ b/TAO/tao/Cleanup_Func_Registry.inl @@ -8,7 +8,7 @@ TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void) } ACE_INLINE size_t -TAO_Cleanup_Func_Registry::size (void) const +TAO_Cleanup_Func_Registry::size () const { return this->cleanup_funcs_.size (); } diff --git a/TAO/tao/Codeset/Codeset_Descriptor.cpp b/TAO/tao/Codeset/Codeset_Descriptor.cpp index aab10247f2b..75aac37a839 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.cpp +++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp @@ -74,19 +74,19 @@ TAO_Codeset_Descriptor::ncs (ACE_CDR::ULong n) } ACE_CDR::ULong -TAO_Codeset_Descriptor::ncs (void) const +TAO_Codeset_Descriptor::ncs () const { return this->ncs_; } int -TAO_Codeset_Descriptor::num_translators (void) const +TAO_Codeset_Descriptor::num_translators () const { return this->num_translators_; } int -TAO_Codeset_Descriptor::max_bytes (void) const +TAO_Codeset_Descriptor::max_bytes () const { return this->max_bytes_; } diff --git a/TAO/tao/Codeset/Codeset_Descriptor.h b/TAO/tao/Codeset/Codeset_Descriptor.h index 389b6fbcaee..ef859f98830 100644 --- a/TAO/tao/Codeset/Codeset_Descriptor.h +++ b/TAO/tao/Codeset/Codeset_Descriptor.h @@ -42,9 +42,9 @@ public: void ncs (ACE_CDR::ULong ncs); void ncs (const ACE_TCHAR *name); - ACE_CDR::ULong ncs (void) const; - int max_bytes (void) const; - int num_translators (void) const; + ACE_CDR::ULong ncs () const; + int max_bytes () const; + int num_translators () const; void add_translator (const ACE_TCHAR *name); Translator_Node *translators (void); diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp index c7c24bef40a..f3da5f2a337 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp @@ -19,7 +19,7 @@ TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory (void) } bool -TAO_Codeset_Manager_Factory::is_default (void) const +TAO_Codeset_Manager_Factory::is_default () const { return false; } diff --git a/TAO/tao/Codeset/Codeset_Manager_Factory.h b/TAO/tao/Codeset/Codeset_Manager_Factory.h index 936c8ac97c7..46df928a484 100644 --- a/TAO/tao/Codeset/Codeset_Manager_Factory.h +++ b/TAO/tao/Codeset/Codeset_Manager_Factory.h @@ -41,7 +41,7 @@ class TAO_Codeset_Export TAO_Codeset_Manager_Factory : public: virtual ~TAO_Codeset_Manager_Factory (); virtual TAO_Codeset_Manager *create(void); - virtual bool is_default(void) const; + virtual bool is_default() const; }; diff --git a/TAO/tao/Codeset_Manager_Factory_Base.h b/TAO/tao/Codeset_Manager_Factory_Base.h index 98d55428e17..59c25927905 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.h +++ b/TAO/tao/Codeset_Manager_Factory_Base.h @@ -54,7 +54,7 @@ public: /// to reload the factory with a dynamically linked libTAO_Codeset. /// Statically linked applications get derive implementation by /// including "tao/Codeset/Codeset.h" somewhere in their source code. - virtual bool is_default (void) const; + virtual bool is_default () const; /// Static initializer ensures the factory is loaded static int initialize (void); diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h index 411dd8e70ed..7d182e0d556 100644 --- a/TAO/tao/Codeset_Translator_Base.h +++ b/TAO/tao/Codeset_Translator_Base.h @@ -53,11 +53,11 @@ public: /// Get the native codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId ncs (void) const = 0; + virtual CONV_FRAME::CodeSetId ncs () const = 0; /// Get the translated codeset ID from the base. There is no reasonable /// default for this method, so it is left abstract. - virtual CONV_FRAME::CodeSetId tcs (void) const = 0; + virtual CONV_FRAME::CodeSetId tcs () const = 0; /// Assign the translator to the supplied input CDR. This is left abstract /// since the base base does not have a reference to the actual translator diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 4a309a7ec19..80dc152804b 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -61,16 +61,16 @@ public: void transport (TAO_Transport* transport); /// Is the handler closed or timed out? - bool is_closed (void) const; + bool is_closed () const; /// Is the handler open? - bool is_open (void) const; + bool is_open () const; /// Closed due to timeout? - bool is_timeout (void) const; + bool is_timeout () const; /// Is the handler in the process of being connected? - bool is_connecting (void) const; + bool is_connecting () const; /// Close the underlying connection. /** diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index f143c25b53e..dcdf2eb1e5d 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -17,26 +17,26 @@ TAO_Connection_Handler::transport (void) } ACE_INLINE bool -TAO_Connection_Handler::is_closed (void) const +TAO_Connection_Handler::is_closed () const { return (this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED || this->state_ == TAO_LF_Event::LFS_TIMEOUT || this->is_closed_); } ACE_INLINE bool -TAO_Connection_Handler::is_timeout (void) const +TAO_Connection_Handler::is_timeout () const { return (this->state_ == TAO_LF_Event::LFS_TIMEOUT); } ACE_INLINE bool -TAO_Connection_Handler::is_open (void) const +TAO_Connection_Handler::is_open () const { return this->state_ == TAO_LF_Event::LFS_SUCCESS; } ACE_INLINE bool -TAO_Connection_Handler::is_connecting (void) const +TAO_Connection_Handler::is_connecting () const { return this->state_ == TAO_LF_Event::LFS_CONNECTION_WAIT; } diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp index dc67ef4224b..9f2f0ba9315 100644 --- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp +++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.cpp @@ -64,7 +64,7 @@ TAO_Client_Network_Priority_Policy::policy_type (void) } TAO_Client_Network_Priority_Policy * -TAO_Client_Network_Priority_Policy::clone (void) const +TAO_Client_Network_Priority_Policy::clone () const { TAO_Client_Network_Priority_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -129,13 +129,13 @@ TAO_Client_Network_Priority_Policy::destroy (void) } TAO_Cached_Policy_Type -TAO_Client_Network_Priority_Policy::_tao_cached_type (void) const +TAO_Client_Network_Priority_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_CLIENT_NETWORK_PRIORITY; } TAO_Policy_Scope -TAO_Client_Network_Priority_Policy::_tao_scope (void) const +TAO_Client_Network_Priority_Policy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h index e42caa337f5..93b933ed808 100644 --- a/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Client_Network_Priority_Policy.h @@ -58,7 +58,7 @@ public: const TAO_Client_Network_Priority_Policy &rhs); /// Returns a copy of <this>. - TAO_Client_Network_Priority_Policy *clone (void) const; + TAO_Client_Network_Priority_Policy *clone () const; TAO::DiffservCodepoint request_diffserv_codepoint (void); @@ -81,10 +81,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: /// The attribute diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp index 33500fa2b47..4e156ca184a 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.cpp @@ -65,7 +65,7 @@ TAO_Server_Network_Priority_Policy::policy_type (void) } TAO_Server_Network_Priority_Policy * -TAO_Server_Network_Priority_Policy::clone (void) const +TAO_Server_Network_Priority_Policy::clone () const { TAO_Server_Network_Priority_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -130,13 +130,13 @@ TAO_Server_Network_Priority_Policy::destroy (void) } TAO_Cached_Policy_Type -TAO_Server_Network_Priority_Policy::_tao_cached_type (void) const +TAO_Server_Network_Priority_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_NETWORK_PRIORITY; } TAO_Policy_Scope -TAO_Server_Network_Priority_Policy::_tao_scope (void) const +TAO_Server_Network_Priority_Policy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h index 41e22e0e1e7..fd8eb16f60a 100644 --- a/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h +++ b/TAO/tao/DiffServPolicy/Server_Network_Priority_Policy.h @@ -59,7 +59,7 @@ public: const TAO_Server_Network_Priority_Policy &rhs); /// Returns a copy of <this>. - TAO_Server_Network_Priority_Policy *clone (void) const; + TAO_Server_Network_Priority_Policy *clone () const; TAO::DiffservCodepoint request_diffserv_codepoint (void); @@ -82,10 +82,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the object state. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 04e5211f63f..55026b9f5a8 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -80,7 +80,7 @@ TAO_AMH_DSI_Exception_Holder_var::TAO_AMH_DSI_Exception_Holder_var ( } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::ptr (void) const +TAO_AMH_DSI_Exception_Holder_var::ptr () const { return this->ptr_; } @@ -131,13 +131,13 @@ TAO_AMH_DSI_Exception_Holder_var::operator TAO_AMH_DSI_Exception_Holder*& () } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::operator-> (void) const +TAO_AMH_DSI_Exception_Holder_var::operator-> () const { return this->ptr_; } TAO_AMH_DSI_Exception_Holder * -TAO_AMH_DSI_Exception_Holder_var::in (void) const +TAO_AMH_DSI_Exception_Holder_var::in () const { return this->ptr_; } @@ -247,7 +247,7 @@ TAO_AMH_DSI_Exception_Holder::_downcast (CORBA::ValueBase * v) } const char * -TAO_AMH_DSI_Exception_Holder::_tao_obv_repository_id (void) const +TAO_AMH_DSI_Exception_Holder::_tao_obv_repository_id () const { return this->_tao_obv_static_repository_id (); } @@ -482,13 +482,13 @@ TAO_AMH_DSI_Response_Handler::_unchecked_narrow (CORBA::Object_ptr obj) } const char* -TAO_AMH_DSI_Response_Handler::_interface_repository_id (void) const +TAO_AMH_DSI_Response_Handler::_interface_repository_id () const { return 0; } CORBA::TypeCode_ptr -TAO_AMH_DSI_Exception_Holder::_tao_type (void) const +TAO_AMH_DSI_Exception_Holder::_tao_type () const { return 0; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h index 70abfe5ad7c..c6b9d09b047 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h @@ -49,16 +49,16 @@ public: TAO_AMH_DSI_Response_Handler_ptr); TAO_AMH_DSI_Response_Handler_var &operator= ( const TAO_AMH_DSI_Response_Handler_var &); - TAO_AMH_DSI_Response_Handler_ptr operator-> (void) const; + TAO_AMH_DSI_Response_Handler_ptr operator-> () const; operator const TAO_AMH_DSI_Response_Handler_ptr &() const; operator TAO_AMH_DSI_Response_Handler_ptr &(); - TAO_AMH_DSI_Response_Handler_ptr in (void) const; + TAO_AMH_DSI_Response_Handler_ptr in () const; TAO_AMH_DSI_Response_Handler_ptr &inout (void); TAO_AMH_DSI_Response_Handler_ptr &out (void); TAO_AMH_DSI_Response_Handler_ptr _retn (void); - TAO_AMH_DSI_Response_Handler_ptr ptr (void) const; + TAO_AMH_DSI_Response_Handler_ptr ptr () const; private: TAO_AMH_DSI_Response_Handler_ptr ptr_; @@ -86,16 +86,16 @@ public: TAO_AMH_DSI_Exception_Holder_var &operator= (TAO_AMH_DSI_Exception_Holder*); TAO_AMH_DSI_Exception_Holder_var &operator= ( const TAO_AMH_DSI_Exception_Holder_var &); - TAO_AMH_DSI_Exception_Holder* operator-> (void) const; + TAO_AMH_DSI_Exception_Holder* operator-> () const; operator const TAO_AMH_DSI_Exception_Holder* () const; operator TAO_AMH_DSI_Exception_Holder*& (); - TAO_AMH_DSI_Exception_Holder* in (void) const; + TAO_AMH_DSI_Exception_Holder* in () const; TAO_AMH_DSI_Exception_Holder*& inout (void); TAO_AMH_DSI_Exception_Holder*& out (void); TAO_AMH_DSI_Exception_Holder* _retn (void); - TAO_AMH_DSI_Exception_Holder* ptr (void) const; + TAO_AMH_DSI_Exception_Holder* ptr () const; // Hooks used by template sequence and valuetype manager classes // for non-defined forward declared valuetypes. @@ -151,14 +151,14 @@ public: static CORBA::Boolean _tao_unmarshal ( TAO_InputCDR &, TAO_AMH_DSI_Exception_Holder *& ); - virtual const char* _tao_obv_repository_id (void) const; + virtual const char* _tao_obv_repository_id () const; static const char* _tao_obv_static_repository_id (void); static void _tao_any_destructor (void *); virtual void raise_invoke ( ); - CORBA::TypeCode_ptr _tao_type (void) const; + CORBA::TypeCode_ptr _tao_type () const; void _tao_obv_truncatable_repo_ids (Repository_Id_List &) const; CORBA::Boolean _tao_match_formal_type (ptrdiff_t ) const; diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl index e322c651073..3562b7c9a19 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl @@ -44,7 +44,7 @@ TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void) } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::ptr (void) const +TAO_AMH_DSI_Response_Handler_var::ptr () const { return this->ptr_; } @@ -86,13 +86,13 @@ TAO_AMH_DSI_Response_Handler_var::operator TAO_AMH_DSI_Response_Handler_ptr &() } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::operator-> (void) const +TAO_AMH_DSI_Response_Handler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::in (void) const +TAO_AMH_DSI_Response_Handler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 1ecc267b2de..c94438783e7 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -37,13 +37,13 @@ CORBA::Context::_decr_refcount () } const char * -CORBA::Context::context_name (void) const +CORBA::Context::context_name () const { throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } CORBA::Context_ptr -CORBA::Context::parent (void) const +CORBA::Context::parent () const { throw ::CORBA::NO_IMPLEMENT (TAO::VMCID, CORBA::COMPLETED_NO); } diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h index 9505f07b941..66fbb404d28 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.h +++ b/TAO/tao/DynamicInterface/DII_Arguments.h @@ -51,7 +51,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *any) const; - int byte_order (void) const; + int byte_order () const; private: CORBA::NamedValue_ptr x_; diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl index 201f07d2c6f..29122b9427d 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.inl +++ b/TAO/tao/DynamicInterface/DII_Arguments.inl @@ -11,7 +11,7 @@ namespace TAO } ACE_INLINE int - NamedValue_Argument::byte_order (void) const + NamedValue_Argument::byte_order () const { return this->byte_order_; } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h index 802bddd0b3b..3c4ec944f7b 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h @@ -44,16 +44,16 @@ public: TAO_DII_Reply_Handler_var &operator= (TAO_DII_Reply_Handler_ptr); TAO_DII_Reply_Handler_var &operator= (const TAO_DII_Reply_Handler_var &); - TAO_DII_Reply_Handler_ptr operator-> (void) const; + TAO_DII_Reply_Handler_ptr operator-> () const; operator const TAO_DII_Reply_Handler_ptr &() const; operator TAO_DII_Reply_Handler_ptr &(); - TAO_DII_Reply_Handler_ptr in (void) const; + TAO_DII_Reply_Handler_ptr in () const; TAO_DII_Reply_Handler_ptr &inout (void); TAO_DII_Reply_Handler_ptr &out (void); TAO_DII_Reply_Handler_ptr _retn (void); - TAO_DII_Reply_Handler_ptr ptr (void) const; + TAO_DII_Reply_Handler_ptr ptr () const; private: TAO_DII_Reply_Handler_ptr ptr_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl index 9cba5d062f3..736cd4372d5 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl @@ -32,7 +32,7 @@ TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void) } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::ptr (void) const +TAO_DII_Reply_Handler_var::ptr () const { return this->ptr_; } @@ -75,13 +75,13 @@ TAO_DII_Reply_Handler_var::operator TAO_DII_Reply_Handler_ptr &() } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::operator-> (void) const +TAO_DII_Reply_Handler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::in (void) const +TAO_DII_Reply_Handler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index 982ab13ebb7..61298d32691 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -62,7 +62,7 @@ TAO_DynamicImplementation::_get_interface (void) } const char * -TAO_DynamicImplementation::_interface_repository_id (void) const +TAO_DynamicImplementation::_interface_repository_id () const { // This should never be called. return 0; diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index cff817fd412..ca6cd84b0c8 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -72,7 +72,7 @@ public: protected: /// Return 0. Should never be used. - virtual const char *_interface_repository_id (void) const; + virtual const char *_interface_repository_id () const; /// Simply returns "this" virtual void *_downcast (const char *repository_id); diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index b2431504fbf..e9a50696c97 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -67,10 +67,10 @@ namespace CORBA { public: /// Return the target of this request. - CORBA::Object_ptr target (void) const; + CORBA::Object_ptr target () const; /// Return the operation name for the request. - const CORBA::Char *operation (void) const; + const CORBA::Char *operation () const; /// Return the arguments for the request. CORBA::NVList_ptr arguments (void); @@ -82,7 +82,7 @@ namespace CORBA CORBA::ExceptionList_ptr exceptions (void); /// Accessor for the Context member. - CORBA::Context_ptr ctx (void) const; + CORBA::Context_ptr ctx () const; /// Mutator for the Context member. void ctx (CORBA::Context_ptr); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index ea1b7f79204..4003a9bae87 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -109,7 +109,7 @@ CORBA::Request::return_value (void ) } ACE_INLINE CORBA::Context_ptr -CORBA::Request::ctx (void) const +CORBA::Request::ctx () const { return this->ctx_; } @@ -127,7 +127,7 @@ CORBA::Request::_tao_lazy_evaluation (bool lazy_evaluation) } ACE_INLINE int -CORBA::Request::_tao_byte_order (void) const +CORBA::Request::_tao_byte_order () const { return this->byte_order_; } diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 47660cea05f..80daba964d4 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -92,13 +92,13 @@ namespace CORBA void dsi_marshal (void); /// Accessor for the Context member. - CORBA::Context_ptr ctx (void) const; + CORBA::Context_ptr ctx () const; /// Mutator for the Context member. void ctx (CORBA::Context_ptr); /// Get the operation name. - const char *operation (void) const; + const char *operation () const; // Pseudo object methods. static ServerRequest_ptr _duplicate (ServerRequest_ptr); @@ -112,7 +112,7 @@ namespace CORBA void _tao_lazy_evaluation (bool lazy_evaluation); /// Get the byte order of the incoming CDR stream. - int _tao_incoming_byte_order (void) const; + int _tao_incoming_byte_order () const; /// Set the byte order of the outgoing CDR stream. void _tao_reply_byte_order (int byte_order); diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 73b9112cd31..13efdb7d4fb 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -31,7 +31,7 @@ CORBA::ServerRequest::ctx (CORBA::Context_ptr ctx) } ACE_INLINE const char * -CORBA::ServerRequest::operation (void) const +CORBA::ServerRequest::operation () const { return this->orb_server_request_.operation (); } @@ -43,7 +43,7 @@ CORBA::ServerRequest::_tao_lazy_evaluation (bool lazy_evaluation) } ACE_INLINE int -CORBA::ServerRequest::_tao_incoming_byte_order (void) const +CORBA::ServerRequest::_tao_incoming_byte_order () const { return this->orb_server_request_.incoming ()->byte_order (); } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 46d984c0dad..c58073a777c 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -61,13 +61,13 @@ CORBA::UnknownUserException::_downcast (CORBA::Exception const * ex) } void -CORBA::UnknownUserException::_raise (void) const +CORBA::UnknownUserException::_raise () const { throw *this; } CORBA::Exception * -CORBA::UnknownUserException::_tao_duplicate (void) const +CORBA::UnknownUserException::_tao_duplicate () const { CORBA::Exception *result = nullptr; ACE_NEW_RETURN ( @@ -90,13 +90,13 @@ CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &) } const char * -CORBA::UnknownUserException::_rep_id (void) const +CORBA::UnknownUserException::_rep_id () const { return this->exception_->_tao_get_typecode ()->id (); } CORBA::TypeCode_ptr -CORBA::UnknownUserException::_tao_type (void) const +CORBA::UnknownUserException::_tao_type () const { //return CORBA::_tc_UnknownUserException; return this->exception_->_tao_get_typecode (); diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index 1d77cf0ec79..4a2a88379a1 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -60,9 +60,9 @@ namespace CORBA CORBA::Any& exception (void); /// To throw an UnknownUserException of this type. - virtual void _raise (void) const; + virtual void _raise () const; - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; virtual void _tao_encode (TAO_OutputCDR &cdr) const; virtual void _tao_decode (TAO_InputCDR &cdr); @@ -71,12 +71,12 @@ namespace CORBA static UnknownUserException const * _downcast (CORBA::Exception const * ex); /// Return the repository ID of the Exception. - virtual const char * _rep_id (void) const; + virtual const char * _rep_id () const; // = TAO specific extension. /// This class has a specific typecode. - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; private: /// Holder for the actual exception. diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index bfc7bcc1a0d..852e4862245 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -177,7 +177,7 @@ TAO_DTP_Thread_Pool::above_minimum (void) } CORBA::ULong -TAO_DTP_Thread_Pool::current_threads (void) const +TAO_DTP_Thread_Pool::current_threads () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, @@ -564,7 +564,7 @@ TAO_DTP_Thread_Pool_Manager::create_threadpool_helper (TAO_DTP_Thread_Pool *thre } TAO_ORB_Core & -TAO_DTP_Thread_Pool_Manager::orb_core (void) const +TAO_DTP_Thread_Pool_Manager::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index df83f5f3124..6789f78a869 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -78,7 +78,7 @@ public: int svc (void); /// Accessor to the pool to which this thread belongs to. - TAO_DTP_Thread_Pool &pool (void) const; + TAO_DTP_Thread_Pool &pool () const; protected: /// Do the real work @@ -161,12 +161,12 @@ public: /// @name Accessors // @{ - bool use_timeouts (void) const; - const ACE_Time_Value& dynamic_thread_time (void) const; + bool use_timeouts () const; + const ACE_Time_Value& dynamic_thread_time () const; - TAO_DTP_Thread_Pool_Manager &manager (void) const; - CORBA::ULong id (void) const; - CORBA::ULong current_threads (void) const; + TAO_DTP_Thread_Pool_Manager &manager () const; + CORBA::ULong id () const; + CORBA::ULong current_threads () const; void add_active (void); bool remove_active (bool force); @@ -237,7 +237,7 @@ public: /// @name Accessors // @{ - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; // @} private: diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl index dc69f734e13..105c1891782 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.inl @@ -3,35 +3,35 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_DTP_Thread_Pool & -TAO_DTP_Thread_Pool_Threads::pool (void) const +TAO_DTP_Thread_Pool_Threads::pool () const { return this->pool_; } ACE_INLINE TAO_DTP_Thread_Pool_Manager & -TAO_DTP_Thread_Pool::manager (void) const +TAO_DTP_Thread_Pool::manager () const { return this->manager_; } ACE_INLINE CORBA::ULong -TAO_DTP_Thread_Pool::id (void) const +TAO_DTP_Thread_Pool::id () const { return this->id_; } ACE_INLINE bool -TAO_DTP_Thread_Pool::use_timeouts (void) const +TAO_DTP_Thread_Pool::use_timeouts () const { return this->definition_.max_threads_ > -1; } ACE_INLINE const ACE_Time_Value& -TAO_DTP_Thread_Pool::dynamic_thread_time (void) const +TAO_DTP_Thread_Pool::dynamic_thread_time () const { return this->definition_.timeout_; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp index 1dd94ee7058..2b7092ae0f2 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp @@ -151,12 +151,12 @@ TAO_ETCL_Literal_Constraint::operator= (const TAO_ETCL_Literal_Constraint& co) this->copy (co); } -TAO_ETCL_Literal_Constraint::operator CORBA::Boolean (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Boolean () const { return this->ETCL_Literal_Constraint::operator ACE_CDR::Boolean (); } -TAO_ETCL_Literal_Constraint::operator CORBA::ULong (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::ULong () const { switch (this->type_) { @@ -174,7 +174,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::ULong (void) const } } -TAO_ETCL_Literal_Constraint::operator CORBA::Long (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Long () const { switch (this->type_) { @@ -192,7 +192,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Long (void) const } } -TAO_ETCL_Literal_Constraint::operator CORBA::Double (void) const +TAO_ETCL_Literal_Constraint::operator CORBA::Double () const { switch (this->type_) { @@ -210,7 +210,7 @@ TAO_ETCL_Literal_Constraint::operator CORBA::Double (void) const } } -TAO_ETCL_Literal_Constraint::operator const char* (void) const +TAO_ETCL_Literal_Constraint::operator const char* () const { switch (this->type_) { @@ -228,7 +228,7 @@ TAO_ETCL_Literal_Constraint::operator const char* (void) const } } -TAO_ETCL_Literal_Constraint::operator TAO::Any_Impl* (void) const +TAO_ETCL_Literal_Constraint::operator TAO::Any_Impl* () const { return (this->type_ == ACE_ETCL_COMPONENT) ? this->any_ : 0; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.h b/TAO/tao/ETCL/TAO_ETCL_Constraint.h index d927d1a051c..7187aa54804 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.h +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.h @@ -62,12 +62,12 @@ public: void operator= (const TAO_ETCL_Literal_Constraint& co); // Conversion routines. - operator ACE_CDR::Boolean (void) const; - operator ACE_CDR::ULong (void) const; - operator ACE_CDR::Long (void) const; - operator ACE_CDR::Double (void) const; - operator const char* (void) const; - operator TAO::Any_Impl* (void) const; + operator ACE_CDR::Boolean () const; + operator ACE_CDR::ULong () const; + operator ACE_CDR::Long () const; + operator ACE_CDR::Double () const; + operator const char* () const; + operator TAO::Any_Impl* () const; // Return the type represented by this MysteryOperand. diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index b5f931e3026..8119ff6643b 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -53,13 +53,13 @@ public: virtual ~TAO_Endpoint () = default; /// IOP protocol tag accessor. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// @c priority_ attribute setter. void priority (CORBA::Short priority); /// @c priority_ attribute getter. - CORBA::Short priority (void) const; + CORBA::Short priority () const; /** * @name TAO_Endpoint Template Methods diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp index 079baa48b27..a245b774cb1 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.cpp @@ -29,7 +29,7 @@ TAO_EndpointPolicy_i::policy_type (void) } TAO_EndpointPolicy_i * -TAO_EndpointPolicy_i::clone (void) const +TAO_EndpointPolicy_i::clone () const { TAO_EndpointPolicy_i *copy = 0; ACE_NEW_RETURN (copy, @@ -67,7 +67,7 @@ TAO_EndpointPolicy_i::destroy (void) } TAO_Cached_Policy_Type -TAO_EndpointPolicy_i::_tao_cached_type (void) const +TAO_EndpointPolicy_i::_tao_cached_type () const { return TAO_CACHED_POLICY_ENDPOINT; } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h index 2d28585fe82..5fe59a50bb5 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_i.h +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_i.h @@ -53,7 +53,7 @@ public: virtual ~TAO_EndpointPolicy_i (); /// Returns a copy of this> - virtual TAO_EndpointPolicy_i *clone (void) const; + virtual TAO_EndpointPolicy_i *clone () const; // = The EndpointPolicy::Policy methods @@ -64,7 +64,7 @@ public: virtual void destroy (void); // Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; virtual EndpointPolicy::EndpointList * value (void); diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 4c2e9d7cfc7..126b3476a5e 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -165,7 +165,7 @@ namespace CORBA * class SomeException : public // Derives from CORBA::Exception * { * public: - * virtual CORBA::Exception *_tao_duplicate (void) const + * virtual CORBA::Exception *_tao_duplicate () const * { * CORBA::Exception *result = 0; * ACE_NEW_RETURN ( diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 5ca66d03114..9f7ac53d101 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE const typename S_forany::_slice_type * -TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const +TAO::In_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index 1b361835386..09a8bd2d4c6 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE const S & -TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const +TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg () const { return *this->x_; } diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h index 7192fbc14dd..71f35eef866 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.h +++ b/TAO/tao/GIOP_Message_Locate_Header.h @@ -40,10 +40,10 @@ public: void request_id (CORBA::ULong id); /// Get the request id - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Get the object_key in read mode.. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Get the object_key in read/write mode.. TAO::ObjectKey &object_key (void); diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl index 9a97ae2d600..4d38b855e10 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.inl +++ b/TAO/tao/GIOP_Message_Locate_Header.inl @@ -19,13 +19,13 @@ TAO_GIOP_Locate_Request_Header::request_id (CORBA::ULong id) } ACE_INLINE CORBA::ULong -TAO_GIOP_Locate_Request_Header::request_id (void) const +TAO_GIOP_Locate_Request_Header::request_id () const { return this->request_id_; } ACE_INLINE const TAO::ObjectKey & -TAO_GIOP_Locate_Request_Header::object_key (void) const +TAO_GIOP_Locate_Request_Header::object_key () const { return this->profile_.object_key (); } diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl index 5fb5c6b5536..b60c5827ffe 100644 --- a/TAO/tao/GIOP_Message_Version.inl +++ b/TAO/tao/GIOP_Message_Version.inl @@ -30,13 +30,13 @@ TAO_GIOP_Message_Version::operator!= (const TAO_GIOP_Message_Version &src) const } ACE_INLINE CORBA::Octet -TAO_GIOP_Message_Version::major_version (void) const +TAO_GIOP_Message_Version::major_version () const { return this->major; } ACE_INLINE CORBA::Octet -TAO_GIOP_Message_Version::minor_version (void) const +TAO_GIOP_Message_Version::minor_version () const { return this->minor; } diff --git a/TAO/tao/HTTP_Handler.h b/TAO/tao/HTTP_Handler.h index ee85c1d971f..60bc2d2869f 100644 --- a/TAO/tao/HTTP_Handler.h +++ b/TAO/tao/HTTP_Handler.h @@ -47,7 +47,7 @@ public: ACE_TCHAR *filename); /// returns the number of bytes read/written in the last operation. - size_t byte_count (void) const; + size_t byte_count () const; /// Activate this instance of the <HTTP_Handler> virtual int open (void * = 0); diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index 361580a4f40..124d7f78697 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -53,13 +53,13 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); /// Returns address for default endpoint - const ACE_INET_Addr& default_address (void) const; + const ACE_INET_Addr& default_address () const; /// Set address for default endpoint void set_default_address (const ACE_INET_Addr& addr); diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl index c0912da1c6c..b5ca077b2aa 100644 --- a/TAO/tao/IIOP_Acceptor.inl +++ b/TAO/tao/IIOP_Acceptor.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_IIOP_Acceptor::address (void) const +TAO_IIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); @@ -25,7 +25,7 @@ TAO_IIOP_Acceptor::endpoints (void) } ACE_INLINE const ACE_INET_Addr& -TAO_IIOP_Acceptor::default_address (void) const +TAO_IIOP_Acceptor::default_address () const { return this->default_address_; } diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h index 1ecabbcf012..7012aac3152 100644 --- a/TAO/tao/IIOP_Connector.h +++ b/TAO/tao/IIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; public: typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler> @@ -86,7 +86,7 @@ protected: /// connection attempts. The base implementation always returns /// 0. Override to return non-zero if parallel connection attempts /// may be tried. - virtual int supports_parallel_connects (void) const; + virtual int supports_parallel_connects () const; // = The TAO_Connector methods, please check the documentation on // Transport_Connector.h diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h index 4279c0fa733..d8f7647c6a5 100644 --- a/TAO/tao/IIOP_Endpoint.h +++ b/TAO/tao/IIOP_Endpoint.h @@ -109,31 +109,31 @@ public: // = IIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); /// Do we have a preferred local network for the target? - bool is_preferred_network (void) const; + bool is_preferred_network () const; /// Return the preferred network if any. - const char *preferred_network (void) const; + const char *preferred_network () const; #if defined (ACE_HAS_IPV6) /// Does the host string represent an IPv6 decimal address. - bool is_ipv6_decimal (void) const; + bool is_ipv6_decimal () const; #endif /* ACE_HAS_IPV6 */ /// Need to have an assignment operator since the IIOP_Profile class may @@ -160,7 +160,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr () call. - void object_addr_i (void) const; + void object_addr_i () const; /// Generate preferred interfaces from the options passed in by the /// user. diff --git a/TAO/tao/IIOP_Endpoint.inl b/TAO/tao/IIOP_Endpoint.inl index d00dc77ff6a..06ba4371cc3 100644 --- a/TAO/tao/IIOP_Endpoint.inl +++ b/TAO/tao/IIOP_Endpoint.inl @@ -4,13 +4,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_IIOP_Endpoint::host (void) const +TAO_IIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_IIOP_Endpoint::port (void) const +TAO_IIOP_Endpoint::port () const { return this->port_; } @@ -23,7 +23,7 @@ TAO_IIOP_Endpoint::port (CORBA::UShort p) #if defined (ACE_HAS_IPV6) ACE_INLINE bool -TAO_IIOP_Endpoint::is_ipv6_decimal (void) const +TAO_IIOP_Endpoint::is_ipv6_decimal () const { return this->is_ipv6_decimal_; } diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h index d024ff09126..d912f287795 100644 --- a/TAO/tao/IIOP_Factory.h +++ b/TAO/tao/IIOP_Factory.h @@ -44,16 +44,16 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; }; ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory) diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index a3c45dc3fca..98248d2b542 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -86,10 +86,10 @@ public: virtual void add_generic_endpoint (TAO_Endpoint *ep); /// The object key delimiter that IIOP uses or expects. - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; /// Encode endpoints for RT profiles, using a single TAO_TAG_ENDPOINT /// component. @@ -106,7 +106,7 @@ public: /// regardless of the final type of the profile. virtual TAO_Endpoint *base_endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); protected: diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp index 74dc4170f9f..b2a8384ff51 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp +++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp @@ -79,7 +79,7 @@ TAO_AMH_Locate_ResponseHandler::_unchecked_narrow (CORBA::Object_ptr obj) } const char* -TAO_AMH_Locate_ResponseHandler::_interface_repository_id (void) const +TAO_AMH_Locate_ResponseHandler::_interface_repository_id () const { return 0; } diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h index 788c66983b0..f07c884b168 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.h +++ b/TAO/tao/IORTable/Locate_ResponseHandler.h @@ -58,16 +58,16 @@ public: TAO_AMH_Locate_ResponseHandler_ptr); TAO_AMH_Locate_ResponseHandler_var &operator= ( const TAO_AMH_Locate_ResponseHandler_var &); - TAO_AMH_Locate_ResponseHandler_ptr operator-> (void) const; + TAO_AMH_Locate_ResponseHandler_ptr operator-> () const; operator const TAO_AMH_Locate_ResponseHandler_ptr &() const; operator TAO_AMH_Locate_ResponseHandler_ptr &(); - TAO_AMH_Locate_ResponseHandler_ptr in (void) const; + TAO_AMH_Locate_ResponseHandler_ptr in () const; TAO_AMH_Locate_ResponseHandler_ptr &inout (void); TAO_AMH_Locate_ResponseHandler_ptr &out (void); TAO_AMH_Locate_ResponseHandler_ptr _retn (void); - TAO_AMH_Locate_ResponseHandler_ptr ptr (void) const; + TAO_AMH_Locate_ResponseHandler_ptr ptr () const; private: TAO_AMH_Locate_ResponseHandler_ptr ptr_; diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl index ad103ae89bf..0049174c13a 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.inl +++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl @@ -32,7 +32,7 @@ TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void) } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::ptr (void) const +TAO_AMH_Locate_ResponseHandler_var::ptr () const { return this->ptr_; } @@ -74,13 +74,13 @@ TAO_AMH_Locate_ResponseHandler_var::operator TAO_AMH_Locate_ResponseHandler_ptr } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::operator-> (void) const +TAO_AMH_Locate_ResponseHandler_var::operator-> () const { return this->ptr_; } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::in (void) const +TAO_AMH_Locate_ResponseHandler_var::in () const { return this->ptr_; } diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp index 200ed522c12..f6240e35da4 100644 --- a/TAO/tao/IORTable/Table_Adapter.cpp +++ b/TAO/tao/IORTable/Table_Adapter.cpp @@ -69,7 +69,7 @@ TAO_Table_Adapter::check_close (int) } int -TAO_Table_Adapter::priority (void) const +TAO_Table_Adapter::priority () const { return static_cast<int> (TAO_DEFAULT_ADAPTER_REGISTRY_SIZE); } @@ -89,7 +89,7 @@ TAO_Table_Adapter::dispatch (TAO::ObjectKey &key, } const char * -TAO_Table_Adapter::name (void) const +TAO_Table_Adapter::name () const { return "IORTable"; } diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h index bacc09725f3..6b0e775a3b3 100644 --- a/TAO/tao/IORTable/Table_Adapter.h +++ b/TAO/tao/IORTable/Table_Adapter.h @@ -44,12 +44,12 @@ public: virtual void open (void); virtual void close (int wait_for_completion); virtual void check_close (int wait_for_completion); - virtual int priority (void) const; + virtual int priority () const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out foward_to); - virtual const char *name (void) const; + virtual const char *name () const; virtual CORBA::Object_ptr root (void); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); diff --git a/TAO/tao/Incoming_Message_Queue.inl b/TAO/tao/Incoming_Message_Queue.inl index f9623de1742..fcf39d83a9b 100644 --- a/TAO/tao/Incoming_Message_Queue.inl +++ b/TAO/tao/Incoming_Message_Queue.inl @@ -11,7 +11,7 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core) } ACE_INLINE CORBA::ULong -TAO_Incoming_Message_Queue::queue_length (void) const +TAO_Incoming_Message_Queue::queue_length () const { return this->size_; } diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index 955310daf83..17e2988230e 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE TAO_Stub * - Invocation_Base::stub (void) const + Invocation_Base::stub () const { return this->stub_; } @@ -30,13 +30,13 @@ namespace TAO } ACE_INLINE CORBA::Boolean - Invocation_Base::response_expected (void) const + Invocation_Base::response_expected () const { return this->response_expected_; } ACE_INLINE GIOP::ReplyStatusType - Invocation_Base::reply_status (void) const + Invocation_Base::reply_status () const { return this->reply_status_; } @@ -48,13 +48,13 @@ namespace TAO } ACE_INLINE CORBA::Object_ptr - Invocation_Base::target (void) const + Invocation_Base::target () const { return this->otarget_; } ACE_INLINE CORBA::Object_ptr - Invocation_Base::effective_target (void) const + Invocation_Base::effective_target () const { return this->target_; } @@ -79,7 +79,7 @@ namespace TAO } ACE_INLINE TAO::Invocation_Status - Invocation_Base::invoke_status (void) const + Invocation_Base::invoke_status () const { return this->invoke_status_; } @@ -91,7 +91,7 @@ namespace TAO } ACE_INLINE bool - Invocation_Base::is_remote_request (void) const + Invocation_Base::is_remote_request () const { return this->is_remote_request_; } diff --git a/TAO/tao/LF_CH_Event.h b/TAO/tao/LF_CH_Event.h index 0f9a99c40e1..4e2c5a0a8a7 100644 --- a/TAO/tao/LF_CH_Event.h +++ b/TAO/tao/LF_CH_Event.h @@ -57,7 +57,7 @@ public: //@{ protected: /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const; + virtual bool is_state_final () const; //@} private: @@ -100,11 +100,11 @@ private: /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; /// Set the state irrespective of anything. virtual void set_state (LFS_STATE new_state); diff --git a/TAO/tao/LF_Event.h b/TAO/tao/LF_Event.h index 56abc8cde0e..6d661658616 100644 --- a/TAO/tao/LF_Event.h +++ b/TAO/tao/LF_Event.h @@ -125,18 +125,18 @@ protected: virtual void state_changed_i (LFS_STATE new_state) = 0; /// Check if we should keep waiting. - bool keep_waiting_i (void) const; + bool keep_waiting_i () const; /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const = 0 ; + virtual bool successful_i () const = 0 ; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const = 0; + virtual bool error_detected_i () const = 0; /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const = 0; + virtual bool is_state_final () const = 0; private: diff --git a/TAO/tao/LF_Event.inl b/TAO/tao/LF_Event.inl index dccfae380bb..f47b63d0b67 100644 --- a/TAO/tao/LF_Event.inl +++ b/TAO/tao/LF_Event.inl @@ -26,7 +26,7 @@ TAO_LF_Event::reset_state (LFS_STATE new_state) } ACE_INLINE bool -TAO_LF_Event::keep_waiting_i (void) const +TAO_LF_Event::keep_waiting_i () const { return (!this->successful_i ()) && (!this->error_detected_i ()); } diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.h b/TAO/tao/LF_Event_Loop_Thread_Helper.h index 9b6373d23d6..71462061a0e 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.h +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h @@ -40,7 +40,7 @@ public: ~TAO_LF_Event_Loop_Thread_Helper (void); /// Calls @c set_event_loop_thread on the leader/followers object. - int event_loop_return (void) const; + int event_loop_return () const; private: /// Reference to leader/followers object. diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index de0689bed3d..57ca9424aca 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -22,7 +22,7 @@ TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void) } ACE_INLINE int -TAO_LF_Event_Loop_Thread_Helper::event_loop_return (void) const +TAO_LF_Event_Loop_Thread_Helper::event_loop_return () const { return this->event_loop_return_; } diff --git a/TAO/tao/LF_Invocation_Event.h b/TAO/tao/LF_Invocation_Event.h index de5a422f4c3..1af364d0044 100644 --- a/TAO/tao/LF_Invocation_Event.h +++ b/TAO/tao/LF_Invocation_Event.h @@ -62,15 +62,15 @@ protected: /// Return true if the condition was satisfied successfully, false if it /// has not - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; private: /// Check whether we have reached the final state.. - bool is_state_final (void) const; + bool is_state_final () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/LF_Multi_Event.h b/TAO/tao/LF_Multi_Event.h index 8411652f92a..bb8497e3df1 100644 --- a/TAO/tao/LF_Multi_Event.h +++ b/TAO/tao/LF_Multi_Event.h @@ -68,17 +68,17 @@ protected: virtual void state_changed_i (LFS_STATE new_state); /// Check whether we have reached the final state.. - virtual bool is_state_final (void) const; + virtual bool is_state_final () const; /// Return true if the condition was satisfied successfully, false if it /// has not - This iterates over the list of attached events and /// returns true if any of them return true from successful. - virtual bool successful_i (void) const; + virtual bool successful_i () const; /// Return true if an error was detected while waiting for the /// event - This iterates over the list of events and returns /// true only if all of them return true from error_detected(). - virtual bool error_detected_i (void) const; + virtual bool error_detected_i () const; private: diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 053c2d3f9e2..204541e7678 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -68,7 +68,7 @@ public: void set_upcall_thread (void); /// Is there any thread running as a leader? - bool leader_available (void) const; + bool leader_available () const; /// A server thread is making a request. void set_client_thread (void); @@ -107,7 +107,7 @@ public: void set_client_leader_thread (ACE_thread_t thread_ID); /// Checks if we are a leader thread - bool is_client_leader_thread (void) const; + bool is_client_leader_thread () const; /// Sets the client leader avoidance flag true. This is used with the /// noupcall wait strategy to allow the creation of dynamic threads @@ -163,7 +163,7 @@ public: /** * @return true if there follower set is not empty */ - bool follower_available (void) const; + bool follower_available () const; //@} @@ -180,7 +180,7 @@ public: ACE_Reverse_Lock<TAO_SYNCH_MUTEX> &reverse_lock (void); /// Check if there are any client threads running - bool has_clients (void) const; + bool has_clients () const; /// Accessor to the reactor ACE_Reactor *reactor (void); @@ -198,7 +198,7 @@ public: private: /// Shortcut to obtain the TSS resources of the orb core. - TAO_ORB_Core_TSS_Resources *get_tss_resources (void) const; + TAO_ORB_Core_TSS_Resources *get_tss_resources () const; /// Wait for the client leader to complete. int wait_for_client_leader_to_complete (ACE_Time_Value *max_wait_time); diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl index 5c9c7d546ea..c49cb5d2bb4 100644 --- a/TAO/tao/Leader_Follower.inl +++ b/TAO/tao/Leader_Follower.inl @@ -23,7 +23,7 @@ TAO_Leader_Follower::TAO_Leader_Follower (TAO_ORB_Core* orb_core, } ACE_INLINE TAO_ORB_Core_TSS_Resources * -TAO_Leader_Follower::get_tss_resources (void) const +TAO_Leader_Follower::get_tss_resources () const { return this->orb_core_->get_tss_resources (); } @@ -35,7 +35,7 @@ TAO_Leader_Follower::set_avoid_client_leader (void) } ACE_INLINE bool -TAO_Leader_Follower::follower_available (void) const +TAO_Leader_Follower::follower_available () const { return !this->follower_set_.is_empty (); } @@ -158,7 +158,7 @@ TAO_Leader_Follower::set_upcall_thread (void) } ACE_INLINE bool -TAO_Leader_Follower::leader_available (void) const +TAO_Leader_Follower::leader_available () const { return this->leaders_ != 0; } @@ -188,7 +188,7 @@ TAO_Leader_Follower::reset_client_leader_thread (void) } ACE_INLINE bool -TAO_Leader_Follower::is_client_leader_thread (void) const +TAO_Leader_Follower::is_client_leader_thread () const { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); return tss->client_leader_thread_ != 0; @@ -213,7 +213,7 @@ TAO_Leader_Follower::reverse_lock (void) } ACE_INLINE bool -TAO_Leader_Follower::has_clients (void) const +TAO_Leader_Follower::has_clients () const { return this->clients_; } diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl index 6622142746f..83707de5eef 100644 --- a/TAO/tao/MProfile.inl +++ b/TAO/tao/MProfile.inl @@ -121,7 +121,7 @@ TAO_MProfile::get_current_handle (void) } ACE_INLINE TAO_PHandle -TAO_MProfile::get_current_handle (void) const +TAO_MProfile::get_current_handle () const { if (current_ > 0) return current_ - 1; @@ -164,13 +164,13 @@ TAO_MProfile::forward_from (void) } ACE_INLINE CORBA::ULong -TAO_MProfile::profile_count (void) const +TAO_MProfile::profile_count () const { return this->last_; } ACE_INLINE CORBA::ULong -TAO_MProfile::size (void) const +TAO_MProfile::size () const { return this->size_; } @@ -184,7 +184,7 @@ TAO_MProfile::get_profile (CORBA::ULong slot) const } ACE_INLINE TAO_Profile ** -TAO_MProfile::pfiles (void) const +TAO_MProfile::pfiles () const { return this->pfiles_; } diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index 3c1f7d936c7..e66f3a52033 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -74,7 +74,7 @@ CORBA::ORB::_use_omg_ior_format (void) } ACE_INLINE TAO_ORB_Core * -CORBA::ORB::orb_core (void) const +CORBA::ORB::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index f6ebac0549d..2b2091241ac 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Service_Gestalt* -TAO_ORB_Core::configuration (void) const +TAO_ORB_Core::configuration () const { return this->config_.get (); } @@ -17,7 +17,7 @@ TAO_ORB_Core::_incr_refcnt (void) } ACE_INLINE unsigned long -TAO_ORB_Core::_refcnt (void) const +TAO_ORB_Core::_refcnt () const { return this->refcount_; } @@ -204,7 +204,7 @@ TAO_ORB_Core::optimize_collocation_objects (CORBA::Boolean opt) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::optimize_collocation_objects (void) const +TAO_ORB_Core::optimize_collocation_objects () const { return this->opt_for_collocation_; } @@ -216,13 +216,13 @@ TAO_ORB_Core::use_global_collocation (CORBA::Boolean opt) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::use_global_collocation (void) const +TAO_ORB_Core::use_global_collocation () const { return this->use_global_collocation_; } ACE_INLINE CORBA::ULong -TAO_ORB_Core::get_collocation_strategy (void) const +TAO_ORB_Core::get_collocation_strategy () const { return this->collocation_strategy_; } @@ -328,7 +328,7 @@ TAO_ORB_Core::tss_cleanup (ACE_Array_Base<void *> &ts_objects) } ACE_INLINE bool -TAO_ORB_Core::has_shutdown (void) const +TAO_ORB_Core::has_shutdown () const { return this->has_shutdown_; } @@ -341,7 +341,7 @@ TAO_ORB_Core::thread_per_connection_timeout (ACE_Time_Value &timeout) const } ACE_INLINE const char * -TAO_ORB_Core::orbid (void) const +TAO_ORB_Core::orbid () const { return this->orbid_; } @@ -417,7 +417,7 @@ TAO_ORB_Core::resolve_compression_manager (void) } ACE_INLINE const char * -TAO_ORB_Core::server_id (void) const +TAO_ORB_Core::server_id () const { return this->server_id_.c_str(); } diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index 85d46f6c3c9..a44313f7874 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -9,7 +9,7 @@ TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p) } ACE_INLINE TAO_ORB_Core * -TAO_ORB_Core_Auto_Ptr::get (void) const +TAO_ORB_Core_Auto_Ptr::get () const { return this->p_; } diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index 7a46a14512f..06bb71e0764 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -12,7 +12,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const +TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index e6f00479b3c..1f053542e9d 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -45,7 +45,7 @@ TAO_Object_Ref_Table::end (void) } ACE_INLINE size_t -TAO_Object_Ref_Table::current_size (void) const +TAO_Object_Ref_Table::current_size () const { return this->table_.size (); } diff --git a/TAO/tao/Objref_VarOut_T.inl b/TAO/tao/Objref_VarOut_T.inl index 8f56018c5f6..36a0e5a0dcb 100644 --- a/TAO/tao/Objref_VarOut_T.inl +++ b/TAO/tao/Objref_VarOut_T.inl @@ -18,7 +18,7 @@ TAO_Objref_Var_T<T>::~TAO_Objref_Var_T (void) template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::operator-> (void) const +TAO_Objref_Var_T<T>::operator-> () const { return this->ptr_; } @@ -40,7 +40,7 @@ TAO_Objref_Var_T<T>::operator T *& () template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::in (void) const +TAO_Objref_Var_T<T>::in () const { return this->ptr_; } @@ -76,7 +76,7 @@ TAO_Objref_Var_T<T>::_retn (void) template <typename T> ACE_INLINE T * -TAO_Objref_Var_T<T>::ptr (void) const +TAO_Objref_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp index d40ecfdb54d..1fd298a8791 100644 --- a/TAO/tao/PI/Interceptor_List_T.cpp +++ b/TAO/tao/PI/Interceptor_List_T.cpp @@ -32,7 +32,7 @@ namespace TAO template <typename InterceptorType, typename DetailsType> size_t - Interceptor_List<InterceptorType,DetailsType>::size (void) const + Interceptor_List<InterceptorType,DetailsType>::size () const { return this->interceptors_.size (); } diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index 470ae448192..6dbf4a37bdf 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_ORBInitInfo::orb_core (void) const +TAO_ORBInitInfo::orb_core () const { return this->orb_core_; } @@ -15,7 +15,7 @@ TAO_ORBInitInfo::invalidate (void) } ACE_INLINE PortableInterceptor::SlotId -TAO_ORBInitInfo::slot_count (void) const +TAO_ORBInitInfo::slot_count () const { return this->slot_count_; } diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl index f4feb5dff02..98d3f773177 100644 --- a/TAO/tao/PI/PICurrent.inl +++ b/TAO/tao/PI/PICurrent.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableInterceptor::SlotId -TAO::PICurrent::slot_count (void) const +TAO::PICurrent::slot_count () const { return this->slot_count_; } diff --git a/TAO/tao/Parser_Registry.inl b/TAO/tao/Parser_Registry.inl index 2ebe7c17722..78f43c4e8be 100644 --- a/TAO/tao/Parser_Registry.inl +++ b/TAO/tao/Parser_Registry.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Parser_Registry::Parser_Iterator -TAO_Parser_Registry::begin (void) const +TAO_Parser_Registry::begin () const { return this->parsers_; } ACE_INLINE TAO_Parser_Registry::Parser_Iterator -TAO_Parser_Registry::end (void) const +TAO_Parser_Registry::end () const { return this->parsers_ + this->size_; } diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl index 2dd22a60f12..e067d668d8f 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.inl +++ b/TAO/tao/Pluggable_Messaging_Utils.inl @@ -16,7 +16,7 @@ TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) } ACE_INLINE GIOP::ReplyStatusType -TAO_Pluggable_Reply_Params_Base::reply_status (void) const +TAO_Pluggable_Reply_Params_Base::reply_status () const { return this->reply_status_; } @@ -28,7 +28,7 @@ TAO_Pluggable_Reply_Params_Base::reply_status (GIOP::ReplyStatusType status) } ACE_INLINE GIOP::LocateStatusType -TAO_Pluggable_Reply_Params_Base::locate_reply_status (void) const +TAO_Pluggable_Reply_Params_Base::locate_reply_status () const { return this->locate_reply_status_; } diff --git a/TAO/tao/Policy_Current.h b/TAO/tao/Policy_Current.h index fb4ce4372f2..5770b261738 100644 --- a/TAO/tao/Policy_Current.h +++ b/TAO/tao/Policy_Current.h @@ -55,7 +55,7 @@ public: CORBA::SetOverrideType set_add); // = Set and get the implementation. - TAO_Policy_Current_Impl &implementation (void) const; + TAO_Policy_Current_Impl &implementation () const; TAO_Policy_Current_Impl &implementation (TAO_Policy_Current_Impl &); }; diff --git a/TAO/tao/Policy_Set.inl b/TAO/tao/Policy_Set.inl index bd1fd8f2b05..8a1474a7866 100644 --- a/TAO/tao/Policy_Set.inl +++ b/TAO/tao/Policy_Set.inl @@ -16,7 +16,7 @@ TAO_Policy_Set::get_policy_by_index (CORBA::ULong index) const } ACE_INLINE CORBA::ULong -TAO_Policy_Set::num_policies (void) const +TAO_Policy_Set::num_policies () const { return this->policy_list_.length(); } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index 4258e4a19d6..61d2bb711a6 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -7,49 +7,49 @@ namespace TAO { ACE_INLINE ThreadStrategy* - Active_Policy_Strategies::thread_strategy (void) const + Active_Policy_Strategies::thread_strategy () const { return this->thread_strategy_; } ACE_INLINE RequestProcessingStrategy* - Active_Policy_Strategies::request_processing_strategy (void) const + Active_Policy_Strategies::request_processing_strategy () const { return this->request_processing_strategy_; } ACE_INLINE IdAssignmentStrategy * - Active_Policy_Strategies::id_assignment_strategy (void) const + Active_Policy_Strategies::id_assignment_strategy () const { return this->id_assignment_strategy_; } ACE_INLINE IdUniquenessStrategy * - Active_Policy_Strategies::id_uniqueness_strategy (void) const + Active_Policy_Strategies::id_uniqueness_strategy () const { return this->id_uniqueness_strategy_; } ACE_INLINE LifespanStrategy* - Active_Policy_Strategies::lifespan_strategy (void) const + Active_Policy_Strategies::lifespan_strategy () const { return this->lifespan_strategy_; } ACE_INLINE ImplicitActivationStrategy* - Active_Policy_Strategies::implicit_activation_strategy (void) const + Active_Policy_Strategies::implicit_activation_strategy () const { return this->implicit_activation_strategy_; } ACE_INLINE ServantRetentionStrategy* - Active_Policy_Strategies::servant_retention_strategy (void) const + Active_Policy_Strategies::servant_retention_strategy () const { return this->servant_retention_strategy_; } diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h index 672669ea00c..9b682bd4bbd 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.h +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h @@ -45,7 +45,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - const typename S_var::s_traits::char_type * arg (void) const; + const typename S_var::s_traits::char_type * arg () const; private: S_var x_; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index fd3b9a1c555..6616af35a12 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -15,7 +15,7 @@ template<typename S_var, ACE_INLINE const typename S_var::s_traits::char_type * TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) const +arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index ad55e7d9bc8..b9d5f96a1f4 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -11,7 +11,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index 10b275e2435..7308e632c6f 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -37,7 +37,7 @@ namespace TAO } ACE_INLINE const void * - Creation_Time::creation_time (void) const + Creation_Time::creation_time () const { return &this->time_stamp_; } diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 9843888e5bb..11e778ca6a9 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type const * TAO::In_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) const + Insert_Policy>::arg () const { S_forany tmp (this->x_); return tmp.in (); diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index 69029fde51c..c93447fbe10 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl index eb9d69ca13c..d9b4fc5439a 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl @@ -6,7 +6,7 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::TAO_Root_POA & - Non_Servant_Upcall::poa (void) const + Non_Servant_Upcall::poa () const { return this->poa_; } diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 41fa5df4626..603fac7b612 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -129,19 +129,19 @@ TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name, } ACE_INLINE TAO_Root_POA * -TAO_Object_Adapter::root_poa (void) const +TAO_Object_Adapter::root_poa () const { return this->root_; } ACE_INLINE TAO_ORB_Core & -TAO_Object_Adapter::orb_core (void) const +TAO_Object_Adapter::orb_core () const { return this->orb_core_; } ACE_INLINE TAO::Portable_Server::Non_Servant_Upcall * -TAO_Object_Adapter::non_servant_upcall_in_progress (void) const +TAO_Object_Adapter::non_servant_upcall_in_progress () const { return this->non_servant_upcall_in_progress_; } diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index fdda464dbdf..d7e8a6fa572 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -7,7 +7,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const +TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index efb11b50208..05fc7d21eb6 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -67,7 +67,7 @@ TAO_POA_Manager::get_state (void) } ACE_INLINE char* -TAO_POA_Manager::generate_manager_id (void) const +TAO_POA_Manager::generate_manager_id () const { // The AdapterManagerId must be unique across all Adapter Managers // (e.g. POAManagers) within a given process. To avoid locking diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl index 0af8dc775eb..8be5ab21972 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.inl +++ b/TAO/tao/PortableServer/POA_Current_Impl.inl @@ -14,7 +14,7 @@ namespace TAO } ACE_INLINE ::TAO_Root_POA * - POA_Current_Impl::poa (void) const + POA_Current_Impl::poa () const { return this->poa_; } @@ -41,7 +41,7 @@ namespace TAO } ACE_INLINE const PortableServer::ObjectId & - POA_Current_Impl::object_id (void) const + POA_Current_Impl::object_id () const { return this->object_id_; } @@ -65,7 +65,7 @@ namespace TAO } ACE_INLINE const TAO::ObjectKey & - POA_Current_Impl::object_key (void) const + POA_Current_Impl::object_key () const { return *this->object_key_; } @@ -77,7 +77,7 @@ namespace TAO } ACE_INLINE PortableServer::Servant - POA_Current_Impl::servant (void) const + POA_Current_Impl::servant () const { return this->servant_; } @@ -89,7 +89,7 @@ namespace TAO } ACE_INLINE CORBA::Short - POA_Current_Impl::priority (void) const + POA_Current_Impl::priority () const { return this->priority_; } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl index 6b8620f566f..26a39c0ec81 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.inl +++ b/TAO/tao/PortableServer/POA_Policy_Set.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_POA_Policy_Set::num_policies (void) const +TAO_POA_Policy_Set::num_policies () const { return this->impl_.num_policies (); } diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index f83dc99c883..e3dabccb7ac 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -81,7 +81,7 @@ TAO_Root_POA::persistent (void) } ACE_INLINE const ACE_CString & -TAO_Root_POA::name (void) const +TAO_Root_POA::name () const { return this->name_; } @@ -93,13 +93,13 @@ TAO_Root_POA::the_name (void) } ACE_INLINE const TAO_Object_Adapter::poa_name & -TAO_Root_POA::folded_name (void) const +TAO_Root_POA::folded_name () const { return this->folded_name_; } ACE_INLINE const TAO_Object_Adapter::poa_name & -TAO_Root_POA::system_name (void) const +TAO_Root_POA::system_name () const { return this->system_name_.in (); } @@ -177,7 +177,7 @@ TAO_Root_POA::root_key_type_length (void) } ACE_INLINE CORBA::ULong -TAO_Root_POA::outstanding_requests (void) const +TAO_Root_POA::outstanding_requests () const { return this->outstanding_requests_; } @@ -195,13 +195,13 @@ TAO_Root_POA::decrement_outstanding_requests (void) } ACE_INLINE CORBA::Boolean -TAO_Root_POA::waiting_destruction (void) const +TAO_Root_POA::waiting_destruction () const { return this->waiting_destruction_; } ACE_INLINE TAO_ORB_Core & -TAO_Root_POA::orb_core (void) const +TAO_Root_POA::orb_core () const { return this->orb_core_; } @@ -213,7 +213,7 @@ TAO_Root_POA::get_adapter_state (void) } ACE_INLINE void * -TAO_Root_POA::thread_pool (void) const +TAO_Root_POA::thread_pool () const { return 0; } diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl index 55a62063a64..e275e7a55a0 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.inl +++ b/TAO/tao/PortableServer/Servant_Upcall.inl @@ -6,25 +6,25 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::TAO_Root_POA & - Servant_Upcall::poa (void) const + Servant_Upcall::poa () const { return *this->poa_; } ACE_INLINE PortableServer::Servant - Servant_Upcall::servant (void) const + Servant_Upcall::servant () const { return this->servant_; } ACE_INLINE TAO_Object_Adapter & - Servant_Upcall::object_adapter (void) const + Servant_Upcall::object_adapter () const { return *this->object_adapter_; } ACE_INLINE const PortableServer::ObjectId & - Servant_Upcall::id (void) const + Servant_Upcall::id () const { return this->system_id_; } @@ -37,7 +37,7 @@ namespace TAO } ACE_INLINE const PortableServer::ObjectId & - Servant_Upcall::user_id (void) const + Servant_Upcall::user_id () const { return *(this->user_id_); } @@ -45,7 +45,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void* - Servant_Upcall::locator_cookie (void) const + Servant_Upcall::locator_cookie () const { return this->cookie_; } @@ -57,7 +57,7 @@ namespace TAO } ACE_INLINE const char * - Servant_Upcall::operation (void) const + Servant_Upcall::operation () const { return this->operation_; } @@ -77,19 +77,19 @@ namespace TAO } ACE_INLINE TAO_Active_Object_Map_Entry * - Servant_Upcall::active_object_map_entry (void) const + Servant_Upcall::active_object_map_entry () const { return this->active_object_map_entry_; } ACE_INLINE CORBA::Short - Servant_Upcall::priority (void) const + Servant_Upcall::priority () const { return this->current_context_.priority (); } ACE_INLINE Servant_Upcall::State - Servant_Upcall::state (void) const + Servant_Upcall::state () const { return this->state_; } diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index d3b4b51c590..8b27ee076d7 100644 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl @@ -81,7 +81,7 @@ ACE_INLINE PortableServer::Servant_var<T>::operator void const * () const template <class T> ACE_INLINE T * -PortableServer::Servant_var<T>::in (void) const +PortableServer::Servant_var<T>::in () const { return this->ptr_; } diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index 734692c5848..e08e74db721 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -17,7 +17,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const +TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index 2476cbcfd75..1dca942a25d 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -8,7 +8,7 @@ TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) template<typename S, typename S_var> const S * -TAO::In_UB_String_SArgument_T<S,S_var>::arg (void) const +TAO::In_UB_String_SArgument_T<S,S_var>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index cfbc2319434..c4655848d33 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -13,7 +13,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type const * TAO::In_Var_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) const + Insert_Policy>::arg () const { S_forany tmp (this->x_); return tmp.in (); diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 6e7b63d6253..015c9c1c053 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> S const & -TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.h b/TAO/tao/PortableServer/Vector_SArgument_T.h index 958d8234fe5..e72993a27d4 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.h +++ b/TAO/tao/PortableServer/Vector_SArgument_T.h @@ -38,7 +38,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl index 32db5ff5f3e..1ade6aa3b16 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.inl +++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> S const & -TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg (void) const +TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl index 3076b19cce4..733cb9d93c8 100644 --- a/TAO/tao/Profile.inl +++ b/TAO/tao/Profile.inl @@ -2,19 +2,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_Profile::tag (void) const +TAO_Profile::tag () const { return this->tag_; } ACE_INLINE const TAO_GIOP_Message_Version & -TAO_Profile::version (void) const +TAO_Profile::version () const { return this->version_; } ACE_INLINE TAO_ORB_Core * -TAO_Profile::orb_core (void) const +TAO_Profile::orb_core () const { return this->orb_core_; } @@ -38,7 +38,7 @@ TAO_Profile::forward_to_i (void) } ACE_INLINE const TAO_Tagged_Components& -TAO_Profile::tagged_components (void) const +TAO_Profile::tagged_components () const { return this->tagged_components_; } @@ -50,13 +50,13 @@ TAO_Profile::tagged_components (void) } ACE_INLINE CORBA::Short -TAO_Profile::addressing_mode (void) const +TAO_Profile::addressing_mode () const { return this->addressing_mode_; } ACE_INLINE const TAO::ObjectKey & -TAO_Profile::object_key (void) const +TAO_Profile::object_key () const { return this->ref_object_key_->object_key (); } diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index e1a8e716b6a..4b066ac14f1 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -20,43 +20,43 @@ namespace TAO } ACE_INLINE TAO_Stub * - Profile_Transport_Resolver::stub (void) const + Profile_Transport_Resolver::stub () const { return this->stub_; } ACE_INLINE CORBA::Object_ptr - Profile_Transport_Resolver::object (void) const + Profile_Transport_Resolver::object () const { return this->obj_; } ACE_INLINE TAO_Profile * - Profile_Transport_Resolver::profile (void) const + Profile_Transport_Resolver::profile () const { return this->profile_; } ACE_INLINE TAO_Transport * - Profile_Transport_Resolver::transport (void) const + Profile_Transport_Resolver::transport () const { return this->transport_.get (); } ACE_INLINE bool - Profile_Transport_Resolver::blocked_connect (void) const + Profile_Transport_Resolver::blocked_connect () const { return this->blocked_; } ACE_INLINE void - Profile_Transport_Resolver::transport_released (void) const + Profile_Transport_Resolver::transport_released () const { this->is_released_ = true; } ACE_INLINE CORBA::PolicyList * - Profile_Transport_Resolver::inconsistent_policies (void) const + Profile_Transport_Resolver::inconsistent_policies () const { return this->inconsistent_policies_; } diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 63b5c5accf5..9a54afb1e17 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -40,17 +40,17 @@ public: /// The protocol tag, each concrete class will have a specific tag /// value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Verify prefix is a match virtual int match_prefix (const ACE_CString &prefix) = 0; /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const = 0; + virtual const char *prefix () const = 0; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const = 0; + virtual char options_delimiter () const = 0; // Factory methods /// Create an acceptor @@ -66,7 +66,7 @@ public: * point if the server crashes. For those protocols it is better to * create the endpoint only if the user requests one. */ - virtual int requires_explicit_endpoint (void) const = 0; + virtual int requires_explicit_endpoint () const = 0; private: diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index 92e327d3f18..b311939f02a 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -56,7 +56,7 @@ TAO_Pseudo_Var_T<T>::operator typename T::_ptr_type & () template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::operator-> (void) const +TAO_Pseudo_Var_T<T>::operator-> () const { return this->ptr_; } @@ -64,7 +64,7 @@ TAO_Pseudo_Var_T<T>::operator-> (void) const template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::in (void) const +TAO_Pseudo_Var_T<T>::in () const { return this->ptr_; } @@ -100,7 +100,7 @@ TAO_Pseudo_Var_T<T>::_retn (void) template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::ptr (void) const +TAO_Pseudo_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Queued_Data.inl b/TAO/tao/Queued_Data.inl index c5cf403eafb..c90cb50c2e1 100644 --- a/TAO/tao/Queued_Data.inl +++ b/TAO/tao/Queued_Data.inl @@ -61,7 +61,7 @@ TAO_Queued_Data::TAO_Queued_Data (const TAO_Queued_Data &qd) ACE_INLINE size_t -TAO_Queued_Data::missing_data (void) const +TAO_Queued_Data::missing_data () const { return this->missing_data_; } @@ -73,31 +73,31 @@ TAO_Queued_Data::missing_data (size_t data) } ACE_INLINE TAO_GIOP_Message_Version const & -TAO_Queued_Data::giop_version (void) const +TAO_Queued_Data::giop_version () const { return this->state_.giop_version (); } ACE_INLINE CORBA::Octet -TAO_Queued_Data::byte_order (void) const +TAO_Queued_Data::byte_order () const { return this->state_.byte_order (); } ACE_INLINE CORBA::Boolean -TAO_Queued_Data::more_fragments (void) const +TAO_Queued_Data::more_fragments () const { return this->state_.more_fragments (); } ACE_INLINE GIOP::MsgType -TAO_Queued_Data::msg_type (void) const +TAO_Queued_Data::msg_type () const { return this->state_.message_type (); } ACE_INLINE TAO_Queued_Data * -TAO_Queued_Data::next (void) const +TAO_Queued_Data::next () const { return this->next_; } @@ -109,7 +109,7 @@ TAO_Queued_Data::next (TAO_Queued_Data* qd) } ACE_INLINE ACE_Message_Block * -TAO_Queued_Data::msg_block (void) const +TAO_Queued_Data::msg_block () const { return this->msg_block_; } @@ -127,7 +127,7 @@ TAO_Queued_Data::state (const TAO_GIOP_Message_State& state) } ACE_INLINE const TAO_GIOP_Message_State& -TAO_Queued_Data::state (void) const +TAO_Queued_Data::state () const { return this->state_; } diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index b88ccc5c81e..2decc9345f5 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -106,10 +106,10 @@ public: */ //@{ /// Set/get the next element in the list - TAO_Queued_Message *next (void) const; + TAO_Queued_Message *next () const; /// Set/get the previous element in the list - TAO_Queued_Message *prev (void) const; + TAO_Queued_Message *prev () const; /// Remove this element from the list void remove_from_list (TAO_Queued_Message *&head, @@ -133,10 +133,10 @@ public: * If the message has been partially sent it returns the number of * bytes that are still not sent. */ - virtual size_t message_length (void) const = 0; + virtual size_t message_length () const = 0; /// Return 1 if all the data has been sent - virtual int all_data_sent (void) const = 0; + virtual int all_data_sent () const = 0; /// Fill up an io vector using the connects of the message /** diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl index e3a6cf8b456..3b06604891c 100644 --- a/TAO/tao/Queued_Message.inl +++ b/TAO/tao/Queued_Message.inl @@ -1,13 +1,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Queued_Message * -TAO_Queued_Message::next (void) const +TAO_Queued_Message::next () const { return this->next_; } ACE_INLINE TAO_Queued_Message * -TAO_Queued_Message::prev (void) const +TAO_Queued_Message::prev () const { return this->prev_; } diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index aa311e58224..a49e502ffaa 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -37,7 +37,7 @@ TAO_Network_Priority_Mapping_Manager::_duplicate ( } const char* -TAO_Network_Priority_Mapping_Manager::_interface_repository_id (void) const +TAO_Network_Priority_Mapping_Manager::_interface_repository_id () const { return "IDL:Network_Priority_Mapping_Manager:1.0"; } diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index be5a8568954..df2c5ca5080 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -71,7 +71,7 @@ public: return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: @@ -100,16 +100,16 @@ public: 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 &); - TAO_Network_Priority_Mapping_Manager_ptr operator-> (void) const; + TAO_Network_Priority_Mapping_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_Network_Priority_Mapping_Manager_ptr &() const; operator TAO_Network_Priority_Mapping_Manager_ptr &(); - TAO_Network_Priority_Mapping_Manager_ptr in (void) const; + TAO_Network_Priority_Mapping_Manager_ptr in () const; TAO_Network_Priority_Mapping_Manager_ptr &inout (void); TAO_Network_Priority_Mapping_Manager_ptr &out (void); TAO_Network_Priority_Mapping_Manager_ptr _retn (void); - TAO_Network_Priority_Mapping_Manager_ptr ptr (void) const; + TAO_Network_Priority_Mapping_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl index 9b2e45ec772..fc1de165745 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl @@ -16,7 +16,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v {} ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::ptr (void) const +TAO_Network_Priority_Mapping_Manager_var::ptr () const { return this->ptr_; } @@ -65,13 +65,13 @@ TAO_Network_Priority_Mapping_Manager_var::operator ::TAO_Network_Priority_Mappin } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::operator-> (void) const +TAO_Network_Priority_Mapping_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::in (void) const +TAO_Network_Priority_Mapping_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index bba2c40b318..cc64c8f81cd 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -30,7 +30,7 @@ TAO_Priority_Mapping_Manager::_duplicate (TAO_Priority_Mapping_Manager_ptr obj) } const char* -TAO_Priority_Mapping_Manager::_interface_repository_id (void) const +TAO_Priority_Mapping_Manager::_interface_repository_id () const { return "IDL:Priority_Mapping_Manager:1.0"; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 783e1487f93..a2dd7b48886 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -92,16 +92,16 @@ public: TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &); - TAO_Priority_Mapping_Manager_ptr operator-> (void) const; + TAO_Priority_Mapping_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_Priority_Mapping_Manager_ptr &() const; operator TAO_Priority_Mapping_Manager_ptr &(); - TAO_Priority_Mapping_Manager_ptr in (void) const; + TAO_Priority_Mapping_Manager_ptr in () const; TAO_Priority_Mapping_Manager_ptr &inout (void); TAO_Priority_Mapping_Manager_ptr &out (void); TAO_Priority_Mapping_Manager_ptr _retn (void); - TAO_Priority_Mapping_Manager_ptr ptr (void) const; + TAO_Priority_Mapping_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl index c6eef8a2abd..dffaea89b8e 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl @@ -16,7 +16,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (TAO_Priority {} ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::ptr (void) const +TAO_Priority_Mapping_Manager_var::ptr () const { return this->ptr_; } @@ -65,13 +65,13 @@ TAO_Priority_Mapping_Manager_var::operator ::TAO_Priority_Mapping_Manager_ptr &( } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::operator-> (void) const +TAO_Priority_Mapping_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::in (void) const +TAO_Priority_Mapping_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp index d129d4e2de4..157b5747100 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.cpp +++ b/TAO/tao/RTCORBA/RT_Mutex.cpp @@ -63,7 +63,7 @@ TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time) } const char * -TAO_RT_Mutex::name (void) const +TAO_RT_Mutex::name () const { return 0; } @@ -76,7 +76,7 @@ TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name) } const char * -TAO_Named_RT_Mutex::name (void) const +TAO_Named_RT_Mutex::name () const { return this->name_.c_str (); } diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h index 5ac0b0156e8..b17cf860b16 100644 --- a/TAO/tao/RTCORBA/RT_Mutex.h +++ b/TAO/tao/RTCORBA/RT_Mutex.h @@ -66,7 +66,7 @@ public: virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait); /// Returns the name of the mutex. - virtual const char *name (void) const; + virtual const char *name () const; /// Destructor. virtual ~TAO_RT_Mutex (void); @@ -89,7 +89,7 @@ public: TAO_Named_RT_Mutex (const char *name); /// Returns the name of the mutex. - virtual const char *name (void) const; + virtual const char *name () const; protected: diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 1505d6a7a28..3a2229b58e3 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -426,13 +426,13 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco } TAO_Thread_Pool_Manager & -TAO_RT_ORB::tp_manager (void) const +TAO_RT_ORB::tp_manager () const { return *this->tp_manager_; } TAO_ORB_Core * -TAO_RT_ORB::orb_core (void) const +TAO_RT_ORB::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h index 782fa8c0b83..12fd4afb9ec 100644 --- a/TAO/tao/RTCORBA/RT_ORB.h +++ b/TAO/tao/RTCORBA/RT_ORB.h @@ -228,10 +228,10 @@ public: create_client_protocol_policy (const RTCORBA::ProtocolList & protocols); /// Reference to our creating ORB Core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Get the Thread Pool Manager. - TAO_Thread_Pool_Manager &tp_manager (void) const; + TAO_Thread_Pool_Manager &tp_manager () const; /** * This method changes the scheduling policy of the calling thread diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index a7f5a437a8e..453572829f9 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -114,13 +114,13 @@ TAO_PriorityModelPolicy::_tao_decode (TAO_InputCDR &in_cdr) } TAO_Cached_Policy_Type -TAO_PriorityModelPolicy::_tao_cached_type (void) const +TAO_PriorityModelPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_PRIORITY_MODEL; } TAO_Policy_Scope -TAO_PriorityModelPolicy::_tao_scope (void) const +TAO_PriorityModelPolicy::_tao_scope () const { // Note that this policy is propagated to the client even though // it is not specified here. The reason for this is that the @@ -201,13 +201,13 @@ TAO_ThreadpoolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ThreadpoolPolicy::_tao_cached_type (void) const +TAO_ThreadpoolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_THREADPOOL; } TAO_Policy_Scope -TAO_ThreadpoolPolicy::_tao_scope (void) const +TAO_ThreadpoolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); @@ -271,13 +271,13 @@ TAO_PrivateConnectionPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_PrivateConnectionPolicy::_tao_cached_type (void) const +TAO_PrivateConnectionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_PRIVATE_CONNECTION; } TAO_Policy_Scope -TAO_PrivateConnectionPolicy::_tao_scope (void) const +TAO_PrivateConnectionPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_OBJECT_SCOPE | TAO_POLICY_THREAD_SCOPE | @@ -376,13 +376,13 @@ TAO_PriorityBandedConnectionPolicy::_tao_decode (TAO_InputCDR &in_cdr) } TAO_Cached_Policy_Type -TAO_PriorityBandedConnectionPolicy::_tao_cached_type (void) const +TAO_PriorityBandedConnectionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION; } TAO_Policy_Scope -TAO_PriorityBandedConnectionPolicy::_tao_scope (void) const +TAO_PriorityBandedConnectionPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -470,13 +470,13 @@ TAO_ServerProtocolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ServerProtocolPolicy::_tao_cached_type (void) const +TAO_ServerProtocolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_SERVER_PROTOCOL; } TAO_Policy_Scope -TAO_ServerProtocolPolicy::_tao_scope (void) const +TAO_ServerProtocolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); @@ -569,13 +569,13 @@ TAO_ClientProtocolPolicy::destroy (void) } TAO_Cached_Policy_Type -TAO_ClientProtocolPolicy::_tao_cached_type (void) const +TAO_ClientProtocolPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL; } TAO_Policy_Scope -TAO_ClientProtocolPolicy::_tao_scope (void) const +TAO_ClientProtocolPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h index 89d48daf6bb..b145bb51e29 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.h +++ b/TAO/tao/RTCORBA/RT_Policy_i.h @@ -79,10 +79,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -135,10 +135,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -185,10 +185,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -248,10 +248,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -311,10 +311,10 @@ public: void destroy (void); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. @@ -377,10 +377,10 @@ public: CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); // Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// Helper method for the implementation of /// CORBA::ORB::create_policy. diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp index c2d3aa2ba91..c7ae47b6ab6 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp @@ -167,7 +167,7 @@ RTCORBA::ProtocolProperties::_is_a (const char *value) } } -const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const +const char* RTCORBA::ProtocolProperties::_interface_repository_id () const { return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"; } diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index d45c28b2535..f32303eb9ba 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -109,7 +109,7 @@ namespace RTCORBA // be\be_visitor_interface/interface_ch.cpp:216 virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); // CDR Encoder/Decoder methods. (handcrafted) diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index b429de80109..ce87cde295e 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -105,7 +105,7 @@ TAO_RT_Transport_Descriptor::is_equivalent (const TAO_Transport_Descriptor_Inter } u_long -TAO_RT_Transport_Descriptor::hash (void) const +TAO_RT_Transport_Descriptor::hash () const { return this->endpoint_->hash (); } diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h index 20e3f23682c..58144c5adc7 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h @@ -56,7 +56,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop); /// Generate hash value for our class - virtual u_long hash (void) const; + virtual u_long hash () const; private: /// Stack of properties. diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 9f7e37d1229..241f24e2501 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -384,7 +384,7 @@ TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile) } CORBA::ULong -TAO_Thread_Lane::current_threads (void) const +TAO_Thread_Lane::current_threads () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, @@ -943,7 +943,7 @@ TAO_Thread_Pool_Manager::get_threadpool (RTCORBA::ThreadpoolId thread_pool_id ) } TAO_ORB_Core & -TAO_Thread_Pool_Manager::orb_core (void) const +TAO_Thread_Pool_Manager::orb_core () const { return this->orb_core_; } diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h index 6fd40ceb412..1ce347b00e6 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.h +++ b/TAO/tao/RTCORBA/Thread_Pool.h @@ -78,7 +78,7 @@ public: int svc (void); /// Accessor to the lane to which this thread belongs to. - TAO_Thread_Lane &lane (void) const; + TAO_Thread_Lane &lane () const; /// Set TSS resources for the current thread. static void set_tss_resources (TAO_ORB_Core &orb_core, @@ -173,22 +173,22 @@ public: /// @name Accessors // @{ - TAO_Thread_Pool &pool (void) const; - CORBA::ULong id (void) const; + TAO_Thread_Pool &pool () const; + CORBA::ULong id () const; - CORBA::Short lane_priority (void) const; - CORBA::ULong static_threads (void) const; - CORBA::ULong dynamic_threads (void) const; + CORBA::Short lane_priority () const; + CORBA::ULong static_threads () const; + CORBA::ULong dynamic_threads () const; - CORBA::ULong current_threads (void) const; + CORBA::ULong current_threads () const; - CORBA::Short native_priority (void) const; + CORBA::Short native_priority () const; TAO_Thread_Lane_Resources &resources (void); - TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan (void) const; + TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan lifespan () const; - ACE_Time_Value const &dynamic_thread_time (void) const; + ACE_Time_Value const &dynamic_thread_time () const; // @} private: @@ -307,22 +307,22 @@ public: int create_static_threads (void); /// Check if this thread pool has (explicit) lanes. - bool with_lanes (void) const; + bool with_lanes () const; /// @name Accessors // @{ - TAO_Thread_Pool_Manager &manager (void) const; - CORBA::ULong id (void) const; + TAO_Thread_Pool_Manager &manager () const; + CORBA::ULong id () const; - CORBA::ULong stack_size (void) const; - CORBA::Boolean allow_borrowing (void) const; - CORBA::Boolean allow_request_buffering (void) const; - CORBA::ULong max_buffered_requests (void) const; - CORBA::ULong max_request_buffer_size (void) const; + CORBA::ULong stack_size () const; + CORBA::Boolean allow_borrowing () const; + CORBA::Boolean allow_request_buffering () const; + CORBA::ULong max_buffered_requests () const; + CORBA::ULong max_request_buffer_size () const; TAO_Thread_Lane **lanes (void); - CORBA::ULong number_of_lanes (void) const; + CORBA::ULong number_of_lanes () const; // @} private: @@ -407,7 +407,7 @@ public: /// @name Accessors // @{ - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; // @} private: diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index f28ea573729..a08e0dffc39 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -3,49 +3,49 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Thread_Lane & -TAO_Thread_Pool_Threads::lane (void) const +TAO_Thread_Pool_Threads::lane () const { return this->lane_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::id (void) const +TAO_Thread_Lane::id () const { return this->id_; } ACE_INLINE TAO_Thread_Pool & -TAO_Thread_Lane::pool (void) const +TAO_Thread_Lane::pool () const { return this->pool_; } ACE_INLINE CORBA::Short -TAO_Thread_Lane::lane_priority (void) const +TAO_Thread_Lane::lane_priority () const { return this->lane_priority_; } ACE_INLINE CORBA::Short -TAO_Thread_Lane::native_priority (void) const +TAO_Thread_Lane::native_priority () const { return this->native_priority_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::static_threads (void) const +TAO_Thread_Lane::static_threads () const { return this->static_threads_number_; } ACE_INLINE CORBA::ULong -TAO_Thread_Lane::dynamic_threads (void) const +TAO_Thread_Lane::dynamic_threads () const { return this->dynamic_threads_number_; } @@ -59,70 +59,70 @@ TAO_Thread_Lane::resources (void) ACE_INLINE TAO_RT_ORBInitializer::TAO_RTCORBA_DT_LifeSpan -TAO_Thread_Lane::lifespan (void) const +TAO_Thread_Lane::lifespan () const { return this->lifespan_; } ACE_INLINE ACE_Time_Value const & -TAO_Thread_Lane::dynamic_thread_time (void) const +TAO_Thread_Lane::dynamic_thread_time () const { return this->dynamic_thread_time_; } ACE_INLINE bool -TAO_Thread_Pool::with_lanes (void) const +TAO_Thread_Pool::with_lanes () const { return this->with_lanes_; } ACE_INLINE TAO_Thread_Pool_Manager & -TAO_Thread_Pool::manager (void) const +TAO_Thread_Pool::manager () const { return this->manager_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::id (void) const +TAO_Thread_Pool::id () const { return this->id_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::stack_size (void) const +TAO_Thread_Pool::stack_size () const { return this->stack_size_; } ACE_INLINE CORBA::Boolean -TAO_Thread_Pool::allow_borrowing (void) const +TAO_Thread_Pool::allow_borrowing () const { return this->allow_borrowing_; } ACE_INLINE CORBA::Boolean -TAO_Thread_Pool::allow_request_buffering (void) const +TAO_Thread_Pool::allow_request_buffering () const { return this->allow_request_buffering_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::max_buffered_requests (void) const +TAO_Thread_Pool::max_buffered_requests () const { return this->max_buffered_requests_; } ACE_INLINE CORBA::ULong -TAO_Thread_Pool::max_request_buffer_size (void) const +TAO_Thread_Pool::max_request_buffer_size () const { return this->max_request_buffer_size_; } @@ -136,7 +136,7 @@ TAO_Thread_Pool::lanes (void) ACE_INLINE CORBA::ULong -TAO_Thread_Pool::number_of_lanes (void) const +TAO_Thread_Pool::number_of_lanes () const { return this->number_of_lanes_; } diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 2e90b0f4046..97662624749 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -186,7 +186,7 @@ public: virtual ~TAO_RT_POA (void); - void *thread_pool (void) const; + void *thread_pool () const; protected: diff --git a/TAO/tao/RTPortableServer/RT_POA.inl b/TAO/tao/RTPortableServer/RT_POA.inl index ef48b7390bc..8326d0903a1 100644 --- a/TAO/tao/RTPortableServer/RT_POA.inl +++ b/TAO/tao/RTPortableServer/RT_POA.inl @@ -102,7 +102,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId #endif ACE_INLINE void * -TAO_RT_POA::thread_pool (void) const +TAO_RT_POA::thread_pool () const { return this->thread_pool_; } diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index 7865ac7dc3b..4cb6456e278 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -814,13 +814,13 @@ TAO_RTScheduler_Current_var::operator ::TAO_RTScheduler_Current_ptr &() } TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::operator-> (void) const +TAO_RTScheduler_Current_var::operator-> () const { return this->ptr_; } TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::in (void) const +TAO_RTScheduler_Current_var::in () const { return this->ptr_; } @@ -896,7 +896,7 @@ TAO_RTScheduler_Current::_duplicate (TAO_RTScheduler_Current_ptr obj) return obj; } -const char* TAO_RTScheduler_Current::_interface_repository_id (void) const +const char* TAO_RTScheduler_Current::_interface_repository_id () const { return "IDL:TAO_RTScheduler_Current:1.0"; } diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index f018140c012..3cba1c6667b 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -152,7 +152,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; //@} private: @@ -179,16 +179,16 @@ public: TAO_RTScheduler_Current_var &operator= (TAO_RTScheduler_Current_ptr); TAO_RTScheduler_Current_var &operator= (const TAO_RTScheduler_Current_var &); - TAO_RTScheduler_Current_ptr operator-> (void) const; + TAO_RTScheduler_Current_ptr operator-> () const; operator const TAO_RTScheduler_Current_ptr &() const; operator TAO_RTScheduler_Current_ptr &(); // in, inout, out, _retn - TAO_RTScheduler_Current_ptr in (void) const; + TAO_RTScheduler_Current_ptr in () const; TAO_RTScheduler_Current_ptr &inout (void); TAO_RTScheduler_Current_ptr &out (void); TAO_RTScheduler_Current_ptr _retn (void); - TAO_RTScheduler_Current_ptr ptr (void) const; + TAO_RTScheduler_Current_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index a5b75dc14a5..c592e98ac50 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -33,7 +33,7 @@ TAO_RTScheduler_Manager::_duplicate (TAO_RTScheduler_Manager_ptr obj) } const char* -TAO_RTScheduler_Manager::_interface_repository_id (void) const +TAO_RTScheduler_Manager::_interface_repository_id () const { return "IDL:RTScheduler_Manager:1.0"; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index b0d0221e9a7..f3b0513c27f 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -54,7 +54,7 @@ public: return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: @@ -83,16 +83,16 @@ public: TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &); - TAO_RTScheduler_Manager_ptr operator-> (void) const; + TAO_RTScheduler_Manager_ptr operator-> () const; /// in, inout, out, _retn operator const TAO_RTScheduler_Manager_ptr &() const; operator TAO_RTScheduler_Manager_ptr &(); - TAO_RTScheduler_Manager_ptr in (void) const; + TAO_RTScheduler_Manager_ptr in () const; TAO_RTScheduler_Manager_ptr &inout (void); TAO_RTScheduler_Manager_ptr &out (void); TAO_RTScheduler_Manager_ptr _retn (void); - TAO_RTScheduler_Manager_ptr ptr (void) const; + TAO_RTScheduler_Manager_ptr ptr () const; // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index 8247beea3a8..7c8698b9c60 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -20,7 +20,7 @@ TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var ( {} ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::ptr (void) const +TAO_RTScheduler_Manager_var::ptr () const { return this->ptr_; } @@ -71,13 +71,13 @@ TAO_RTScheduler_Manager_var::operator ::TAO_RTScheduler_Manager_ptr &() // cast } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::operator-> (void) const +TAO_RTScheduler_Manager_var::operator-> () const { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::in (void) const +TAO_RTScheduler_Manager_var::in () const { return this->ptr_; } diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index 35fa18b2ea3..aef3dc53236 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -8,7 +8,7 @@ TAO::Refcounted_ObjectKey::incr_refcount (void) } ACE_INLINE const TAO::ObjectKey & -TAO::Refcounted_ObjectKey::object_key (void) const +TAO::Refcounted_ObjectKey::object_key () const { return this->object_key_; } diff --git a/TAO/tao/Seq_Var_T.inl b/TAO/tao/Seq_Var_T.inl index bee41dfe39c..6d96a3176af 100644 --- a/TAO/tao/Seq_Var_T.inl +++ b/TAO/tao/Seq_Var_T.inl @@ -25,7 +25,7 @@ TAO_Seq_Var_Base_T<T>::~TAO_Seq_Var_Base_T (void) template<typename T> ACE_INLINE const T * -TAO_Seq_Var_Base_T<T>::operator-> (void) const +TAO_Seq_Var_Base_T<T>::operator-> () const { return this->ptr_; } @@ -62,7 +62,7 @@ TAO_Seq_Var_Base_T<T>::operator T & () const template<typename T> ACE_INLINE const T & -TAO_Seq_Var_Base_T<T>::in (void) const +TAO_Seq_Var_Base_T<T>::in () const { return *this->ptr_; } @@ -98,7 +98,7 @@ TAO_Seq_Var_Base_T<T>::_retn (void) template<typename T> ACE_INLINE T * -TAO_Seq_Var_Base_T<T>::ptr (void) const +TAO_Seq_Var_Base_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl index 60bb3b0cc7f..f2cb3f6e078 100644 --- a/TAO/tao/Service_Context.inl +++ b/TAO/tao/Service_Context.inl @@ -14,7 +14,7 @@ TAO_Service_Context::service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Service_Context::service_info (void) const +TAO_Service_Context::service_info () const { return this->service_context_; } diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index d36f60b04bd..0fe4c12ecc3 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -18,7 +18,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const +TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h index 5a07734f47f..dc5a6422002 100644 --- a/TAO/tao/Storable_Base.h +++ b/TAO/tao/Storable_Base.h @@ -79,15 +79,15 @@ namespace TAO void setstate (Storable_State state); - Storable_State rdstate (void) const; + Storable_State rdstate () const; - bool good (void) const; + bool good () const; - bool bad (void) const; + bool bad () const; - bool eof (void) const; + bool eof () const; - bool fail (void) const; + bool fail () const; static ACE_CString state_as_string (Storable_State state); diff --git a/TAO/tao/Storable_Base.inl b/TAO/tao/Storable_Base.inl index 27999dd25e9..53d866ce893 100644 --- a/TAO/tao/Storable_Base.inl +++ b/TAO/tao/Storable_Base.inl @@ -41,31 +41,31 @@ TAO::Storable_Base::setstate (TAO::Storable_Base::Storable_State state) } ACE_INLINE TAO::Storable_Base::Storable_State -TAO::Storable_Base::rdstate (void) const +TAO::Storable_Base::rdstate () const { return this->state_; } ACE_INLINE bool -TAO::Storable_Base::good (void) const +TAO::Storable_Base::good () const { return (this->state_ == goodbit); } ACE_INLINE bool -TAO::Storable_Base::bad (void) const +TAO::Storable_Base::bad () const { return (this->state_ & badbit); } ACE_INLINE bool -TAO::Storable_Base::eof (void) const +TAO::Storable_Base::eof () const { return (this->state_ & eofbit); } ACE_INLINE bool -TAO::Storable_Base::fail (void) const +TAO::Storable_Base::fail () const { return (this->state_ & failbit); } diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index a56d1b804c7..21bbaad9dac 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -128,7 +128,7 @@ TAO_COIOP_Connector::check_prefix (const char *endpoint) } char -TAO_COIOP_Connector::object_key_delimiter (void) const +TAO_COIOP_Connector::object_key_delimiter () const { return TAO_COIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/COIOP_Connector.h b/TAO/tao/Strategies/COIOP_Connector.h index 0560ba245e4..5f6fff50bcf 100644 --- a/TAO/tao/Strategies/COIOP_Connector.h +++ b/TAO/tao/Strategies/COIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} protected: diff --git a/TAO/tao/Strategies/COIOP_Endpoint.h b/TAO/tao/Strategies/COIOP_Endpoint.h index d5737929cca..a6fad6bc309 100644 --- a/TAO/tao/Strategies/COIOP_Endpoint.h +++ b/TAO/tao/Strategies/COIOP_Endpoint.h @@ -76,7 +76,7 @@ public: /// Return a pointer to the host string. This object maintains /// ownership of this string. - const ACE_Utils::UUID& uuid (void) const; + const ACE_Utils::UUID& uuid () const; private: /// UUID uniquely identifying this COIOP endpoint diff --git a/TAO/tao/Strategies/COIOP_Endpoint.inl b/TAO/tao/Strategies/COIOP_Endpoint.inl index 4cf5ccc3437..f4c0dea98b3 100644 --- a/TAO/tao/Strategies/COIOP_Endpoint.inl +++ b/TAO/tao/Strategies/COIOP_Endpoint.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_Utils::UUID& -TAO_COIOP_Endpoint::uuid (void) const +TAO_COIOP_Endpoint::uuid () const { return this->uuid_; } diff --git a/TAO/tao/Strategies/COIOP_Factory.cpp b/TAO/tao/Strategies/COIOP_Factory.cpp index 00a5ad1d67f..d239c961daf 100644 --- a/TAO/tao/Strategies/COIOP_Factory.cpp +++ b/TAO/tao/Strategies/COIOP_Factory.cpp @@ -30,13 +30,13 @@ TAO_COIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_COIOP_Protocol_Factory::prefix (void) const +TAO_COIOP_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_COIOP_Protocol_Factory::options_delimiter (void) const +TAO_COIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -72,7 +72,7 @@ TAO_COIOP_Protocol_Factory::make_connector (void) } int -TAO_COIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_COIOP_Protocol_Factory::requires_explicit_endpoint () const { return 0; } diff --git a/TAO/tao/Strategies/COIOP_Factory.h b/TAO/tao/Strategies/COIOP_Factory.h index c8f7fcc69af..19c95335947 100644 --- a/TAO/tao/Strategies/COIOP_Factory.h +++ b/TAO/tao/Strategies/COIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/COIOP_Profile.cpp b/TAO/tao/Strategies/COIOP_Profile.cpp index 9802c361d07..edfcbd0435a 100644 --- a/TAO/tao/Strategies/COIOP_Profile.cpp +++ b/TAO/tao/Strategies/COIOP_Profile.cpp @@ -19,7 +19,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_COIOP_Profile::object_key_delimiter_ = '/'; char -TAO_COIOP_Profile::object_key_delimiter (void) const +TAO_COIOP_Profile::object_key_delimiter () const { return TAO_COIOP_Profile::object_key_delimiter_; } @@ -186,7 +186,7 @@ TAO_COIOP_Profile::endpoint (void) } CORBA::ULong -TAO_COIOP_Profile::endpoint_count (void) const +TAO_COIOP_Profile::endpoint_count () const { return this->count_; } @@ -201,7 +201,7 @@ TAO_COIOP_Profile::add_endpoint (TAO_COIOP_Endpoint *endp) } char * -TAO_COIOP_Profile::to_string (void) const +TAO_COIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/COIOP_Profile.h b/TAO/tao/Strategies/COIOP_Profile.h index 3ee737d614b..85038ff65b5 100644 --- a/TAO/tao/Strategies/COIOP_Profile.h +++ b/TAO/tao/Strategies/COIOP_Profile.h @@ -44,7 +44,7 @@ class TAO_Strategies_Export TAO_COIOP_Profile : public TAO_Profile public: /// The object key delimiter that COIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -63,10 +63,10 @@ public: ~TAO_COIOP_Profile (void); /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/DIOP_Acceptor.h b/TAO/tao/Strategies/DIOP_Acceptor.h index 9119bdc17c8..bd64aee4f6d 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.h +++ b/TAO/tao/Strategies/DIOP_Acceptor.h @@ -52,13 +52,13 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); /// Returns address for default endpoint - const ACE_INET_Addr& default_address (void) const; + const ACE_INET_Addr& default_address () const; /// Set address for default endpoint void set_default_address (const ACE_INET_Addr& addr); diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl index 13df2475e50..88346814360 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.inl +++ b/TAO/tao/Strategies/DIOP_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_DIOP_Acceptor::address (void) const +TAO_DIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); @@ -23,7 +23,7 @@ TAO_DIOP_Acceptor::endpoints (void) } ACE_INLINE const ACE_INET_Addr& -TAO_DIOP_Acceptor::default_address (void) const +TAO_DIOP_Acceptor::default_address () const { return this->default_address_; } diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 80545ddae9f..b4b24ddd3bb 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -274,7 +274,7 @@ TAO_DIOP_Connector::check_prefix (const char *endpoint) } char -TAO_DIOP_Connector::object_key_delimiter (void) const +TAO_DIOP_Connector::object_key_delimiter () const { return TAO_DIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h index 710591a1f1e..7448c5938ed 100644 --- a/TAO/tao/Strategies/DIOP_Connector.h +++ b/TAO/tao/Strategies/DIOP_Connector.h @@ -64,7 +64,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} protected: diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index e22a32fc888..7cea233a221 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -232,7 +232,7 @@ TAO_DIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_DIOP_Endpoint::object_addr (void) const +TAO_DIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -257,7 +257,7 @@ TAO_DIOP_Endpoint::object_addr (void) const } void -TAO_DIOP_Endpoint::object_addr_i (void) const +TAO_DIOP_Endpoint::object_addr_i () const { // We should have already held the lock diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index 62b26560d2b..ae1f8a3e70d 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -90,18 +90,18 @@ public: // = DIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); @@ -113,7 +113,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr () call. - void object_addr_i (void) const; + void object_addr_i () const; /// String representing the host name. CORBA::String_var host_; diff --git a/TAO/tao/Strategies/DIOP_Endpoint.inl b/TAO/tao/Strategies/DIOP_Endpoint.inl index 424df7563f4..f9455e90305 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.inl +++ b/TAO/tao/Strategies/DIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_DIOP_Endpoint::host (void) const +TAO_DIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_DIOP_Endpoint::port (void) const +TAO_DIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/DIOP_Factory.cpp b/TAO/tao/Strategies/DIOP_Factory.cpp index 055afeaa5a1..c29d38219b1 100644 --- a/TAO/tao/Strategies/DIOP_Factory.cpp +++ b/TAO/tao/Strategies/DIOP_Factory.cpp @@ -30,13 +30,13 @@ TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_DIOP_Protocol_Factory::prefix (void) const +TAO_DIOP_Protocol_Factory::prefix () const { return ::the_prefix; } char -TAO_DIOP_Protocol_Factory::options_delimiter (void) const +TAO_DIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -71,7 +71,7 @@ TAO_DIOP_Protocol_Factory::make_connector (void) } int -TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_DIOP_Protocol_Factory::requires_explicit_endpoint () const { // This switch is actually meant to distinguish between pluggable // protocols which are able to clean up their endpoints and such diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index d72b366eac8..e63cc69399a 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index d8566303445..b362e145a27 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -22,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_DIOP_Profile::object_key_delimiter_ = '/'; char -TAO_DIOP_Profile::object_key_delimiter (void) const +TAO_DIOP_Profile::object_key_delimiter () const { return TAO_DIOP_Profile::object_key_delimiter_; } @@ -348,7 +348,7 @@ TAO_DIOP_Profile::endpoint (void) } CORBA::ULong -TAO_DIOP_Profile::endpoint_count (void) const +TAO_DIOP_Profile::endpoint_count () const { return this->count_; } @@ -363,7 +363,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp) } char * -TAO_DIOP_Profile::to_string (void) const +TAO_DIOP_Profile::to_string () const { // corbaloc:diop:1.2@host:port,diop:1.2@host:port,.../key diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h index d473c0f8ef9..1946349b1e8 100644 --- a/TAO/tao/Strategies/DIOP_Profile.h +++ b/TAO/tao/Strategies/DIOP_Profile.h @@ -44,7 +44,7 @@ class TAO_Strategies_Export TAO_DIOP_Profile : public TAO_Profile public: /// The object key delimiter that DIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -74,10 +74,10 @@ public: /// Template methods. Please tao/Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp index 29cb374e9c7..0aa3c9a7d60 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp @@ -15,7 +15,7 @@ TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport&) } int -TAO_NULL_Connection_Purging_Strategy::cache_maximum (void) const +TAO_NULL_Connection_Purging_Strategy::cache_maximum () const { return -1; } diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h index 7617ff62e87..a7fe50788cc 100644 --- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h +++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h @@ -41,7 +41,7 @@ public: virtual void update_item (TAO_Transport& transport); /// Returns -1 to signify no maximum - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index ed76fe47c55..43aa383c072 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -53,7 +53,7 @@ public: /// @@ Helper method for the implementation repository, should go /// away - const ACE_INET_Addr& address (void) const; + const ACE_INET_Addr& address () const; /// Returns the array of endpoints in this acceptor const ACE_INET_Addr *endpoints (void); diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl index 51acffee405..840862e2710 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.inl +++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_INET_Addr& -TAO_SCIOP_Acceptor::address (void) const +TAO_SCIOP_Acceptor::address () const { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index b11b0340d5a..d41dc1a1752 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -380,7 +380,7 @@ TAO_SCIOP_Connector::check_prefix (const char *endpoint) } char -TAO_SCIOP_Connector::object_key_delimiter (void) const +TAO_SCIOP_Connector::object_key_delimiter () const { return TAO_SCIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h index 5eeb57a523d..ee026db87bc 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.h +++ b/TAO/tao/Strategies/SCIOP_Connector.h @@ -61,7 +61,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; public: diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index 213d7e52f01..9f56b3a88ca 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -218,7 +218,7 @@ TAO_SCIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_SCIOP_Endpoint::object_addr (void) const +TAO_SCIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: @@ -244,7 +244,7 @@ TAO_SCIOP_Endpoint::object_addr (void) const } void -TAO_SCIOP_Endpoint::object_addr_i (void) const +TAO_SCIOP_Endpoint::object_addr_i () const { if (this->object_addr_.set (this->port_, this->host_.in ()) == -1) { @@ -349,13 +349,13 @@ TAO_SCIOP_Endpoint::preferred_interfaces (TAO_ORB_Core *oc) } bool -TAO_SCIOP_Endpoint::is_preferred_network (void) const +TAO_SCIOP_Endpoint::is_preferred_network () const { return (this->preferred_path_.host.in () != 0); } const char * -TAO_SCIOP_Endpoint::preferred_network (void) const +TAO_SCIOP_Endpoint::preferred_network () const { return this->preferred_path_.host.in (); } diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index 8badf822cb7..99c843e9d3b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -87,27 +87,27 @@ public: // = SCIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); /// Do we have a preferred local network for the target? - bool is_preferred_network (void) const; + bool is_preferred_network () const; /// Return the preferred network if any. - const char *preferred_network (void) const; + const char *preferred_network () const; private: @@ -116,7 +116,7 @@ private: int use_dotted_decimal_addresses); /// Helper method for object_addr (). - void object_addr_i (void) const; + void object_addr_i () const; /// Generate preferred interfaces from the options passed in by the /// user. diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.inl b/TAO/tao/Strategies/SCIOP_Endpoint.inl index 41d5ea3712c..28032ca78a5 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.inl +++ b/TAO/tao/Strategies/SCIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_SCIOP_Endpoint::host (void) const +TAO_SCIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_SCIOP_Endpoint::port (void) const +TAO_SCIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/SCIOP_Factory.cpp b/TAO/tao/Strategies/SCIOP_Factory.cpp index 751ce499473..d744c95c97a 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.cpp +++ b/TAO/tao/Strategies/SCIOP_Factory.cpp @@ -28,13 +28,13 @@ TAO_SCIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_SCIOP_Protocol_Factory::prefix (void) const +TAO_SCIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_SCIOP_Protocol_Factory::options_delimiter (void) const +TAO_SCIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -69,7 +69,7 @@ TAO_SCIOP_Protocol_Factory::make_connector (void) } int -TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_SCIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h index 6178e3a1b57..a0930ed6432 100644 --- a/TAO/tao/Strategies/SCIOP_Factory.h +++ b/TAO/tao/Strategies/SCIOP_Factory.h @@ -46,16 +46,16 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; // = Check Protocol_Factory.h for a description of these methods. virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; }; diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 5619222b443..eaf71d16817 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -18,7 +18,7 @@ const char TAO_SCIOP_Profile::object_key_delimiter_ = '/'; TAO_BEGIN_VERSIONED_NAMESPACE_DECL char -TAO_SCIOP_Profile::object_key_delimiter (void) const +TAO_SCIOP_Profile::object_key_delimiter () const { return TAO_SCIOP_Profile::object_key_delimiter_; } @@ -290,7 +290,7 @@ TAO_SCIOP_Profile::endpoint (void) } CORBA::ULong -TAO_SCIOP_Profile::endpoint_count (void) const +TAO_SCIOP_Profile::endpoint_count () const { return this->count_; } @@ -305,7 +305,7 @@ TAO_SCIOP_Profile::add_endpoint (TAO_SCIOP_Endpoint *endp) } char * -TAO_SCIOP_Profile::to_string (void) const +TAO_SCIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h index 0b043b1784d..d644f758d3b 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.h +++ b/TAO/tao/Strategies/SCIOP_Profile.h @@ -43,7 +43,7 @@ class TAO_Strategies_Export TAO_SCIOP_Profile : public TAO_Profile public: /// The object key delimiter that SCIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -71,10 +71,10 @@ public: ~TAO_SCIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 37197284327..121185f4bd9 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -324,7 +324,7 @@ TAO_SHMIOP_Connector::check_prefix (const char *endpoint) } char -TAO_SHMIOP_Connector::object_key_delimiter (void) const +TAO_SHMIOP_Connector::object_key_delimiter () const { return TAO_SHMIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index c68f26c3a60..72426bb2dea 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -68,7 +68,7 @@ public: virtual int check_prefix (const char *endpoint); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; //@} public: diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp index 354172a95ca..bb69096a8fd 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp @@ -208,7 +208,7 @@ TAO_SHMIOP_Endpoint::hash (void) } const ACE_INET_Addr & -TAO_SHMIOP_Endpoint::object_addr (void) const +TAO_SHMIOP_Endpoint::object_addr () const { // The object_addr_ is initialized here, rather than at IOR decode // time for several reasons: diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h index 66953d2c6b1..3199b2d684d 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.h +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h @@ -92,18 +92,18 @@ public: // = SHMIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_INET_Addr &object_addr (void) const; + const ACE_INET_Addr &object_addr () const; /// Return a pointer to the host string. This object maintains /// ownership of this string. - const char *host (void) const; + const char *host () const; /// Copy the string @a h into <host_> and return the resulting pointer. /// This object maintains ownership of this string. const char *host (const char *h); /// Return the port number. - CORBA::UShort port (void) const; + CORBA::UShort port () const; /// Set the port number. CORBA::UShort port (CORBA::UShort p); diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.inl b/TAO/tao/Strategies/SHMIOP_Endpoint.inl index 1b0af76c7d5..d7d8ab4780a 100644 --- a/TAO/tao/Strategies/SHMIOP_Endpoint.inl +++ b/TAO/tao/Strategies/SHMIOP_Endpoint.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const char * -TAO_SHMIOP_Endpoint::host (void) const +TAO_SHMIOP_Endpoint::host () const { return this->host_.in (); } ACE_INLINE CORBA::UShort -TAO_SHMIOP_Endpoint::port (void) const +TAO_SHMIOP_Endpoint::port () const { return this->port_; } diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 646969d8956..d2950755688 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -35,13 +35,13 @@ TAO_SHMIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_SHMIOP_Protocol_Factory::prefix (void) const +TAO_SHMIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_SHMIOP_Protocol_Factory::options_delimiter (void) const +TAO_SHMIOP_Protocol_Factory::options_delimiter () const { return '/'; } @@ -105,7 +105,7 @@ TAO_SHMIOP_Protocol_Factory::make_connector (void) } int -TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_SHMIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/SHMIOP_Factory.h b/TAO/tao/Strategies/SHMIOP_Factory.h index ef8bbfbba33..f6eb29a88d5 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.h +++ b/TAO/tao/Strategies/SHMIOP_Factory.h @@ -49,11 +49,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -63,7 +63,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} /// Set mmap file prefix diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index eb01ce6655b..ca5cbea5c7a 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -22,7 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/'; char -TAO_SHMIOP_Profile::object_key_delimiter (void) const +TAO_SHMIOP_Profile::object_key_delimiter () const { return TAO_SHMIOP_Profile::object_key_delimiter_; } @@ -87,7 +87,7 @@ TAO_SHMIOP_Profile::endpoint (void) } CORBA::ULong -TAO_SHMIOP_Profile::endpoint_count (void) const +TAO_SHMIOP_Profile::endpoint_count () const { return this->count_; } @@ -322,7 +322,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp) } char * -TAO_SHMIOP_Profile::to_string (void) const +TAO_SHMIOP_Profile::to_string () const { CORBA::String_var key; TAO::ObjectKey::encode_sequence_to_string (key.inout(), diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index 666b5b633ba..fdf1f24a4b7 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -45,7 +45,7 @@ class TAO_Strategies_Export TAO_SHMIOP_Profile : public TAO_Profile public: /// The object key delimiter that SHMIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -74,10 +74,10 @@ public: /// Template methods, please see Profile.h for documentation. - virtual char * to_string (void) const; + virtual char * to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add <endp> to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 2bbc354a4ff..5203ed8c22f 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -353,7 +353,7 @@ TAO_UIOP_Connector::check_prefix (const char *endpoint) } char -TAO_UIOP_Connector::object_key_delimiter (void) const +TAO_UIOP_Connector::object_key_delimiter () const { return TAO_UIOP_Profile::object_key_delimiter_; } diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 76a974e3498..c16b3a412fb 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -71,7 +71,7 @@ public: virtual TAO_Profile *corbaloc_scan (const char *str, size_t &len); - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Cancel the passed cvs handler from the connector virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler); diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index f2f60256a25..06ec08810b0 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -71,11 +71,11 @@ public: // = UIOP_Endpoint-specific methods. /// Return a reference to the <object_addr>. - const ACE_UNIX_Addr &object_addr (void) const; + const ACE_UNIX_Addr &object_addr () const; /// Return a pointer to the rendezvous point string. /// This object maintains ownership of the returned string. - const char *rendezvous_point (void) const; + const char *rendezvous_point () const; private: diff --git a/TAO/tao/Strategies/UIOP_Endpoint.inl b/TAO/tao/Strategies/UIOP_Endpoint.inl index e8c5f07516e..a021e9de274 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.inl +++ b/TAO/tao/Strategies/UIOP_Endpoint.inl @@ -4,13 +4,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE const ACE_UNIX_Addr & -TAO_UIOP_Endpoint::object_addr (void) const +TAO_UIOP_Endpoint::object_addr () const { return this->object_addr_; } ACE_INLINE const char * -TAO_UIOP_Endpoint::rendezvous_point (void) const +TAO_UIOP_Endpoint::rendezvous_point () const { return this->object_addr_.get_path_name (); } diff --git a/TAO/tao/Strategies/UIOP_Factory.cpp b/TAO/tao/Strategies/UIOP_Factory.cpp index df2b317a518..05bd45b381f 100644 --- a/TAO/tao/Strategies/UIOP_Factory.cpp +++ b/TAO/tao/Strategies/UIOP_Factory.cpp @@ -29,13 +29,13 @@ TAO_UIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix) } const char * -TAO_UIOP_Protocol_Factory::prefix (void) const +TAO_UIOP_Protocol_Factory::prefix () const { return ::prefix_; } char -TAO_UIOP_Protocol_Factory::options_delimiter (void) const +TAO_UIOP_Protocol_Factory::options_delimiter () const { return '|'; } @@ -71,7 +71,7 @@ TAO_UIOP_Protocol_Factory::make_connector (void) } int -TAO_UIOP_Protocol_Factory::requires_explicit_endpoint (void) const +TAO_UIOP_Protocol_Factory::requires_explicit_endpoint () const { return 1; } diff --git a/TAO/tao/Strategies/UIOP_Factory.h b/TAO/tao/Strategies/UIOP_Factory.h index 6f6d9253065..6aa7f179bc4 100644 --- a/TAO/tao/Strategies/UIOP_Factory.h +++ b/TAO/tao/Strategies/UIOP_Factory.h @@ -48,11 +48,11 @@ public: virtual int match_prefix (const ACE_CString &prefix); /// Returns the prefix used by the protocol. - virtual const char *prefix (void) const; + virtual const char *prefix () const; /// Return the character used to mark where an endpoint ends and /// where its options begin. - virtual char options_delimiter (void) const; + virtual char options_delimiter () const; /** * @name Protocol factory methods @@ -62,7 +62,7 @@ public: //@{ virtual TAO_Acceptor *make_acceptor (void); virtual TAO_Connector *make_connector (void); - virtual int requires_explicit_endpoint (void) const; + virtual int requires_explicit_endpoint () const; //@} }; diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index 15a4e5c94bf..baa42e7b683 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -47,7 +47,7 @@ class TAO_Strategies_Export TAO_UIOP_Profile : public TAO_Profile public: /// The object key delimiter that UIOP uses or expects. static const char object_key_delimiter_; - virtual char object_key_delimiter (void) const; + virtual char object_key_delimiter () const; /// Return the char string prefix. static const char *prefix (void); @@ -73,10 +73,10 @@ public: ~TAO_UIOP_Profile (void); /// Template methods. Please see Profile.h for documentation. - virtual char *to_string (void) const; + virtual char *to_string () const; virtual int encode_endpoints (void); virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); /** * Add @a endp to this profile's list of endpoints (it is inserted diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index b4fdb54c24b..6757ac01249 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -414,7 +414,7 @@ TAO_Advanced_Resource_Factory::get_protocol_factories (void) } ACE_Reactor_Impl * -TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const +TAO_Advanced_Resource_Factory::allocate_reactor_impl () const { ACE_Reactor_Impl *impl = 0; diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index f13f56ae2f2..e09dd3c0038 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -100,7 +100,7 @@ public: protected: /// Obtain the reactor implementation - virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; + virtual ACE_Reactor_Impl *allocate_reactor_impl () const; void report_option_value_error (const ACE_TCHAR* option_name, const ACE_TCHAR* option_value); diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index 146414ac160..dfc4a708bfc 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -15,7 +15,7 @@ TAO_Stub::reset_base (void) ACE_INLINE const TAO_SYNCH_MUTEX& -TAO_Stub::profile_lock (void) const +TAO_Stub::profile_lock () const { return this->profile_lock_; } @@ -208,7 +208,7 @@ TAO_Stub::set_valid_profile (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::valid_profile (void) const +TAO_Stub::valid_profile () const { return this->profile_success_; } @@ -274,7 +274,7 @@ TAO_Stub::next_profile_retry (void) } ACE_INLINE const TAO_MProfile& -TAO_Stub::base_profiles (void) const +TAO_Stub::base_profiles () const { return this->base_profiles_; } @@ -286,7 +286,7 @@ TAO_Stub::base_profiles (void) } ACE_INLINE const TAO_MProfile * -TAO_Stub::forward_profiles (void) const +TAO_Stub::forward_profiles () const { return this->forward_profiles_; } @@ -298,13 +298,13 @@ TAO_Stub::forward_profiles (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::is_collocated (void) const +TAO_Stub::is_collocated () const { return this->is_collocated_; } ACE_INLINE TAO_ORB_Core* -TAO_Stub::orb_core (void) const +TAO_Stub::orb_core () const { return this->orb_core_.get (); } @@ -330,7 +330,7 @@ TAO_Stub::servant_orb (CORBA::ORB_ptr orb) } ACE_INLINE TAO_Abstract_ServantBase * -TAO_Stub::collocated_servant (void) const +TAO_Stub::collocated_servant () const { return collocated_servant_; } @@ -342,7 +342,7 @@ TAO_Stub::collocated_servant (TAO_Abstract_ServantBase * servant) } ACE_INLINE TAO::Object_Proxy_Broker * -TAO_Stub::object_proxy_broker (void) const +TAO_Stub::object_proxy_broker () const { return this->object_proxy_broker_; } @@ -361,7 +361,7 @@ TAO_Stub::destroy (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::optimize_collocation_objects (void) const +TAO_Stub::optimize_collocation_objects () const { return this->collocation_opt_; } @@ -413,7 +413,7 @@ TAO_Stub::_decr_refcnt (void) ACE_INLINE CORBA::Boolean -TAO_Stub::at_starting_profile (void) const +TAO_Stub::at_starting_profile () const { return profile_in_use_ == base_profiles_.get_profile(0); } @@ -429,7 +429,7 @@ TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub *p) } ACE_INLINE TAO_Stub * -TAO_Stub_Auto_Ptr::get (void) const +TAO_Stub_Auto_Ptr::get () const { ACE_TRACE ("TAO_Stub_Auto_Ptr::get"); return this->p_; diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h index 20ca9632f06..f7fdb843f84 100644 --- a/TAO/tao/Synch_Queued_Message.h +++ b/TAO/tao/Synch_Queued_Message.h @@ -59,13 +59,13 @@ public: /// Destructor virtual ~TAO_Synch_Queued_Message (void); - const ACE_Message_Block *current_block (void) const; + const ACE_Message_Block *current_block () const; /** @name Implement the Template Methods from TAO_Queued_Message */ //@{ - virtual size_t message_length (void) const; - virtual int all_data_sent (void) const; + virtual size_t message_length () const; + virtual int all_data_sent () const; virtual void fill_iov (int iovcnt_max, int &iovcnt, iovec iov[]) const; virtual void bytes_transferred (size_t &byte_count); virtual TAO_Queued_Message *clone (ACE_Allocator *alloc); diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 13a837277c4..486f1cf2eed 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -933,7 +933,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::TypeCode_ptr \ -CORBA::name ::_tao_type (void) const \ +CORBA::name ::_tao_type () const \ { \ TAO_AnyTypeCode_Adapter *adapter = \ ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( \ @@ -967,7 +967,7 @@ TAO::create_system_exception (const char *id) #define TAO_SYSTEM_EXCEPTION(name) \ void \ -CORBA::name ::_raise (void) const \ +CORBA::name ::_raise () const \ { \ throw *this; \ } @@ -977,7 +977,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::Exception * \ -CORBA::name ::_tao_duplicate (void) const \ +CORBA::name ::_tao_duplicate () const \ { \ CORBA::Exception * result = 0; \ ACE_NEW_RETURN (result, CORBA::name (*this), 0); \ diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index f52e0414820..10ffd265862 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -189,10 +189,10 @@ namespace CORBA CORBA::CompletionStatus completed); \ static name * _downcast (CORBA::Exception* exception); \ static name const * _downcast (CORBA::Exception const * exception); \ - virtual void _raise (void) const; \ - virtual CORBA::TypeCode_ptr _tao_type (void) const; \ + virtual void _raise () const; \ + virtual CORBA::TypeCode_ptr _tao_type () const; \ static void _tao_any_destructor (void*); \ - virtual CORBA::Exception *_tao_duplicate (void) const; \ + virtual CORBA::Exception *_tao_duplicate () const; \ static CORBA::SystemException *_tao_create (void); \ }; \ diff --git a/TAO/tao/SystemException.inl b/TAO/tao/SystemException.inl index 979f5d18373..4240665c94c 100644 --- a/TAO/tao/SystemException.inl +++ b/TAO/tao/SystemException.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -CORBA::SystemException::minor (void) const +CORBA::SystemException::minor () const { return this->minor_; } @@ -14,7 +14,7 @@ CORBA::SystemException::minor (CORBA::ULong m) } ACE_INLINE CORBA::CompletionStatus -CORBA::SystemException::completed (void) const +CORBA::SystemException::completed () const { return this->completed_; } diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl index 337e172490a..8b9a1519556 100644 --- a/TAO/tao/TAO_Server_Request.inl +++ b/TAO/tao/TAO_Server_Request.inl @@ -37,25 +37,25 @@ TAO_ServerRequest::TAO_ServerRequest (void) } ACE_INLINE TAO_ORB_Core * -TAO_ServerRequest::orb_core (void) const +TAO_ServerRequest::orb_core () const { return this->orb_core_; } ACE_INLINE TAO_InputCDR * -TAO_ServerRequest::incoming (void) const +TAO_ServerRequest::incoming () const { return this->incoming_; } ACE_INLINE TAO_OutputCDR * -TAO_ServerRequest::outgoing (void) const +TAO_ServerRequest::outgoing () const { return this->outgoing_; } ACE_INLINE const char * -TAO_ServerRequest::operation (void) const +TAO_ServerRequest::operation () const { return (this->operation_ == 0 ? "" : this->operation_); } @@ -74,19 +74,19 @@ TAO_ServerRequest::operation (const char *operation, } ACE_INLINE size_t -TAO_ServerRequest::operation_length (void) const +TAO_ServerRequest::operation_length () const { return this->operation_len_; } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::response_expected (void) const +TAO_ServerRequest::response_expected () const { return this->response_expected_; } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::deferred_reply (void) const +TAO_ServerRequest::deferred_reply () const { return this->deferred_reply_; } @@ -120,7 +120,7 @@ TAO_ServerRequest::sync_after_dispatch (void) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::sync_with_server (void) const +TAO_ServerRequest::sync_with_server () const { return this->sync_with_server_; } @@ -132,7 +132,7 @@ TAO_ServerRequest::sync_with_server (CORBA::Boolean sync_flag) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::is_queued (void) const +TAO_ServerRequest::is_queued () const { return this->is_queued_; } @@ -212,7 +212,7 @@ TAO_ServerRequest::forward_location (void) } ACE_INLINE bool -TAO_ServerRequest::is_forwarded (void) const +TAO_ServerRequest::is_forwarded () const { return this->is_forwarded_; } @@ -236,7 +236,7 @@ TAO_ServerRequest::is_dsi (void) } ACE_INLINE TAO_Operation_Details const * -TAO_ServerRequest::operation_details (void) const +TAO_ServerRequest::operation_details () const { return this->operation_details_; } @@ -260,7 +260,7 @@ TAO_ServerRequest::argument_flag (CORBA::Boolean flag) } ACE_INLINE bool -TAO_ServerRequest::collocated (void) const +TAO_ServerRequest::collocated () const { return this->transport_.get () == 0; } diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl index 15abf95aff9..683ead394da 100644 --- a/TAO/tao/Tagged_Profile.inl +++ b/TAO/tao/Tagged_Profile.inl @@ -33,31 +33,31 @@ TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key) } ACE_INLINE const TAO::ObjectKey & -TAO_Tagged_Profile::object_key (void) const +TAO_Tagged_Profile::object_key () const { return const_cast<TAO_Tagged_Profile *> (this)->object_key (); } ACE_INLINE const IOP::TaggedProfile & -TAO_Tagged_Profile::tagged_profile (void) const +TAO_Tagged_Profile::tagged_profile () const { return this->profile_; } ACE_INLINE CORBA::ULong -TAO_Tagged_Profile::profile_index (void) const +TAO_Tagged_Profile::profile_index () const { return this->profile_index_; } ACE_INLINE const char* -TAO_Tagged_Profile::type_id (void) const +TAO_Tagged_Profile::type_id () const { return this->type_id_ == 0 ? "" : this->type_id_; } ACE_INLINE CORBA::Short -TAO_Tagged_Profile::discriminator (void) const +TAO_Tagged_Profile::discriminator () const { return this->discriminator_; } diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index 59f0589dc8e..cadf737ec18 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -2,38 +2,38 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Transport::queue_is_empty_i (void) const +TAO_Transport::queue_is_empty_i () const { return (this->head_ == 0); } ACE_INLINE CORBA::ULong -TAO_Transport::tag (void) const +TAO_Transport::tag () const { return this->tag_; } ACE_INLINE TAO_ORB_Core * -TAO_Transport::orb_core (void) const +TAO_Transport::orb_core () const { return this->orb_core_; } ACE_INLINE TAO_Transport_Mux_Strategy * -TAO_Transport::tms (void) const +TAO_Transport::tms () const { return tms_; } // Return the Wait strategy used by the Transport. ACE_INLINE TAO_Wait_Strategy * -TAO_Transport::wait_strategy (void) const +TAO_Transport::wait_strategy () const { return this->ws_; } ACE_INLINE int -TAO_Transport::bidirectional_flag (void) const +TAO_Transport::bidirectional_flag () const { return this->bidirectional_flag_; } @@ -72,7 +72,7 @@ TAO_Transport::cache_map_entry ( } ACE_INLINE unsigned long -TAO_Transport::purging_order (void) const +TAO_Transport::purging_order () const { return this->purging_order_; } @@ -88,7 +88,7 @@ TAO_Transport::purging_order (unsigned long value) } ACE_INLINE size_t -TAO_Transport::id (void) const +TAO_Transport::id () const { return this->id_; } @@ -110,7 +110,7 @@ TAO_Transport::queue_is_empty (void) } ACE_INLINE int -TAO_Transport::flush_timer_pending (void) const +TAO_Transport::flush_timer_pending () const { return this->flush_timer_id_ != -1; } @@ -133,13 +133,13 @@ TAO_Transport::messaging_object (void) ACE_INLINE TAO_Codeset_Translator_Base * -TAO_Transport::char_translator (void) const +TAO_Transport::char_translator () const { return this->char_translator_; } ACE_INLINE TAO_Codeset_Translator_Base * -TAO_Transport::wchar_translator (void) const +TAO_Transport::wchar_translator () const { return this->wchar_translator_; } @@ -160,7 +160,7 @@ TAO_Transport::wchar_translator (TAO_Codeset_Translator_Base *tf) /// CodeSet negotiation ACE_INLINE CORBA::Boolean -TAO_Transport::is_tcs_set(void) const +TAO_Transport::is_tcs_set() const { return tcs_set_; } @@ -172,13 +172,13 @@ TAO_Transport::first_request_sent (bool flag) } ACE_INLINE bool -TAO_Transport::first_request (void) const +TAO_Transport::first_request () const { return this->first_request_; } ACE_INLINE bool -TAO_Transport::is_connected (void) const +TAO_Transport::is_connected () const { ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, false); return this->is_connected_; @@ -191,13 +191,13 @@ TAO_Transport::connection_handler (void) } ACE_INLINE size_t -TAO_Transport::recv_buffer_size (void) const +TAO_Transport::recv_buffer_size () const { return this->recv_buffer_size_; } ACE_INLINE size_t -TAO_Transport::sent_byte_count (void) const +TAO_Transport::sent_byte_count () const { return this->sent_byte_count_; } @@ -205,7 +205,7 @@ TAO_Transport::sent_byte_count (void) const #if TAO_HAS_TRANSPORT_CURRENT == 1 ACE_INLINE TAO::Transport::Stats* -TAO_Transport::stats (void) const +TAO_Transport::stats () const { return this->stats_; } @@ -230,7 +230,7 @@ TAO::Transport::Stats::messages_sent (size_t message_length) } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::messages_sent (void) const +TAO::Transport::Stats::messages_sent () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -238,7 +238,7 @@ TAO::Transport::Stats::messages_sent (void) const } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::bytes_sent (void) const +TAO::Transport::Stats::bytes_sent () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -255,7 +255,7 @@ TAO::Transport::Stats::messages_received (size_t message_length) } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::messages_received (void) const +TAO::Transport::Stats::messages_received () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -263,7 +263,7 @@ TAO::Transport::Stats::messages_received (void) const } ACE_INLINE CORBA::LongLong -TAO::Transport::Stats::bytes_received (void) const +TAO::Transport::Stats::bytes_received () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, 0); @@ -279,7 +279,7 @@ TAO::Transport::Stats::opened_since (const ACE_Time_Value& tv) } ACE_INLINE const ACE_Time_Value& -TAO::Transport::Stats::opened_since (void) const +TAO::Transport::Stats::opened_since () const { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->stat_mutex_, ACE_Time_Value::zero); diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp index 850ce1d621f..3ccc5a27601 100644 --- a/TAO/tao/TransportCurrent/Current_Impl.cpp +++ b/TAO/tao/TransportCurrent/Current_Impl.cpp @@ -37,7 +37,7 @@ namespace TAO /// if, there was no "current" transport selected on the current /// thread. const TAO_Transport* - Current_Impl::transport (void) const + Current_Impl::transport () const { Transport_Selection_Guard* topguard = Transport_Selection_Guard::current (this->core_, this->tss_slot_id_); @@ -52,7 +52,7 @@ namespace TAO /// Obtains the current transport's stats const TAO::Transport::Stats* - Current_Impl::transport_stats (void) const + Current_Impl::transport_stats () const { static const TAO::Transport::Stats dummy; diff --git a/TAO/tao/Transport_Acceptor.inl b/TAO/tao/Transport_Acceptor.inl index 700216cd082..0071127f4e4 100644 --- a/TAO/tao/Transport_Acceptor.inl +++ b/TAO/tao/Transport_Acceptor.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::ULong -TAO_Acceptor::tag (void) const +TAO_Acceptor::tag () const { return this->tag_; } diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index cc57a5abd5b..f0600e15df1 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -69,7 +69,7 @@ public: * profile0} {tag1, profile1} ...}. The IOP module defines the * ProfileId typedef to be a CORBA::ULong. */ - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Parse a string containing a URL style IOR and return an /// MProfile. Verify that ior is in the correct format. @@ -113,13 +113,13 @@ public: virtual int check_prefix (const char *endpoint) = 0; /// Return the object key delimiter to use or expect. - virtual char object_key_delimiter (void) const = 0; + virtual char object_key_delimiter () const = 0; protected: /// A flag indicating the actual connector supports parallel connection /// attempts. The base implementation always returns 0. Override to return /// non-zero if parallel connection attempts may be tried. - virtual int supports_parallel_connects (void) const; + virtual int supports_parallel_connects () const; /// Create a profile with a given endpoint. virtual TAO_Profile *make_profile (void) = 0; diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl index 30c7d450024..802e7bfdf1f 100644 --- a/TAO/tao/Transport_Connector.inl +++ b/TAO/tao/Transport_Connector.inl @@ -14,7 +14,7 @@ TAO_Connector::orb_core (TAO_ORB_Core *orb_core) } ACE_INLINE CORBA::ULong -TAO_Connector::tag (void) const +TAO_Connector::tag () const { return this->tag_; } diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h index 3ca7b30257c..0986b3c4c60 100644 --- a/TAO/tao/Transport_Descriptor_Interface.h +++ b/TAO/tao/Transport_Descriptor_Interface.h @@ -57,7 +57,7 @@ public: const TAO_Transport_Descriptor_Interface *other_prop) = 0; /// Generate hash value for our class - virtual u_long hash (void) const = 0; + virtual u_long hash () const = 0; /// Return the underlying endpoint object TAO_Endpoint *endpoint (void); diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index dbdc0e033ab..957afc63702 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE const typename S_var::s_traits::char_type * -TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) const +TAO::In_UB_String_Argument_T<S_var,Insert_Policy>::arg () const { return this->x_; } diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index a7d7df325c3..c968219535f 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -137,13 +137,13 @@ CORBA::AbstractBase::_is_a (const char *type_id) } const char * -CORBA::AbstractBase::_interface_repository_id (void) const +CORBA::AbstractBase::_interface_repository_id () const { return "IDL:omg.org/CORBA/AbstractBase:1.0"; } const char * -CORBA::AbstractBase::_tao_obv_repository_id (void) const +CORBA::AbstractBase::_tao_obv_repository_id () const { return "IDL:omg.org/CORBA/AbstractBase:1.0"; } diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 456947d78bd..7189243b08a 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1426,7 +1426,7 @@ CORBA::DefaultValueRefCountBase::_tao_remove_ref (void) } CORBA::ULong -CORBA::DefaultValueRefCountBase::_tao_refcount_value (void) const +CORBA::DefaultValueRefCountBase::_tao_refcount_value () const { return this->refcount_; } diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index 65255c04e5f..c136bde51c9 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -78,14 +78,14 @@ TAO_Value_Var_T<T>::operator T *& () template <typename T> T * -TAO_Value_Var_T<T>::operator-> (void) const +TAO_Value_Var_T<T>::operator-> () const { return this->ptr_; } template <typename T> T * -TAO_Value_Var_T<T>::in (void) const +TAO_Value_Var_T<T>::in () const { return this->ptr_; } @@ -117,7 +117,7 @@ TAO_Value_Var_T<T>::_retn (void) template <typename T> T * -TAO_Value_Var_T<T>::ptr (void) const +TAO_Value_Var_T<T>::ptr () const { return this->ptr_; } diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp index bd64c481071..3e95c82454f 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp @@ -36,7 +36,7 @@ TAO_Valuetype_Adapter_Impl::stream_to_abstract_base ( } CORBA::Long -TAO_Valuetype_Adapter_Impl::type_info_single (void) const +TAO_Valuetype_Adapter_Impl::type_info_single () const { return TAO_OBV_GIOP_Flags::Type_info_single; } diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h index 79bfdfe8b67..aba0ca95696 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h @@ -51,7 +51,7 @@ public: TAO_InputCDR &, CORBA::AbstractBase_ptr &); - virtual CORBA::Long type_info_single (void) const; + virtual CORBA::Long type_info_single () const; virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const; virtual CORBA::Boolean is_type_info_single (CORBA::Long) const; diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index 10da0ada3a3..8b2fd7d0529 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -14,7 +14,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type const * -TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) const +TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::arg () const { return this->x_.in (); } diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index eba3d623bea..82cb065b1de 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -13,7 +13,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE const S & -TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const +TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg () const { return *this->x_; } diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h index 3dd1055f799..5741902c931 100644 --- a/TAO/tao/Wait_On_LF_No_Upcall.h +++ b/TAO/tao/Wait_On_LF_No_Upcall.h @@ -51,7 +51,7 @@ namespace TAO TAO_Synch_Reply_Dispatcher &rd); /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; /*! @copydoc TAO_Wait_Strategy::defer_upcall() */ virtual int defer_upcall (ACE_Event_Handler*); diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h index 527e5f58981..cca3a7fb3d0 100644 --- a/TAO/tao/Wait_On_Leader_Follower.h +++ b/TAO/tao/Wait_On_Leader_Follower.h @@ -56,10 +56,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h index b38aeb46bca..57993e40f77 100644 --- a/TAO/tao/Wait_On_Reactor.h +++ b/TAO/tao/Wait_On_Reactor.h @@ -44,10 +44,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h index 85a8930f8e7..fde048dc907 100644 --- a/TAO/tao/Wait_On_Read.h +++ b/TAO/tao/Wait_On_Read.h @@ -48,10 +48,10 @@ public: virtual int register_handler (void); /*! @copydoc TAO_Wait_Strategy::non_blocking() */ - virtual bool non_blocking (void) const; + virtual bool non_blocking () const; /*! @copydoc TAO_Wait_Strategy::can_process_upcalls() */ - virtual bool can_process_upcalls (void) const; + virtual bool can_process_upcalls () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Wait_Strategy.inl b/TAO/tao/Wait_Strategy.inl index ba6720dd49b..2fc8fedf227 100644 --- a/TAO/tao/Wait_Strategy.inl +++ b/TAO/tao/Wait_Strategy.inl @@ -1,7 +1,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE bool -TAO_Wait_Strategy::is_registered (void) const +TAO_Wait_Strategy::is_registered () const { return this->is_registered_; } diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp index c74ee3336e8..1c252dee3e9 100644 --- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp +++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp @@ -46,7 +46,7 @@ CompressorIdLevelListPolicy::policy_type (void) CompressorIdLevelListPolicy * -CompressorIdLevelListPolicy::clone (void) const +CompressorIdLevelListPolicy::clone () const { CompressorIdLevelListPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -78,13 +78,13 @@ CompressorIdLevelListPolicy::compressor_ids (void) } TAO_Cached_Policy_Type -CompressorIdLevelListPolicy::_tao_cached_type (void) const +CompressorIdLevelListPolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_ID_LEVEL_LIST_POLICY; } TAO_Policy_Scope -CompressorIdLevelListPolicy::_tao_scope (void) const +CompressorIdLevelListPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -140,7 +140,7 @@ CompressionEnablingPolicy::policy_type (void) CompressionEnablingPolicy * -CompressionEnablingPolicy::clone (void) const +CompressionEnablingPolicy::clone () const { CompressionEnablingPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -176,13 +176,13 @@ CompressionEnablingPolicy::compression_enabled (void) TAO_Cached_Policy_Type -CompressionEnablingPolicy::_tao_cached_type (void) const +CompressionEnablingPolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_ENABLING_POLICY; } TAO_Policy_Scope -CompressionEnablingPolicy::_tao_scope (void) const +CompressionEnablingPolicy::_tao_scope () const { return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); @@ -229,7 +229,7 @@ CompressionLowValuePolicy::policy_type (void) CompressionLowValuePolicy * -CompressionLowValuePolicy::clone (void) const +CompressionLowValuePolicy::clone () const { CompressionLowValuePolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -265,7 +265,7 @@ CompressionLowValuePolicy::low_value (void) TAO_Cached_Policy_Type -CompressionLowValuePolicy::_tao_cached_type (void) const +CompressionLowValuePolicy::_tao_cached_type () const { return TAO_CACHED_COMPRESSION_LOW_VALUE_POLICY; } @@ -299,7 +299,7 @@ CompressionMinRatioPolicy::policy_type (void) CompressionMinRatioPolicy * -CompressionMinRatioPolicy::clone (void) const +CompressionMinRatioPolicy::clone () const { CompressionMinRatioPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -335,7 +335,7 @@ CompressionMinRatioPolicy::ratio (void) TAO_Cached_Policy_Type -CompressionMinRatioPolicy::_tao_cached_type (void) const +CompressionMinRatioPolicy::_tao_cached_type () const { return TAO_CACHED_MIN_COMPRESSION_RATIO_POLICY; } diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h index fd092b0f2ae..433926cf9c9 100644 --- a/TAO/tao/ZIOP/ZIOP_Policy_i.h +++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h @@ -48,7 +48,7 @@ public: CompressorIdLevelListPolicy (const CompressorIdLevelListPolicy &rhs); /// Returns a copy of this CompressorIdLevelListPolicy. - virtual CompressorIdLevelListPolicy *clone (void) const; + virtual CompressorIdLevelListPolicy *clone () const; virtual ::Compression::CompressorIdLevelList * compressor_ids (); @@ -58,10 +58,10 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the current object. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -93,7 +93,7 @@ public: CompressionEnablingPolicy (const CompressionEnablingPolicy &rhs); /// Returns a copy of this CompressionEnablingPolicy. - virtual CompressionEnablingPolicy *clone (void) const; + virtual CompressionEnablingPolicy *clone () const; /// = The ZIOP::BidirectionalPolicy methods virtual ::CORBA::Boolean compression_enabled (void); @@ -104,10 +104,10 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; // Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; /// This method writes a CDR representation of the current object. CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); @@ -139,7 +139,7 @@ public: CompressionLowValuePolicy (const CompressionLowValuePolicy &rhs); /// Returns a copy of this CompressionLowValuePolicy. - virtual CompressionLowValuePolicy *clone (void) const; + virtual CompressionLowValuePolicy *clone () const; /// = The ZIOP::BidirectionalPolicy methods virtual ::CORBA::ULong low_value (void); @@ -150,7 +150,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: @@ -176,7 +176,7 @@ public: CompressionMinRatioPolicy (const CompressionMinRatioPolicy &rhs); /// Returns a copy of this CompressionMinRatioPolicy. - virtual CompressionMinRatioPolicy *clone (void) const; + virtual CompressionMinRatioPolicy *clone () const; virtual ::Compression::CompressionRatio ratio (void); @@ -186,7 +186,7 @@ public: virtual void destroy (void); - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index b54b675bdef..9029b5a13ef 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -53,13 +53,13 @@ public: // following methods. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport); virtual ACE_Lock *create_transport_mux_strategy_lock (void); - virtual int reply_dispatcher_table_size (void) const; + virtual int reply_dispatcher_table_size () const; virtual int allow_callback (void); virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); virtual TAO_Connect_Strategy *create_connect_strategy (TAO_ORB_Core *); - virtual bool use_cleanup_options (void) const; - virtual Connect_Strategy connect_strategy (void) const; - virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const; + virtual bool use_cleanup_options () const; + virtual Connect_Strategy connect_strategy () const; + virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const; virtual Messaging::SyncScope sync_scope () const; protected: diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 9e95c9be4fa..b2e556c3d91 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -194,12 +194,12 @@ protected: TAO_Time_Policy_Manager* time_policy_manager () const; #endif - ACE_Timer_Queue * create_timer_queue (void) const; + ACE_Timer_Queue * create_timer_queue () const; void destroy_timer_queue (ACE_Timer_Queue *tmq) const; /// Obtain the reactor implementation - virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; + virtual ACE_Reactor_Impl *allocate_reactor_impl () const; /// Add a Parser name to the list of Parser names. int add_to_ior_parser_names (const char *); diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl index 216113cb758..3db521b5de2 100644 --- a/TAO/tao/operation_details.inl +++ b/TAO/tao/operation_details.inl @@ -31,32 +31,32 @@ TAO_Operation_Details::TAO_Operation_Details (const char *name, } ACE_INLINE const char* -TAO_Operation_Details::opname (void) const +TAO_Operation_Details::opname () const { return this->opname_; } ACE_INLINE CORBA::ULong -TAO_Operation_Details::opname_len (void) const +TAO_Operation_Details::opname_len () const { return this->opname_len_; } ACE_INLINE CORBA::Boolean -TAO_Operation_Details::argument_flag (void) const +TAO_Operation_Details::argument_flag () const { return (this->num_args_ > 1); } #if 1 ACE_INLINE CORBA::Boolean -TAO_Operation_Details::in_argument_flag (void) const +TAO_Operation_Details::in_argument_flag () const { return this->has_in_args_ && this->num_args_ > 1; } #else ACE_INLINE CORBA::Boolean -TAO_Operation_Details::in_argument_flag (void) const +TAO_Operation_Details::in_argument_flag () const { for (CORBA::ULong i = 1; i < this->num_args_ && !this->has_in_args_; i++) { @@ -77,7 +77,7 @@ TAO_Operation_Details::request_service_context (void) } ACE_INLINE const TAO_Service_Context & -TAO_Operation_Details::request_service_context (void) const +TAO_Operation_Details::request_service_context () const { return this->request_service_info_; } @@ -89,7 +89,7 @@ TAO_Operation_Details::request_service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Operation_Details::request_service_info (void) const +TAO_Operation_Details::request_service_info () const { return this->request_service_context ().service_info (); } @@ -101,7 +101,7 @@ TAO_Operation_Details::reply_service_context (void) } ACE_INLINE const TAO_Service_Context & -TAO_Operation_Details::reply_service_context (void) const +TAO_Operation_Details::reply_service_context () const { return this->reply_service_info_; } @@ -113,7 +113,7 @@ TAO_Operation_Details::reply_service_info (void) } ACE_INLINE const IOP::ServiceContextList & -TAO_Operation_Details::reply_service_info (void) const +TAO_Operation_Details::reply_service_info () const { return this->reply_service_context ().service_info (); } @@ -136,7 +136,7 @@ TAO_Operation_Details::request_id (CORBA::ULong id) } ACE_INLINE CORBA::ULong -TAO_Operation_Details::request_id (void) const +TAO_Operation_Details::request_id () const { return this->request_id_; } @@ -148,25 +148,25 @@ TAO_Operation_Details::response_flags (CORBA::Octet flags) } ACE_INLINE CORBA::ULong -TAO_Operation_Details::ex_count (void) const +TAO_Operation_Details::ex_count () const { return this->ex_count_; } ACE_INLINE TAO::Exception_Data const * -TAO_Operation_Details::ex_data (void) const +TAO_Operation_Details::ex_data () const { return this->ex_data_; } ACE_INLINE CORBA::Octet -TAO_Operation_Details::response_flags (void) const +TAO_Operation_Details::response_flags () const { return this->response_flags_; } ACE_INLINE TAO_Target_Specification::TAO_Target_Address -TAO_Operation_Details::addressing_mode (void) const +TAO_Operation_Details::addressing_mode () const { return this->addressing_mode_; } @@ -183,19 +183,19 @@ TAO_Operation_Details::addressing_mode (CORBA::Short mode) } ACE_INLINE TAO::Argument ** -TAO_Operation_Details::args (void) const +TAO_Operation_Details::args () const { return this->args_; } ACE_INLINE CORBA::ULong -TAO_Operation_Details::args_num (void) const +TAO_Operation_Details::args_num () const { return this->num_args_; } ACE_INLINE CORBA::Boolean -TAO_Operation_Details::use_stub_args (void) const +TAO_Operation_Details::use_stub_args () const { return this->use_stub_args_; } @@ -214,7 +214,7 @@ TAO_Operation_Details::ft_expiration_time (TimeBase::TimeT time) } ACE_INLINE TimeBase::TimeT -TAO_Operation_Details::ft_expiration_time (void) const +TAO_Operation_Details::ft_expiration_time () const { return this->ft_expiration_time_; } @@ -226,14 +226,14 @@ TAO_Operation_Details::ft_retention_id (CORBA::Long request_id) } ACE_INLINE CORBA::Long -TAO_Operation_Details::ft_retention_id (void) const +TAO_Operation_Details::ft_retention_id () const { return this->ft_retention_id_; } #endif /*TAO_HAS_INTERCEPTORS == 1*/ ACE_INLINE TAO::Collocated_Arguments_Converter * -TAO_Operation_Details::cac (void) const +TAO_Operation_Details::cac () const { return this->cac_; } @@ -245,7 +245,7 @@ TAO_Operation_Details::cac (TAO::Collocated_Arguments_Converter *cac) } ACE_INLINE TAO_Reply_Dispatcher * -TAO_Operation_Details::reply_dispatcher (void) const +TAO_Operation_Details::reply_dispatcher () const { return this->reply_dispatcher_; } diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp index 885cb7eaab6..10382be69ed 100644 --- a/TAO/tao/params.cpp +++ b/TAO/tao/params.cpp @@ -316,7 +316,7 @@ TAO_ORB_Parameters::prefer_ipv6_interfaces (bool p) } bool -TAO_ORB_Parameters::prefer_ipv6_interfaces (void) const +TAO_ORB_Parameters::prefer_ipv6_interfaces () const { return this->prefer_ipv6_interfaces_; } @@ -328,7 +328,7 @@ TAO_ORB_Parameters::connect_ipv6_only (bool p) } bool -TAO_ORB_Parameters::connect_ipv6_only (void) const +TAO_ORB_Parameters::connect_ipv6_only () const { return this->connect_ipv6_only_; } @@ -340,7 +340,7 @@ TAO_ORB_Parameters::use_ipv6_link_local (bool p) } bool -TAO_ORB_Parameters::use_ipv6_link_local (void) const +TAO_ORB_Parameters::use_ipv6_link_local () const { return this->use_ipv6_link_local_; } diff --git a/TAO/tao/params.h b/TAO/tao/params.h index fe06a81b545..8e85b937e0f 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -225,13 +225,13 @@ public: #if defined (ACE_HAS_IPV6) void prefer_ipv6_interfaces (bool p); - bool prefer_ipv6_interfaces (void) const; + bool prefer_ipv6_interfaces () const; void connect_ipv6_only (bool p); - bool connect_ipv6_only (void) const; + bool connect_ipv6_only () const; void use_ipv6_link_local (bool p); - bool use_ipv6_link_local (void) const; + bool use_ipv6_link_local () const; #endif /* ACE_HAS_IPV6 */ void negotiate_codesets (bool c); diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl index b6093aed662..e2ede8c30bf 100644 --- a/TAO/tao/params.inl +++ b/TAO/tao/params.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int -TAO_ORB_Parameters::sock_rcvbuf_size (void) const +TAO_ORB_Parameters::sock_rcvbuf_size () const { return sock_rcvbuf_size_; } @@ -14,7 +14,7 @@ TAO_ORB_Parameters::sock_rcvbuf_size (int s) } ACE_INLINE int -TAO_ORB_Parameters::sock_sndbuf_size (void) const +TAO_ORB_Parameters::sock_sndbuf_size () const { return sock_sndbuf_size_; } @@ -26,7 +26,7 @@ TAO_ORB_Parameters::sock_sndbuf_size (int s) } ACE_INLINE int -TAO_ORB_Parameters::cdr_memcpy_tradeoff (void) const +TAO_ORB_Parameters::cdr_memcpy_tradeoff () const { return this->cdr_memcpy_tradeoff_; } @@ -38,7 +38,7 @@ TAO_ORB_Parameters::cdr_memcpy_tradeoff (int x) } ACE_INLINE ACE_CDR::ULong -TAO_ORB_Parameters::max_message_size (void) const +TAO_ORB_Parameters::max_message_size () const { return this->max_message_size_; } @@ -50,7 +50,7 @@ TAO_ORB_Parameters::max_message_size (ACE_CDR::ULong size) } ACE_INLINE int -TAO_ORB_Parameters::use_dotted_decimal_addresses (void) const +TAO_ORB_Parameters::use_dotted_decimal_addresses () const { return this->use_dotted_decimal_addresses_; } @@ -62,7 +62,7 @@ TAO_ORB_Parameters::use_dotted_decimal_addresses (int x) } ACE_INLINE int -TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address (void) const +TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address () const { return this->cache_incoming_by_dotted_decimal_address_; } @@ -74,7 +74,7 @@ TAO_ORB_Parameters::cache_incoming_by_dotted_decimal_address (int x) } ACE_INLINE int -TAO_ORB_Parameters::linger (void) const +TAO_ORB_Parameters::linger () const { return this->linger_; } @@ -87,7 +87,7 @@ TAO_ORB_Parameters::linger (int x) ACE_INLINE time_t -TAO_ORB_Parameters::accept_error_delay (void) const +TAO_ORB_Parameters::accept_error_delay () const { return this->accept_error_delay_; } @@ -119,7 +119,7 @@ TAO_ORB_Parameters::mcast_discovery_endpoint (const char *mde) } ACE_INLINE const char * -TAO_ORB_Parameters::mcast_discovery_endpoint (void) const +TAO_ORB_Parameters::mcast_discovery_endpoint () const { return this->mcast_discovery_endpoint_.in (); } @@ -131,13 +131,13 @@ TAO_ORB_Parameters::default_init_ref (const char *default_init_ref) } ACE_INLINE char * -TAO_ORB_Parameters::default_init_ref (void) const +TAO_ORB_Parameters::default_init_ref () const { return CORBA::string_dup (this->default_init_ref_.c_str ()); } ACE_INLINE bool -TAO_ORB_Parameters::std_profile_components (void) const +TAO_ORB_Parameters::std_profile_components () const { return this->std_profile_components_; } @@ -149,7 +149,7 @@ TAO_ORB_Parameters::std_profile_components (bool x) } ACE_INLINE int -TAO_ORB_Parameters::nodelay (void) const +TAO_ORB_Parameters::nodelay () const { return this->nodelay_; } @@ -234,7 +234,7 @@ TAO_ORB_Parameters::iiop_client_port_span (u_short s) } ACE_INLINE int -TAO_ORB_Parameters::ace_sched_policy (void) const +TAO_ORB_Parameters::ace_sched_policy () const { return this->ace_sched_policy_; } @@ -246,7 +246,7 @@ TAO_ORB_Parameters::ace_sched_policy (int x) } ACE_INLINE long -TAO_ORB_Parameters::sched_policy (void) const +TAO_ORB_Parameters::sched_policy () const { return this->sched_policy_; } @@ -258,7 +258,7 @@ TAO_ORB_Parameters::sched_policy (long x) } ACE_INLINE long -TAO_ORB_Parameters::scope_policy (void) const +TAO_ORB_Parameters::scope_policy () const { return this->scope_policy_; } @@ -270,7 +270,7 @@ TAO_ORB_Parameters::scope_policy (long x) } ACE_INLINE long -TAO_ORB_Parameters::thread_creation_flags (void) const +TAO_ORB_Parameters::thread_creation_flags () const { return this->scope_policy () | @@ -278,7 +278,7 @@ TAO_ORB_Parameters::thread_creation_flags (void) const } ACE_INLINE int -TAO_ORB_Parameters::single_read_optimization (void) const +TAO_ORB_Parameters::single_read_optimization () const { return this->single_read_optimization_; } @@ -290,7 +290,7 @@ TAO_ORB_Parameters::single_read_optimization (int x) } ACE_INLINE bool -TAO_ORB_Parameters::use_parallel_connects (void) const +TAO_ORB_Parameters::use_parallel_connects () const { return this->use_parallel_connects_; } @@ -302,7 +302,7 @@ TAO_ORB_Parameters::use_parallel_connects (bool x) } ACE_INLINE unsigned long -TAO_ORB_Parameters::parallel_connect_delay (void) const +TAO_ORB_Parameters::parallel_connect_delay () const { return this->parallel_connect_delay_; } @@ -314,7 +314,7 @@ TAO_ORB_Parameters::parallel_connect_delay (unsigned long x) } ACE_INLINE int -TAO_ORB_Parameters::shared_profile (void) const +TAO_ORB_Parameters::shared_profile () const { return this->shared_profile_; } @@ -326,7 +326,7 @@ TAO_ORB_Parameters::shared_profile (int x) } ACE_INLINE bool -TAO_ORB_Parameters::disable_rt_collocation_resolver (void) const +TAO_ORB_Parameters::disable_rt_collocation_resolver () const { return this->disable_rt_collocation_resolver_; } @@ -339,7 +339,7 @@ TAO_ORB_Parameters::disable_rt_collocation_resolver (bool x) ACE_INLINE bool -TAO_ORB_Parameters::negotiate_codesets (void) const +TAO_ORB_Parameters::negotiate_codesets () const { return this->negotiate_codesets_; } @@ -351,7 +351,7 @@ TAO_ORB_Parameters::negotiate_codesets (bool x) } ACE_INLINE bool -TAO_ORB_Parameters::ami_collication (void) const +TAO_ORB_Parameters::ami_collication () const { return this->ami_collication_; } @@ -369,13 +369,13 @@ TAO_ORB_Parameters::collocation_resolver_name (const char *s) } ACE_INLINE const char * -TAO_ORB_Parameters::collocation_resolver_name (void) const +TAO_ORB_Parameters::collocation_resolver_name () const { return this->collocation_resolver_name_.c_str (); } ACE_INLINE bool -TAO_ORB_Parameters::forward_invocation_on_object_not_exist (void) const +TAO_ORB_Parameters::forward_invocation_on_object_not_exist () const { return this->forward_invocation_on_object_not_exist_; } @@ -387,7 +387,7 @@ TAO_ORB_Parameters::forward_invocation_on_object_not_exist (bool x) } ACE_INLINE int -TAO_ORB_Parameters::forward_once_exception (void) const +TAO_ORB_Parameters::forward_once_exception () const { return this->forward_once_exception_; } @@ -399,7 +399,7 @@ TAO_ORB_Parameters::forward_once_exception (const int ef) } ACE_INLINE bool -TAO_ORB_Parameters::allow_ziop_no_server_policies (void) const +TAO_ORB_Parameters::allow_ziop_no_server_policies () const { return this->allow_ziop_no_server_policies_; } |