diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-25 13:27:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 13:27:03 +0100 |
| commit | fdf9fe05d6a4499ced8b55b52f179275ce0c90b0 (patch) | |
| tree | b63469e57597713738afea9d42ef0e78fcb9d7d4 | |
| parent | e4bcaf22324492a0d784890cd9ca86b4a707e68f (diff) | |
| parent | ab938af466a77a9992d95da9fc832ff50444255f (diff) | |
| download | ATCD-fdf9fe05d6a4499ced8b55b52f179275ce0c90b0.tar.gz | |
Merge pull request #1440 from jwillemsen/jw-cleanupvc6
Cleanup for vc6, use nullptr, remove redundant void, layout changes
141 files changed, 529 insertions, 750 deletions
diff --git a/ACE/bin/pippen.pl b/ACE/bin/pippen.pl index c408a89ec05..de06a32be69 100755 --- a/ACE/bin/pippen.pl +++ b/ACE/bin/pippen.pl @@ -44,9 +44,6 @@ while ( $#ARGV >= 0) elsif ($ARGV[0] =~ m/^-evc3/i) { $extension = "vcp"; } - elsif ($ARGV[0] =~ m/^-msvc6/i) { - $extension = "dsp"; - } elsif ($ARGV[0] =~ m/^-msvc7/i) { $extension = "vcproj"; } @@ -78,7 +75,6 @@ while ( $#ARGV >= 0) print "-list - Prints out the list of project files\n"; print "-config <c> - Use <c> as a configuration\n"; print "-evc3 - Looks for eMbedded Visual C++ 3.0 projects\n"; - print "-msvc6 - Looks for Visual C++ 5.0/6.0 projects\n"; print "-msvc7 - Looks for Visual C++ 7.0 projects\n"; print "-clean - Clean instead of building\n"; print "-recurse - Recurse into directories\n"; @@ -127,9 +123,6 @@ if (!defined $extension) { if ($compiler eq "evc3") { $extension = "vcp"; } - elsif ($compiler eq "msvc6") { - $extension = "dsp"; - } elsif ($compiler eq "msvc7") { $extension = "vcproj"; } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index bf8b9c5de39..cd9bb8fd6c7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -146,7 +146,7 @@ project(ImR_Locator_Service) : orbsvcsexe, install_bin, avoids_minimum_corba, av // there is no way to narrow the options down to only static debug builds. // Incremental linking has also been turned off since it is // incompatible with this option, producing warnings at link time. - specific(em3, nmake, vc6, vc71) { + specific(em3, nmake, vc71) { link_options += /FORCE:MULTIPLE /INCREMENTAL:NO } diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index dc0124ae18a..308d9d12141 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -89,8 +89,8 @@ public: TAO_AcceptorSetIterator end (); private: - ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry &operator= (const TAO_Acceptor_Registry &)) + TAO_Acceptor_Registry (const TAO_Acceptor_Registry &) = delete; + TAO_Acceptor_Registry &operator= (const TAO_Acceptor_Registry &) = delete; /// Create a default acceptor for all loaded protocols. int open_default (TAO_ORB_Core *orb_core, diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 037f59e23d2..bdca283d9a2 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -91,8 +91,8 @@ public: TAO_Adapter *find_adapter (const char *name) const; private: - ACE_UNIMPLEMENTED_FUNC (TAO_Adapter_Registry (const TAO_Adapter_Registry &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Adapter_Registry &operator= (const TAO_Adapter_Registry &)) + TAO_Adapter_Registry (const TAO_Adapter_Registry &) = delete; + TAO_Adapter_Registry &operator= (const TAO_Adapter_Registry &) = delete; /** * @name A simple array of adapters. diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp index a9d0809a0fe..19499e7aa93 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp @@ -117,7 +117,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - 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 ( @@ -152,7 +152,7 @@ template<typename StringType, char const * TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::id_i (void) const + RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -165,7 +165,7 @@ template<typename StringType, char const * TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::name_i (void) const + RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -178,7 +178,7 @@ template<typename StringType, CORBA::TypeCode_ptr TAO::TypeCode::Alias<StringType, TypeCodeType, - RefCountPolicy>::content_type_i (void) const + RefCountPolicy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index 45e7c8c7c51..da0c5d2c443 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -429,8 +429,7 @@ operator<<= (CORBA::Any &any, const CORBA::Any &a) any, CORBA::Any::_tao_any_destructor, CORBA::_tc_any, - a - ); + a); } // Insertion of Any - non-copying. @@ -697,8 +696,7 @@ operator>>= (const CORBA::Any &any, const CORBA::Any *&a) any, CORBA::Any::_tao_any_destructor, CORBA::_tc_any, - a - ); + a); } CORBA::Boolean diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index bdb65512148..ff717738628 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO::Any_Impl * -CORBA::Any::impl (void) const +CORBA::Any::impl () const { return this->impl_; } @@ -12,8 +12,8 @@ CORBA::Any::impl (void) const // ************************************************************* ACE_INLINE -CORBA::Any_var::Any_var (void) - : ptr_ (0) +CORBA::Any_var::Any_var () + : ptr_ (nullptr) { } @@ -24,7 +24,7 @@ CORBA::Any_var::Any_var (CORBA::Any *p) } ACE_INLINE -CORBA::Any_var::~Any_var (void) +CORBA::Any_var::~Any_var () { delete this->ptr_; } @@ -42,41 +42,41 @@ CORBA::Any_var::operator const CORBA::Any *() const } ACE_INLINE CORBA::Any * -CORBA::Any_var::operator-> (void) +CORBA::Any_var::operator-> () { return this->ptr_; } ACE_INLINE const CORBA::Any & -CORBA::Any_var::in (void) const +CORBA::Any_var::in () const { return *this->ptr_; } ACE_INLINE CORBA::Any & -CORBA::Any_var::inout (void) +CORBA::Any_var::inout () { return *this->ptr_; } ACE_INLINE CORBA::Any *& -CORBA::Any_var::out (void) +CORBA::Any_var::out () { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } ACE_INLINE CORBA::Any * -CORBA::Any_var::_retn (void) +CORBA::Any_var::_retn () { CORBA::Any *temp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return temp; } ACE_INLINE CORBA::Any * -CORBA::Any_var::ptr (void) const +CORBA::Any_var::ptr () const { return this->ptr_; } diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index 7c9a1911696..065806a892b 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -71,7 +71,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::TypeCode_ptr \ -TAO_AnyTypeCode_Adapter_Impl::_tao_type_ ## name (void) const \ +TAO_AnyTypeCode_Adapter_Impl::_tao_type_ ## name () const \ { \ return CORBA::_tc_ ## name; \ } diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index 566233eb0cf..f00487e15e7 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -80,7 +80,7 @@ public: TAO_SYSTEM_EXCEPTION (InvalidPolicies) #define TAO_SYSTEM_EXCEPTION(name) \ - virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const; + virtual CORBA::TypeCode_ptr _tao_type_ ## name () const; ANYTYPECODE__EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp index 9222c88dbce..e4336d70a3a 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp @@ -136,22 +136,22 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr) template<typename T_slice, typename T_forany> const void * -TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const +TAO::Any_Array_Impl_T<T_slice, T_forany>::value () const { return this->value_; } template<typename T_slice, typename T_forany> void -TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void) +TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value () { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_destructor_ = 0; + this->value_destructor_ = nullptr; } - this->value_ = 0; + this->value_ = nullptr; ::CORBA::release (this->type_); } diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h index 660d3080136..5acf9822453 100644 --- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h @@ -53,8 +53,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T_slice * value_; diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 7e82b968f9f..8176c26aef0 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -121,7 +121,7 @@ TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Basic_Impl_T<T>::value (void) const +TAO::Any_Basic_Impl_T<T>::value () const { return &this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp index 41bb34ba6aa..39136dec62d 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp @@ -193,7 +193,7 @@ TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Dual_Impl_T<T>::value (void) const +TAO::Any_Dual_Impl_T<T>::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index c0ba6c2d82b..990a1881246 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -156,7 +156,7 @@ TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr) template<typename T> const void * -TAO::Any_Impl_T<T>::value (void) const +TAO::Any_Impl_T<T>::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp index b728b74f42c..a2cd7984afd 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp @@ -172,33 +172,33 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (TAO_OutputCDR &cdr) template<typename T, typename from_T, typename to_T> const void * -TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const +TAO::Any_Special_Impl_T<T, from_T, to_T>::value () const { return this->value_; } template<typename T, typename from_T, typename to_T> void -TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void) +TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value () { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_destructor_ = 0; + this->value_destructor_ = nullptr; } ::CORBA::release (this->type_); - this->value_ = 0; + this->value_ = nullptr; } template<typename T, typename from_T, typename to_T> void TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr) { - if (this->value_destructor_ != 0) + if (this->value_destructor_) { (*this->value_destructor_) (this->value_); - this->value_ = 0; + this->value_ = nullptr; } if (! this->demarshal_value (cdr)) diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp index 37e64256a52..842d244a2b2 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp @@ -127,7 +127,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> CORBA::TypeCode_ptr TAO::TypeCode::Enum<StringType, EnumeratorArrayType, - RefCountPolicy>::get_compact_typecode_i (void) const + RefCountPolicy>::get_compact_typecode_i () const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -162,7 +162,7 @@ TAO::TypeCode::Enum<StringType, template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * -TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (void) const +TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -171,7 +171,7 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (void template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> char const * -TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (void) const +TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -182,7 +182,7 @@ template <typename StringType, class EnumeratorArrayType, class RefCountPolicy> CORBA::ULong TAO::TypeCode::Enum<StringType, EnumeratorArrayType, - RefCountPolicy>::member_count_i (void) const + RefCountPolicy>::member_count_i () const { return this->nenumerators_; } diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp index c637b062579..f3310d13465 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp @@ -64,18 +64,16 @@ TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc) cons template <class RefCountPolicy> CORBA::TypeCode_ptr -TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i () const { // Already compact since tk_fixed TypeCodes have no name or member // names, meaning that we can simply call _duplicate() on this // TypeCode. - // @@ There is a potential problem here if this TypeCode is a static // and const since it may have been placed in read-only memory by // the compiler. A const_cast<> can return undefined results in // that case. - CORBA::TypeCode_ptr mutable_tc = const_cast<TAO::TypeCode::Fixed<RefCountPolicy> *> (this); @@ -84,14 +82,14 @@ TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (void) const template <class RefCountPolicy> CORBA::UShort -TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i () const { return this->digits_; } template <class RefCountPolicy> CORBA::UShort -TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (void) const +TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i () const { return this->scale_; } diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index 496b37bfb9e..a00da5e1a22 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -11,21 +11,21 @@ CORBA::NamedValue::NamedValue (void) ACE_INLINE const char * -CORBA::NamedValue::name (void) const +CORBA::NamedValue::name () const { return this->name_; } ACE_INLINE CORBA::Any_ptr -CORBA::NamedValue::value (void) const +CORBA::NamedValue::value () const { return const_cast<CORBA::Any_ptr> (&this->any_); } ACE_INLINE CORBA::Flags -CORBA::NamedValue::flags (void) const +CORBA::NamedValue::flags () const { return this->flags_; } @@ -34,7 +34,7 @@ ACE_INLINE CORBA::NamedValue * CORBA::NamedValue::_duplicate (CORBA::NamedValue * x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -44,9 +44,9 @@ CORBA::NamedValue::_duplicate (CORBA::NamedValue * x) ACE_INLINE CORBA::NamedValue* -CORBA::NamedValue::_nil (void) +CORBA::NamedValue::_nil () { - return 0; + return nullptr; } // ************************************************************* @@ -73,7 +73,7 @@ ACE_INLINE CORBA::NVList * CORBA::NVList::_duplicate (CORBA::NVList * x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -83,9 +83,9 @@ CORBA::NVList::_duplicate (CORBA::NVList * x) ACE_INLINE CORBA::NVList * -CORBA::NVList::_nil (void) +CORBA::NVList::_nil () { - return 0; + return nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 5a43981c0f2..c9a287ce992 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -52,7 +52,6 @@ namespace TAO private RefCountPolicy { public: - /// Constructor. Objref (CORBA::TCKind kind, char const * id, @@ -93,7 +92,6 @@ namespace TAO protected: /// Base attributes (@c id and @c name). Base_Attributes<StringType> attributes_; - }; } // End namespace TypeCode diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index d8482d33599..c28969137c4 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -47,7 +47,6 @@ namespace TAO : public TypeCodeBase { public: - /// Recursive @c struct constructor. Recursive_Type (CORBA::TCKind kind, char const * id, @@ -110,7 +109,6 @@ namespace TAO //@} public: - /// Set @c struct @c TypeCode parameters. bool struct_parameters (char const * name, MemberArrayType const & fields, diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp index 9921f123ee5..bd81dd1ea7a 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp @@ -78,8 +78,7 @@ TAO::TypeCode::Sequence<TypeCodeType, return Traits<TypeCodeType>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } template <typename TypeCodeType, class RefCountPolicy> @@ -114,7 +113,6 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (v // and const since it may have been placed in read-only memory by // the compiler. A const_cast<> can return undefined results in // that case. - CORBA::TypeCode_ptr mutable_tc = const_cast<TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy> *> (this); diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 5ef1aec82db..ebba0d9ea31 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -76,8 +76,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } CORBA::Boolean @@ -98,8 +97,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, return Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent ( - rhs_content_type.in () - ); + rhs_content_type.in ()); } CORBA::TypeCode_ptr @@ -115,7 +113,6 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, // and const since it may have been placed in read-only memory by // the compiler. A const_cast<> can return undefined results in // that case. - CORBA::TypeCode_ptr mutable_tc = const_cast<TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy> *> (this); diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 11c76119774..1760d8d49f4 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -83,7 +83,7 @@ namespace TAO virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; virtual CORBA::ULong length_i () const; - virtual CORBA::TypeCode_ptr content_type_i ( ) const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index 06bbd178928..e07b1e54e43 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -38,7 +38,6 @@ namespace TAO class FieldArrayType, class RefCountPolicy> class Struct; - /** * @class Struct * @@ -58,7 +57,6 @@ namespace TAO private TAO::Null_RefCount_Policy { public: - /// Constructor. Struct (CORBA::TCKind kind, char const * id, diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp index 43b786c0d7c..05fbcb8fc50 100644 --- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp +++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp @@ -129,7 +129,6 @@ CORBA::TypeCode_ptr const CORBA::_tc_ ## name = \ STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION - #define TAO_SYSTEM_EXCEPTION(name) \ void \ CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ @@ -138,8 +137,7 @@ CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \ any, \ CORBA::name ::_tao_any_destructor, \ CORBA::_tc_ ## name, \ - ex \ - ); \ + ex); \ } STANDARD_EXCEPTION_LIST @@ -153,8 +151,7 @@ CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \ any, \ CORBA::name ::_tao_any_destructor, \ CORBA::_tc_ ## name, \ - ex \ - ); \ + ex); \ } STANDARD_EXCEPTION_LIST diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl index fa4e65da3cf..bdd78f9cc91 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl @@ -2,19 +2,19 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO::True_RefCount_Policy::True_RefCount_Policy (void) +TAO::True_RefCount_Policy::True_RefCount_Policy () : refcount_ (1) { } ACE_INLINE void -TAO::True_RefCount_Policy::add_ref (void) +TAO::True_RefCount_Policy::add_ref () { ++this->refcount_; } ACE_INLINE void -TAO::True_RefCount_Policy::remove_ref (void) +TAO::True_RefCount_Policy::remove_ref () { const unsigned long new_count = --this->refcount_; diff --git a/TAO/tao/AnyTypeCode/TypeCode.inl b/TAO/tao/AnyTypeCode/TypeCode.inl index a9317676261..66657925c6a 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.inl +++ b/TAO/tao/AnyTypeCode/TypeCode.inl @@ -5,7 +5,7 @@ template<> ACE_INLINE void CORBA::release<> (CORBA::TypeCode_ptr obj) { - if (obj != 0) + if (obj) { obj->tao_release (); } @@ -29,37 +29,37 @@ CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc) } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::_nil (void) +CORBA::TypeCode::_nil () { - return static_cast<CORBA::TypeCode_ptr> (0); + return nullptr; } ACE_INLINE CORBA::TCKind -CORBA::TypeCode::kind (void) const +CORBA::TypeCode::kind () const { return this->kind_; } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::get_compact_typecode (void) const +CORBA::TypeCode::get_compact_typecode () const { return this->get_compact_typecode_i (); } ACE_INLINE char const * -CORBA::TypeCode::id (void) const +CORBA::TypeCode::id () const { return this->id_i (); } ACE_INLINE char const * -CORBA::TypeCode::name (void) const +CORBA::TypeCode::name () const { return this->name_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::member_count (void) const +CORBA::TypeCode::member_count () const { return this->member_count_i (); } @@ -83,37 +83,37 @@ CORBA::TypeCode::member_label (ULong index) const } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type (void) const +CORBA::TypeCode::discriminator_type () const { return this->discriminator_type_i (); } ACE_INLINE CORBA::Long -CORBA::TypeCode::default_index (void) const +CORBA::TypeCode::default_index () const { return this->default_index_i (); } ACE_INLINE CORBA::ULong -CORBA::TypeCode::length (void) const +CORBA::TypeCode::length () const { return this->length_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::content_type (void) const +CORBA::TypeCode::content_type () const { return this->content_type_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_digits (void) const +CORBA::TypeCode::fixed_digits () const { return this->fixed_digits_i (); } ACE_INLINE CORBA::UShort -CORBA::TypeCode::fixed_scale (void) const +CORBA::TypeCode::fixed_scale () const { return this->fixed_scale_i (); } @@ -125,13 +125,13 @@ CORBA::TypeCode::member_visibility (ULong index) const } ACE_INLINE CORBA::ValueModifier -CORBA::TypeCode::type_modifier (void) const +CORBA::TypeCode::type_modifier () const { return this->type_modifier_i (); } ACE_INLINE CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type (void) const +CORBA::TypeCode::concrete_base_type () const { return this->concrete_base_type_i (); } @@ -142,5 +142,4 @@ CORBA::TypeCode::_tao_any_destructor (void * x) ::CORBA::release (static_cast <CORBA::TypeCode_ptr> (x)); } - TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl index a1267fc00e0..6c3d09069bc 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl @@ -26,14 +26,14 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes ( template <typename STRING_TYPE> ACE_INLINE char const * -TAO::TypeCode::Base_Attributes<STRING_TYPE>::id (void) const +TAO::TypeCode::Base_Attributes<STRING_TYPE>::id () const { return Traits<STRING_TYPE>::get_string (this->id_); } template <typename STRING_TYPE> ACE_INLINE char const * -TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (void) const +TAO::TypeCode::Base_Attributes<STRING_TYPE>::name () const { return Traits<STRING_TYPE>::get_string (this->name_); } @@ -44,7 +44,6 @@ TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name) { // This method will only be instantiated in the dynamic TypeCode // case, i.e. when STRING_TYPE is CORBA::String_var. - this->name_ = the_name; } diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 1e420b17592..ccf178f9ed6 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -49,7 +49,6 @@ namespace TAO class Case { public: - /// Constructor. /** * Constructor used when creating static @c union @c TypeCodes. diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 344f917f845..0370bd091a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -43,7 +43,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::marshal ( template <typename StringType, typename TypeCodeType> ACE_INLINE char const * -TAO::TypeCode::Case<StringType, TypeCodeType>::name (void) const +TAO::TypeCode::Case<StringType, TypeCodeType>::name () const { return Traits<StringType>::get_string (this->name_); @@ -59,7 +59,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::name ( template <typename StringType, typename TypeCodeType> ACE_INLINE CORBA::TypeCode_ptr -TAO::TypeCode::Case<StringType, TypeCodeType>::type (void) const +TAO::TypeCode::Case<StringType, TypeCodeType>::type () const { return Traits<StringType>::get_typecode (this->type_); diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 6a6a6b145b9..dbb16217c47 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -277,9 +277,7 @@ TAO::TypeCode::Union<StringType, // this->ncases_, // this->default_index_, // "", -// Traits<StringType>::get_typecode (this->default_case_.type) -// ); - +// Traits<StringType>::get_typecode (this->default_case_.type)); throw ::CORBA::NO_IMPLEMENT (); } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index d702bec5bfc..c267a8f0dd8 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -241,9 +241,7 @@ TAO::TypeCode::Union<char const *, // this->ncases_, // this->default_index_, // "", -// Traits<char const *>::get_typecode (this->default_case_.type) -// ); - +// Traits<char const *>::get_typecode (this->default_case_.type)); throw ::CORBA::NO_IMPLEMENT (); } @@ -252,8 +250,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::id_i ( - ) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp index e19f8a95c33..79e5fb02c9d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp @@ -318,8 +318,7 @@ TAO::TypeCode::Value<StringType, this->type_modifier_, Traits<StringType>::get_typecode (this->concrete_base_), tc_fields, - this->nfields_ - ); + this->nfields_); } template <typename StringType, diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 54d40980a78..293192bb0b5 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -266,8 +266,7 @@ TAO::TypeCode::Value<char const *, this->type_modifier_, Traits<char const *>::get_typecode (this->concrete_base_), tc_fields, - this->nfields_ - ); + this->nfields_); } char const * diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp index bd3a7c61878..ebe9d4aba4b 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.cpp +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.cpp @@ -65,8 +65,7 @@ namespace TAO template<> CORBA::Boolean Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value ( - TAO_InputCDR & cdr - ) + TAO_InputCDR & cdr) { CORBA::String_var id; @@ -96,15 +95,13 @@ namespace CORBA // Copying insertion. void operator<<= ( CORBA::Any &_tao_any, - const CORBA::WrongTransaction &_tao_elem - ) + const CORBA::WrongTransaction &_tao_elem) { TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } // Non-copying insertion. @@ -117,15 +114,13 @@ void operator<<= ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } // Extraction to non-const pointer (deprecated). CORBA::Boolean operator>>= ( const CORBA::Any &_tao_any, - CORBA::WrongTransaction *&_tao_elem - ) + CORBA::WrongTransaction *&_tao_elem) { return _tao_any >>= const_cast< const CORBA::WrongTransaction *&> ( @@ -136,16 +131,14 @@ CORBA::Boolean operator>>= ( // Extraction to const pointer. CORBA::Boolean operator>>= ( const CORBA::Any &_tao_any, - const CORBA::WrongTransaction *&_tao_elem - ) + const CORBA::WrongTransaction *&_tao_elem) { return TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract ( _tao_any, CORBA::WrongTransaction::_tao_any_destructor, CORBA::_tc_WrongTransaction, - _tao_elem - ); + _tao_elem); } #ifdef ACE_ANY_OPS_USE_NAMESPACE diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 69d88d32aba..aa6b2f97266 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -89,8 +89,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -306,8 +305,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n"))); throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_MAYBE); } @@ -636,8 +634,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, { TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n") - )); + ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n"))); throw ::CORBA::MARSHAL (); } @@ -820,8 +817,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) TAOLIB_DEBUG (( LM_DEBUG, - ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n") - )); + ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n"))); throw ::CORBA::MARSHAL (); } diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index 49c04124aea..5abf7c56b6e 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -7,7 +7,6 @@ #include "tao/Array_VarOut_T.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T, typename T_slice, typename TAG> diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index b2be7077f10..797943fbe41 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -4,8 +4,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (void) - : ptr_ (0) +TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T () + : ptr_ (nullptr) {} template<typename T, typename T_slice, typename TAG> @@ -17,15 +17,14 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T (T_slice * p) template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Var_Base_T<T,T_slice,TAG>::TAO_Array_Var_Base_T ( - const TAO_Array_Var_Base_T & p - ) + const TAO_Array_Var_Base_T & p) { this->ptr_ = TAO::Array_Traits<FORANY>::dup (p.in ()); } template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T (void) +TAO_Array_Var_Base_T<T,T_slice,TAG>::~TAO_Array_Var_Base_T () { TAO::Array_Traits<FORANY>::free (this->ptr_); } @@ -56,17 +55,15 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) template<typename T, typename T_slice, typename TAG> ACE_INLINE const T_slice * -TAO_Array_Var_Base_T<T,T_slice,TAG>::in (void) const +TAO_Array_Var_Base_T<T,T_slice,TAG>::in () const { - // @todo Replace with C++ cast after vc6 has been dropped, - // vc6 can't handle this as const cast - return (const T_slice *) this->ptr_; + return const_cast<const T_slice *>(this->ptr_); } template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Var_Base_T<T,T_slice,TAG>::inout (void) +TAO_Array_Var_Base_T<T,T_slice,TAG>::inout () { return this->ptr_; } @@ -74,27 +71,27 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::inout (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice *& -TAO_Array_Var_Base_T<T,T_slice,TAG>::_retn_arg (void) +TAO_Array_Var_Base_T<T,T_slice,TAG>::_retn_arg () { TAO::Array_Traits<FORANY>::free (this->ptr_); - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Var_Base_T<T,T_slice,TAG>::_retn (void) +TAO_Array_Var_Base_T<T,T_slice,TAG>::_retn () { T_slice * tmp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return tmp; } template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Var_Base_T<T,T_slice,TAG>::ptr (void) const +TAO_Array_Var_Base_T<T,T_slice,TAG>::ptr () const { return this->ptr_; } @@ -103,7 +100,7 @@ TAO_Array_Var_Base_T<T,T_slice,TAG>::ptr (void) const template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T (void) +TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T () {} template<typename T, typename T_slice, typename TAG> @@ -115,8 +112,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T (T_slice * p) template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T ( - const TAO_FixedArray_Var_T & p - ) + const TAO_FixedArray_Var_T & p) : TAO_Array_Var_Base_T<T,T_slice,TAG> (p) {} @@ -124,7 +120,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::TAO_FixedArray_Var_T ( template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_FixedArray_Var_T<T,T_slice,TAG>::out (void) +TAO_FixedArray_Var_T<T,T_slice,TAG>::out () { return this->ptr_; } @@ -133,7 +129,7 @@ TAO_FixedArray_Var_T<T,T_slice,TAG>::out (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T (void) +TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T () {} template<typename T, typename T_slice, typename TAG> @@ -145,8 +141,7 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T (T_slice * p) template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_VarArray_Var_T<T,T_slice,TAG>::TAO_VarArray_Var_T ( - const TAO_VarArray_Var_T & p - ) + const TAO_VarArray_Var_T & p) : TAO_Array_Var_Base_T<T,T_slice,TAG> (p) {} @@ -160,10 +155,10 @@ TAO_VarArray_Var_T<T,T_slice,TAG>::operator T_slice *& () template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice *& -TAO_VarArray_Var_T<T,T_slice,TAG>::out (void) +TAO_VarArray_Var_T<T,T_slice,TAG>::out () { TAO::Array_Traits<FORANY>::free (this->ptr_); - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } @@ -174,7 +169,7 @@ ACE_INLINE TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_slice *& p) : ptr_ (p) { - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T, typename T_var, typename T_slice, typename TAG> @@ -183,7 +178,7 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::TAO_Array_Out_T (T_var & p) : ptr_ (p.out ()) { TAO::Array_Traits<FORANY>::free (this->ptr_); - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T, typename T_var, typename T_slice, typename TAG> @@ -230,7 +225,7 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::operator[] (CORBA::ULong index) template<typename T, typename T_var, typename T_slice, typename TAG> ACE_INLINE T_slice *& -TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr (void) +TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr () { return this->ptr_; } @@ -239,8 +234,8 @@ TAO_Array_Out_T<T,T_var,T_slice,TAG>::ptr (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void) - : ptr_ (0), +TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T () + : ptr_ (nullptr), nocopy_ (false) {} @@ -264,7 +259,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T ( template<typename T, typename T_slice, typename TAG> ACE_INLINE -TAO_Array_Forany_T<T,T_slice,TAG>::~TAO_Array_Forany_T (void) +TAO_Array_Forany_T<T,T_slice,TAG>::~TAO_Array_Forany_T () { } @@ -281,8 +276,7 @@ template<typename T, typename T_slice, typename TAG> ACE_INLINE TAO_Array_Forany_T<T,T_slice,TAG> & TAO_Array_Forany_T<T,T_slice,TAG>::operator= ( - const TAO_Array_Forany_T<T,T_slice,TAG> & p - ) + const TAO_Array_Forany_T<T,T_slice,TAG> & p) { this->ptr_ = p.ptr_; this->nocopy_ = p.nocopy_; @@ -323,7 +317,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::operator[] (CORBA::ULong index) template<typename T, typename T_slice, typename TAG> ACE_INLINE const T_slice * -TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const +TAO_Array_Forany_T<T,T_slice,TAG>::in () const { return this->ptr_; } @@ -331,7 +325,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Forany_T<T,T_slice,TAG>::inout (void) +TAO_Array_Forany_T<T,T_slice,TAG>::inout () { return this->ptr_; } @@ -339,7 +333,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::inout (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice *& -TAO_Array_Forany_T<T,T_slice,TAG>::out (void) +TAO_Array_Forany_T<T,T_slice,TAG>::out () { return this->ptr_; } @@ -347,7 +341,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::out (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Forany_T<T,T_slice,TAG>::_retn (void) +TAO_Array_Forany_T<T,T_slice,TAG>::_retn () { return this->ptr_; } @@ -355,7 +349,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_retn (void) template<typename T, typename T_slice, typename TAG> ACE_INLINE CORBA::Boolean -TAO_Array_Forany_T<T,T_slice,TAG>::nocopy (void) const +TAO_Array_Forany_T<T,T_slice,TAG>::nocopy () const { return this->nocopy_; } @@ -363,7 +357,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::nocopy (void) const template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Forany_T<T,T_slice,TAG>::ptr (void) const +TAO_Array_Forany_T<T,T_slice,TAG>::ptr () const { return this->ptr_; } @@ -371,7 +365,7 @@ TAO_Array_Forany_T<T,T_slice,TAG>::ptr (void) const template<typename T, typename T_slice, typename TAG> ACE_INLINE T_slice * -TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc (void) +TAO_Array_Forany_T<T,T_slice,TAG>::tao_alloc () { return TAO::Array_Traits<FORANY>::alloc (); } diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index 391f89752a2..8d57acb6148 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -149,8 +149,7 @@ TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::interceptor_value ( typedef typename S_var::s_traits::from_type from_type; Insert_Policy<from_type>::any_insert ( any, - from_type (this->x_, BOUND) - ); + from_type (this->x_, BOUND)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 11071b6b018..6937d5b4df8 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -40,7 +40,7 @@ class TAO_CORBANAME_Parser : public TAO_IOR_Parser { public: /// The destructor - virtual ~TAO_CORBANAME_Parser (void); + virtual ~TAO_CORBANAME_Parser (); // = The IOR_Parser methods, please read the documentation in // IOR_Parser.h diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h index 82fc51f94e2..c7030701405 100644 --- a/TAO/tao/CORBA_methods.h +++ b/TAO/tao/CORBA_methods.h @@ -53,7 +53,7 @@ namespace CORBA template<typename T> inline void release (T x) { - if (x != 0) + if (x) { x->_decr_refcount (); } diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index 0970e3a39cd..0d7e481202f 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -58,8 +58,8 @@ protected: void cleanup (ACE_Array_Base<void *> &ts_objects); private: - ACE_UNIMPLEMENTED_FUNC (TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Cleanup_Func_Registry &operator= (const TAO_Cleanup_Func_Registry &)) + TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &) = delete; + TAO_Cleanup_Func_Registry &operator= (const TAO_Cleanup_Func_Registry &) = delete; /// Array of registered cleanup functions. The number of /// registered cleanup functions should be the same as the number diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h index 95481ddaeab..7204ce20366 100644 --- a/TAO/tao/Compression/Compressor_Factory.h +++ b/TAO/tao/Compression/Compressor_Factory.h @@ -41,11 +41,8 @@ namespace TAO private: ::Compression::CompressorId const compressor_id_; -#if defined (ACE_WIN32_VC14) - // Workaround for connect issue 1577211 - ACE_UNIMPLEMENTED_FUNC (CompressorFactory (const CompressorFactory &)) - ACE_UNIMPLEMENTED_FUNC (CompressorFactory &operator = (const CompressorFactory &)) -#endif + CompressorFactory (const CompressorFactory &) = delete; + CompressorFactory &operator = (const CompressorFactory &) = delete; }; } diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h index 5274e54eb49..1cdd468357b 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.h @@ -40,8 +40,8 @@ namespace TAO ::Compression::CompressionLevel compression_level); private: - ACE_UNIMPLEMENTED_FUNC (Zlib_CompressorFactory (const Zlib_CompressorFactory &)) - ACE_UNIMPLEMENTED_FUNC (Zlib_CompressorFactory &operator= (const Zlib_CompressorFactory &)) + Zlib_CompressorFactory (const Zlib_CompressorFactory &) = delete; + Zlib_CompressorFactory &operator= (const Zlib_CompressorFactory &) = delete; // Ensure we can lock with imutability (i.e. const) mutable TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index 0197963070c..04fe4aa0fa4 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -7,15 +7,13 @@ # include "tao/Condition.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) - : mutex_ (&m), delete_lock_ (false), - cond_ (0) + cond_ (nullptr) { // @todo: Need to add the allocatore here.. ACE_NEW (this->cond_, @@ -24,13 +22,12 @@ TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m) template <class MUTEX> TAO_Condition<MUTEX>::TAO_Condition (void) - : mutex_ (0), + : mutex_ (nullptr), delete_lock_ (false), - cond_ (0) + cond_ (nullptr) { // @todo: Need to add the allocatore here.. - ACE_NEW (this->mutex_, MUTEX); diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 0b8c59e41b5..f89649345d6 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -41,7 +41,6 @@ template <class MUTEX> class TAO_Condition { public: - /// Useful typedef typedef MUTEX LOCK; @@ -92,8 +91,8 @@ public: MUTEX *mutex (); private: - ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Condition &operator= (const TAO_Condition<MUTEX> &)) + TAO_Condition (const TAO_Condition<MUTEX> &) = delete; + TAO_Condition &operator= (const TAO_Condition<MUTEX> &) = delete; /// Reference to mutex lock. MUTEX *mutex_; diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp index 5f5496f9756..903cb869b87 100644 --- a/TAO/tao/Connect_Strategy.cpp +++ b/TAO/tao/Connect_Strategy.cpp @@ -11,11 +11,6 @@ TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core) { } - -TAO_Connect_Strategy::~TAO_Connect_Strategy () -{ -} - int TAO_Connect_Strategy::wait (TAO_Connection_Handler *ch, ACE_Time_Value *max_wait_time) diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h index 763662e4996..214aec39df5 100644 --- a/TAO/tao/Connect_Strategy.h +++ b/TAO/tao/Connect_Strategy.h @@ -53,12 +53,11 @@ class TAO_LF_Event; class TAO_Export TAO_Connect_Strategy { public: - /// Constructor TAO_Connect_Strategy (TAO_ORB_Core *orb); /// Destructor - virtual ~TAO_Connect_Strategy (void); + virtual ~TAO_Connect_Strategy () = default; /// Obtain the synch options that can be passed to ACE_Connector /** @@ -94,7 +93,6 @@ protected: /// Cached copy of the ORB core pointer TAO_ORB_Core * const orb_core_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 6e7c768030a..4a309a7ec19 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -180,8 +180,8 @@ protected: //@} private: - ACE_UNIMPLEMENTED_FUNC (TAO_Connection_Handler (const TAO_Connection_Handler &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Connection_Handler &operator= (const TAO_Connection_Handler &)) + TAO_Connection_Handler (const TAO_Connection_Handler &) = delete; + TAO_Connection_Handler &operator= (const TAO_Connection_Handler &) = delete; /// Pointer to the TAO_ORB_Core TAO_ORB_Core * const orb_core_; diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h index 6a644e300f8..19bd5ea2e1e 100644 --- a/TAO/tao/Connector_Registry.h +++ b/TAO/tao/Connector_Registry.h @@ -51,10 +51,10 @@ class TAO_Export TAO_Connector_Registry { public: /// Default constructor. - TAO_Connector_Registry (void); + TAO_Connector_Registry (); /// Default destructor. - ~TAO_Connector_Registry (void); + ~TAO_Connector_Registry (); /// Return the connector bridges TAO_Connector *get_connector (CORBA::ULong tag) const; @@ -63,7 +63,7 @@ public: int open (TAO_ORB_Core *orb_core); /// Close all open connectors. - int close_all (void); + int close_all (); /// Parse a string containing a URL style IOR and return an /// MProfile. @@ -77,8 +77,8 @@ public: char object_key_delimiter (const char *ior); // = Iterator. - TAO_ConnectorSetIterator begin (void) const; - TAO_ConnectorSetIterator end (void) const; + TAO_ConnectorSetIterator begin () const; + TAO_ConnectorSetIterator end () const; private: TAO_Connector_Registry (const TAO_Connector_Registry&) = delete; diff --git a/TAO/tao/Connector_Registry.inl b/TAO/tao/Connector_Registry.inl index c9c50934295..5a954f00710 100644 --- a/TAO/tao/Connector_Registry.inl +++ b/TAO/tao/Connector_Registry.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ConnectorSetIterator -TAO_Connector_Registry::begin (void) const +TAO_Connector_Registry::begin () const { return this->connectors_; } ACE_INLINE TAO_ConnectorSetIterator -TAO_Connector_Registry::end (void) const +TAO_Connector_Registry::end () const { return this->connectors_ + this->size_; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index 52bf4e2517a..04e5211f63f 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -120,8 +120,7 @@ TAO_AMH_DSI_Exception_Holder_var::operator= ( return *this; } -TAO_AMH_DSI_Exception_Holder_var::operator const TAO_AMH_DSI_Exception_Holder* ( - ) const // cast +TAO_AMH_DSI_Exception_Holder_var::operator const TAO_AMH_DSI_Exception_Holder* () const // cast { return this->ptr_; } @@ -275,8 +274,7 @@ TAO_AMH_DSI_Exception_Holder::_tao_unmarshal ( base, TAO_AMH_DSI_Exception_Holder::_tao_obv_static_repository_id (), is_null_object, - is_indirected - ); + is_indirected); ::CORBA::ValueBase_var owner (base); @@ -308,9 +306,9 @@ TAO_AMH_DSI_Exception_Holder::raise_invoke () // The pseudo-object _nil method. TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler::_nil (void) +TAO_AMH_DSI_Response_Handler::_nil () { - return (TAO_AMH_DSI_Response_Handler_ptr) 0; + return nullptr; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h index e5960f6dbcb..70abfe5ad7c 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.h @@ -244,13 +244,13 @@ public: /// CORBA Object related methods static TAO_AMH_DSI_Response_Handler* _duplicate ( TAO_AMH_DSI_Response_Handler_ptr); - static TAO_AMH_DSI_Response_Handler* _nil (void); + static TAO_AMH_DSI_Response_Handler* _nil (); static TAO_AMH_DSI_Response_Handler* _narrow (CORBA::Object_ptr); static TAO_AMH_DSI_Response_Handler* _unchecked_narrow (CORBA::Object_ptr); 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/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp index 92f4a4a6161..1ecc267b2de 100644 --- a/TAO/tao/DynamicInterface/Context.cpp +++ b/TAO/tao/DynamicInterface/Context.cpp @@ -10,23 +10,23 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::Context::Context (void) +CORBA::Context::Context () : refcount_ (1) { } -CORBA::Context::~Context (void) +CORBA::Context::~Context () { } CORBA::ULong -CORBA::Context::_incr_refcount (void) +CORBA::Context::_incr_refcount () { return ++refcount_; } CORBA::ULong -CORBA::Context::_decr_refcount (void) +CORBA::Context::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -141,14 +141,14 @@ CORBA::ContextList::remove (CORBA::ULong) } CORBA::ContextList_ptr -CORBA::ContextList::_duplicate (void) +CORBA::ContextList::_duplicate () { ++this->refcount_; return this; } void -CORBA::ContextList::_destroy (void) +CORBA::ContextList::_destroy () { CORBA::ULong const current = --this->refcount_; @@ -159,13 +159,13 @@ CORBA::ContextList::_destroy (void) } void -CORBA::ContextList::_incr_refcount (void) +CORBA::ContextList::_incr_refcount () { ++this->refcount_; } void -CORBA::ContextList::_decr_refcount (void) +CORBA::ContextList::_decr_refcount () { --this->refcount_; diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index dd9eb9cfc5a..39230031607 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -75,18 +75,18 @@ namespace CORBA // = Pseudo-object methods static Context *_duplicate (Context*); - static Context *_nil (void); + static Context *_nil (); // = Reference counting. - CORBA::ULong _incr_refcount (void); - CORBA::ULong _decr_refcount (void); + CORBA::ULong _incr_refcount (); + CORBA::ULong _decr_refcount (); // = All the spec-required functions below will just throw a // CORBA::NO_IMPLEMENT exception and do nothing else. - const char *context_name (void) const; + const char *context_name () const; - CORBA::Context_ptr parent (void) const; + CORBA::Context_ptr parent () const; void create_child (const char *child_ctx_name, CORBA::Context_out child_ctx); @@ -160,8 +160,8 @@ namespace CORBA void remove (CORBA::ULong slot); /// Increment and decrement ref counts. - void _incr_refcount (void); - void _decr_refcount (void); + void _incr_refcount (); + void _decr_refcount (); // Useful for template programming. typedef CORBA::ContextList_ptr _ptr_type; diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl index d7e2b0a99a3..adc82cb7a4f 100644 --- a/TAO/tao/DynamicInterface/Context.inl +++ b/TAO/tao/DynamicInterface/Context.inl @@ -5,7 +5,7 @@ ACE_INLINE CORBA::Context_ptr CORBA::Context::_duplicate (CORBA::Context_ptr x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -15,9 +15,9 @@ CORBA::Context::_duplicate (CORBA::Context_ptr x) ACE_INLINE CORBA::Context_ptr -CORBA::Context::_nil (void) +CORBA::Context::_nil () { - return (CORBA::Context_ptr)0; + return nullptr; } // ************************************************************* @@ -25,29 +25,29 @@ CORBA::Context::_nil (void) // ************************************************************* ACE_INLINE -CORBA::ContextList::ContextList (void) +CORBA::ContextList::ContextList () { } ACE_INLINE CORBA::ULong -CORBA::ContextList::count (void) +CORBA::ContextList::count () { return (CORBA::ULong) this->ctx_list_.size (); } ACE_INLINE CORBA::ContextList_ptr -CORBA::ContextList::_nil (void) +CORBA::ContextList::_nil () { - return (CORBA::ContextList_ptr)0; + return nullptr; } ACE_INLINE CORBA::ContextList_ptr CORBA::ContextList::_duplicate (CORBA::ContextList_ptr x) { - if (x != 0) + if (x) { x->_incr_refcount (); } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp index 364dbad4979..1bfa74fede8 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp @@ -16,9 +16,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // The pseudo-object _nil method. TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler::_nil (void) +TAO_DII_Reply_Handler::_nil () { - return static_cast<TAO_DII_Reply_Handler_ptr> (0); + return nullptr; } // DII Request class implementation @@ -27,7 +27,7 @@ TAO_DII_Reply_Handler::TAO_DII_Reply_Handler () { } -TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler (void) +TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler () { } diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h index eeb88e369dd..802bddd0b3b 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h @@ -89,7 +89,7 @@ public: /// CORBA Object related methods static TAO_DII_Reply_Handler* _duplicate (TAO_DII_Reply_Handler_ptr); - static TAO_DII_Reply_Handler* _nil (void); + static TAO_DII_Reply_Handler* _nil (); static TAO_DII_Reply_Handler* _narrow (CORBA::Object_ptr); static TAO_DII_Reply_Handler* _unchecked_narrow (CORBA::Object_ptr); @@ -98,11 +98,8 @@ public: typedef TAO_DII_Reply_Handler_ptr _ptr_type; typedef TAO_DII_Reply_Handler_var _var_type; -#if defined (ACE_WIN32_VC14) - // Workaround for connect issue 1577211 - ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler (const TAO_DII_Reply_Handler &)) - ACE_UNIMPLEMENTED_FUNC (TAO_DII_Reply_Handler &operator = (const TAO_DII_Reply_Handler &)) -#endif + TAO_DII_Reply_Handler (const TAO_DII_Reply_Handler &) = delete; + TAO_DII_Reply_Handler &operator = (const TAO_DII_Reply_Handler &) = delete; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index a63b6f5264e..dace7b4b5f4 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -89,7 +89,7 @@ TAO_Dynamic_Adapter_Impl::request_is_nil (CORBA::Request_ptr req) void TAO_Dynamic_Adapter_Impl::request_release (CORBA::Request_ptr req) { - if (req != 0) + if (req) { req->_decr_refcount (); } @@ -104,7 +104,7 @@ TAO_Dynamic_Adapter_Impl::server_request_is_nil (CORBA::ServerRequest_ptr req) void TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req) { - if (req != 0) + if (req) { req->_decr_refcount (); } diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp index 40a06e0ded3..82f57f73181 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.cpp +++ b/TAO/tao/DynamicInterface/ExceptionList.cpp @@ -67,26 +67,26 @@ CORBA::ExceptionList::remove (CORBA::ULong) } CORBA::ExceptionList_ptr -CORBA::ExceptionList::_duplicate (void) +CORBA::ExceptionList::_duplicate () { this->_incr_refcount (); return this; } void -CORBA::ExceptionList::_destroy (void) +CORBA::ExceptionList::_destroy () { this->_decr_refcount (); } void -CORBA::ExceptionList::_incr_refcount (void) +CORBA::ExceptionList::_incr_refcount () { ++this->refcount_; } void -CORBA::ExceptionList::_decr_refcount (void) +CORBA::ExceptionList::_decr_refcount () { CORBA::ULong const refcount = --this->refcount_; diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index a59a7b059eb..8e38a929adf 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -73,7 +73,7 @@ namespace CORBA void _destroy (void); - static ExceptionList_ptr _nil (void); + static ExceptionList_ptr _nil (); /// Add a TypeCode to the list. void add (CORBA::TypeCode_ptr tc); @@ -88,8 +88,8 @@ namespace CORBA void remove (CORBA::ULong slot); /// Increment and decrement ref counts. - void _incr_refcount (void); - void _decr_refcount (void); + void _incr_refcount (); + void _decr_refcount (); /// Useful for template programming. typedef CORBA::ExceptionList_ptr _ptr_type; diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl index 4178f77d903..d175462de12 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.inl +++ b/TAO/tao/DynamicInterface/ExceptionList.inl @@ -2,30 +2,30 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::ExceptionList::ExceptionList (void) +CORBA::ExceptionList::ExceptionList () : refcount_ (1) { } ACE_INLINE CORBA::ULong -CORBA::ExceptionList::count (void) +CORBA::ExceptionList::count () { return (CORBA::ULong) this->tc_list_.size (); } ACE_INLINE CORBA::ExceptionList_ptr -CORBA::ExceptionList::_nil (void) +CORBA::ExceptionList::_nil () { - return static_cast<CORBA::ExceptionList_ptr>(0); + return nullptr; } ACE_INLINE CORBA::ExceptionList_ptr CORBA::ExceptionList::_duplicate (CORBA::ExceptionList_ptr x) { - if (x != 0) + if (x) { x->_incr_refcount (); } diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index b2fc6791b79..1dcca1819aa 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -26,13 +26,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object. CORBA::ULong -CORBA::Request::_incr_refcount (void) +CORBA::Request::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::Request::_decr_refcount (void) +CORBA::Request::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h index 19054aa74c2..b2431504fbf 100644 --- a/TAO/tao/DynamicInterface/Request.h +++ b/TAO/tao/DynamicInterface/Request.h @@ -99,11 +99,11 @@ namespace CORBA * <<=. */ //@{ - CORBA::Any &add_in_arg (void); + CORBA::Any &add_in_arg (); CORBA::Any &add_in_arg (const char* name); - CORBA::Any &add_inout_arg (void); + CORBA::Any &add_inout_arg (); CORBA::Any &add_inout_arg (const char* name); - CORBA::Any &add_out_arg (void); + CORBA::Any &add_out_arg (); CORBA::Any &add_out_arg (const char* name); //@} @@ -111,7 +111,7 @@ namespace CORBA void set_return_type (CORBA::TypeCode_ptr tc); /// Returns reference to Any for extraction using >>=. - CORBA::Any &return_value (void); + CORBA::Any &return_value (); /// Perform method resolution and invoke an appropriate method. /** @@ -125,7 +125,7 @@ namespace CORBA * recommended as the user may not be able to propagate the * exceptions. */ - void invoke (void); + void invoke (); /// Send a oneway request. /** @@ -133,7 +133,7 @@ namespace CORBA * recommended as the user may not be able to propagate the * exceptions. */ - void send_oneway (void); + void send_oneway (); /** * @name The 'deferred synchronous' methods. @@ -141,8 +141,8 @@ namespace CORBA * The 'deferred synchronous' methods. */ //@{ - void send_deferred (void); - void get_response (void); + void send_deferred (); + void get_response (); CORBA::Boolean poll_response (void); //@} @@ -162,17 +162,17 @@ namespace CORBA /// Pseudo object methods. static CORBA::Request* _duplicate (CORBA::Request*); - static CORBA::Request* _nil (void); + static CORBA::Request* _nil (); // = Reference counting. - CORBA::ULong _incr_refcount (void); - CORBA::ULong _decr_refcount (void); + CORBA::ULong _incr_refcount (); + CORBA::ULong _decr_refcount (); /// Set the lazy evaluation flag. void _tao_lazy_evaluation (bool lazy_evaluation); /// Get the byte order member. - int _tao_byte_order (void) const; + int _tao_byte_order () const; /// Set the byte order member. void _tao_byte_order (int byte_order); diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 69bf66a866d..ea1b7f79204 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Request_ptr CORBA::Request::_duplicate (CORBA::Request_ptr x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -13,20 +13,20 @@ CORBA::Request::_duplicate (CORBA::Request_ptr x) } ACE_INLINE CORBA::Request_ptr -CORBA::Request::_nil (void) +CORBA::Request::_nil () { - return 0; + return nullptr; } ACE_INLINE CORBA::Object_ptr -CORBA::Request::target (void) const +CORBA::Request::target () const { return this->target_; } // Return the operation name for the request. ACE_INLINE const CORBA::Char * -CORBA::Request::operation (void) const +CORBA::Request::operation () const { return this->opname_; } diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 6c4fcd680da..c485c43d3a1 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -20,13 +20,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DSI ServerRequest object. CORBA::ULong -CORBA::ServerRequest::_incr_refcount (void) +CORBA::ServerRequest::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::ServerRequest::_decr_refcount (void) +CORBA::ServerRequest::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index 8532a92c237..47660cea05f 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -102,11 +102,11 @@ namespace CORBA // Pseudo object methods. static ServerRequest_ptr _duplicate (ServerRequest_ptr); - static ServerRequest_ptr _nil (void); + static ServerRequest_ptr _nil (); // = Reference counting. - CORBA::ULong _incr_refcount (void); - CORBA::ULong _decr_refcount (void); + CORBA::ULong _incr_refcount (); + CORBA::ULong _decr_refcount (); /// Set the lazy evaluation flag. void _tao_lazy_evaluation (bool lazy_evaluation); diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 460d34c9af0..73b9112cd31 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -13,13 +13,13 @@ CORBA::ServerRequest::_duplicate (CORBA::ServerRequest_ptr x) } ACE_INLINE CORBA::ServerRequest_ptr -CORBA::ServerRequest::_nil (void) +CORBA::ServerRequest::_nil () { - return static_cast <CORBA::ServerRequest_ptr>(0); + return nullptr; } ACE_INLINE CORBA::Context_ptr -CORBA::ServerRequest::ctx (void) const +CORBA::ServerRequest::ctx () const { return this->ctx_; } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index b1d38216ad1..46d984c0dad 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -69,12 +69,11 @@ CORBA::UnknownUserException::_raise (void) const CORBA::Exception * CORBA::UnknownUserException::_tao_duplicate (void) const { - CORBA::Exception *result; + CORBA::Exception *result = nullptr; ACE_NEW_RETURN ( result, CORBA::UnknownUserException (*this), - 0 - ); + nullptr); return result; } diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp index de998940338..e7f579dd868 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp +++ b/TAO/tao/EndpointPolicy/EndpointPolicy_ORBInitializer.cpp @@ -15,8 +15,7 @@ TAO_EndpointPolicy_ORBInitializer::pre_init ( void TAO_EndpointPolicy_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ) + PortableInterceptor::ORBInitInfo_ptr info) { this->register_policy_factories (info); } diff --git a/TAO/tao/Environment.inl b/TAO/tao/Environment.inl index 26ef68d5aa7..ceae921a132 100644 --- a/TAO/tao/Environment.inl +++ b/TAO/tao/Environment.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Exception * -CORBA::Environment::exception (void) const +CORBA::Environment::exception () const { return this->exception_; } @@ -14,23 +14,23 @@ ACE_INLINE CORBA::Environment * CORBA::Environment::_duplicate (CORBA::Environment *x) { - if (x == 0) + if (!x) { - return 0; + return nullptr; } - CORBA::Environment* ptr = 0; + CORBA::Environment* ptr = nullptr; ACE_NEW_RETURN (ptr, CORBA::Environment (*x), - 0); + nullptr); return ptr; } ACE_INLINE CORBA::Environment_ptr -CORBA::Environment::_nil (void) +CORBA::Environment::_nil () { - return static_cast <CORBA::Environment_ptr> (0); + return nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl index c7d0b3fee63..b03869b5f53 100644 --- a/TAO/tao/IFR_Client/IFR_Base.pidl +++ b/TAO/tao/IFR_Client/IFR_Base.pidl @@ -101,8 +101,7 @@ module CORBA void move ( in Container new_container, in Identifier new_name, - in VersionSpec new_version - ); + in VersionSpec new_version); }; interface ModuleDef; @@ -199,18 +198,15 @@ module CORBA { // read interface Contained lookup ( - in ScopedName search_name - ); + in ScopedName search_name); ContainedSeq contents ( in DefinitionKind limit_type, - in boolean exclude_inherited - ); + in boolean exclude_inherited); ContainedSeq lookup_name ( in Identifier search_name, in long levels_to_search, in DefinitionKind limit_type, - in boolean exclude_inherited - ); + in boolean exclude_inherited); struct Description { Contained contained_object; @@ -231,52 +227,45 @@ module CORBA ModuleDef create_module ( in RepositoryId id, in Identifier name, - in VersionSpec version - ); + in VersionSpec version); ConstantDef create_constant ( in RepositoryId id, in Identifier name, in VersionSpec version, in IDLType type, - in any value - ); + in any value); StructDef create_struct ( in RepositoryId id, in Identifier name, in VersionSpec version, - in StructMemberSeq members - ); + in StructMemberSeq members); UnionDef create_union ( in RepositoryId id, in Identifier name, in VersionSpec version, in IDLType discriminator_type, - in UnionMemberSeq members - ); + in UnionMemberSeq members); EnumDef create_enum ( in RepositoryId id, in Identifier name, in VersionSpec version, - in EnumMemberSeq members - ); + in EnumMemberSeq members); AliasDef create_alias ( in RepositoryId id, in Identifier name, in VersionSpec version, - in IDLType original_type - ); + in IDLType original_type); InterfaceDef create_interface ( in RepositoryId id, in Identifier name, in VersionSpec version, - in InterfaceDefSeq base_interfaces - ); + in InterfaceDefSeq base_interfaces); ValueDef create_value ( in RepositoryId id, @@ -288,42 +277,36 @@ module CORBA in boolean is_truncatable, in ValueDefSeq abstract_base_values, in InterfaceDefSeq supported_interfaces, - in InitializerSeq initializers - ); + in InitializerSeq initializers); ValueBoxDef create_value_box( in RepositoryId id, in Identifier name, in VersionSpec version, - in IDLType original_type_def - ); + in IDLType original_type_def); ExceptionDef create_exception( in RepositoryId id, in Identifier name, in VersionSpec version, - in StructMemberSeq members - ); + in StructMemberSeq members); NativeDef create_native( in RepositoryId id, in Identifier name, - in VersionSpec version - ); + in VersionSpec version); AbstractInterfaceDef create_abstract_interface ( in RepositoryId id, in Identifier name, in VersionSpec version, - in AbstractInterfaceDefSeq base_interfaces - ); + in AbstractInterfaceDefSeq base_interfaces); LocalInterfaceDef create_local_interface ( in RepositoryId id, in Identifier name, in VersionSpec version, - in InterfaceDefSeq base_interfaces - ); + in InterfaceDefSeq base_interfaces); ExtValueDef create_ext_value ( in RepositoryId id, in Identifier name, diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 28ea80707e8..166cdb505a9 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -443,8 +443,8 @@ namespace TAO_IIOP private: TAO_Transport** tlist_; private: - ACE_UNIMPLEMENTED_FUNC (void operator= (const TList_Holder &)) - ACE_UNIMPLEMENTED_FUNC (TList_Holder (const TList_Holder &)) + void operator= (const TList_Holder &) = delete; + TList_Holder (const TList_Holder &) = delete; }; } diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h index 09837c238a2..be602fb44f6 100644 --- a/TAO/tao/IORTable/IOR_Table_Impl.h +++ b/TAO/tao/IORTable/IOR_Table_Impl.h @@ -43,16 +43,15 @@ class TAO_IORTable_Export TAO_IOR_Table_Impl public virtual ::CORBA::LocalObject { public: - static TAO_IOR_Table_Impl_ptr - _nil (void) + static TAO_IOR_Table_Impl_ptr _nil () { - return static_cast<TAO_IOR_Table_Impl_ptr> (0); + return nullptr; } /// Constructor - TAO_IOR_Table_Impl (void); + TAO_IOR_Table_Impl (); - virtual bool async_available (void) { return false; } + virtual bool async_available () { return false; } /// Find the object, using the locator if it is not on the table. char *find (const char *object_key); diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp index db75e4ff159..74dc4170f9f 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp +++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp @@ -25,12 +25,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // The pseudo-object _nil method. TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler::_nil (void) +TAO_AMH_Locate_ResponseHandler::_nil () { - return (TAO_AMH_Locate_ResponseHandler_ptr) 0; + return nullptr; } - TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler ( TAO_ServerRequest & sr) : TAO_AMH_Response_Handler (), diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h index 81d4ce29cf5..788c66983b0 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.h +++ b/TAO/tao/IORTable/Locate_ResponseHandler.h @@ -114,13 +114,13 @@ public: /// CORBA Object related methods static TAO_AMH_Locate_ResponseHandler* _duplicate ( TAO_AMH_Locate_ResponseHandler_ptr); - static TAO_AMH_Locate_ResponseHandler* _nil (void); + static TAO_AMH_Locate_ResponseHandler* _nil (); static TAO_AMH_Locate_ResponseHandler* _narrow (CORBA::Object_ptr); static TAO_AMH_Locate_ResponseHandler* _unchecked_narrow (CORBA::Object_ptr); 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/LocalObject.h b/TAO/tao/LocalObject.h index bd6732bd654..a8a8d72c103 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -159,14 +159,8 @@ namespace CORBA LocalObject (); private: - /** - * @name Unimplemented methods - */ - //@{ - ACE_UNIMPLEMENTED_FUNC (LocalObject (const LocalObject &)) - ACE_UNIMPLEMENTED_FUNC (LocalObject & operator = (const LocalObject &)) - //@} - + LocalObject (const LocalObject &) = delete; + LocalObject & operator = (const LocalObject &) = delete; }; } // End CORBA namespace diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl index 37bfee340de..7d2715b166e 100644 --- a/TAO/tao/LocalObject.inl +++ b/TAO/tao/LocalObject.inl @@ -15,9 +15,9 @@ CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj) ACE_INLINE CORBA::LocalObject_ptr -CORBA::LocalObject::_nil (void) +CORBA::LocalObject::_nil () { - return 0; + return nullptr; } ACE_INLINE diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index a7fbfbcbe69..b10938f4c32 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -65,7 +65,6 @@ class TAO_Messaging_Export TAO_AMH_Response_Handler : public virtual ::CORBA::LocalObject { public: - /// Constructor TAO_AMH_Response_Handler (); @@ -117,10 +116,8 @@ protected: GIOP::ReplyStatusType reply_status_; private: - - // Private and undefined, standard C++ idiom to prohibit copying. - TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&); - TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&); + TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&) = delete; + TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&) = delete; /// Pointer to the original message-base TAO_GIOP_Message_Base *mesg_base_; @@ -203,7 +200,6 @@ namespace TAO public: void operator() (TAO_AMH_Response_Handler *arh) throw (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index 1043a54de32..3c1f7d936c7 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -18,29 +18,28 @@ CORBA::ORB::set_timeout (ACE_Time_Value *timeout) } ACE_INLINE unsigned long -CORBA::ORB::_incr_refcount (void) +CORBA::ORB::_incr_refcount () { return ++this->refcount_; } ACE_INLINE unsigned long -CORBA::ORB::_refcount (void) const +CORBA::ORB::_refcount () const { return this->refcount_; } ACE_INLINE unsigned long -CORBA::ORB::_decr_refcount (void) +CORBA::ORB::_decr_refcount () { unsigned long const count = --this->refcount_; - if (count != 0) + if (count == 0) { - return count; + delete this; } - delete this; - return 0; + return count; } ACE_INLINE CORBA::ORB_ptr @@ -57,9 +56,9 @@ CORBA::ORB::_duplicate (CORBA::ORB_ptr obj) // Null pointers represent nil objects. ACE_INLINE CORBA::ORB_ptr -CORBA::ORB::_nil (void) +CORBA::ORB::_nil () { - return 0; + return nullptr; } ACE_INLINE void diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index c7f9752374f..f8d3762ed62 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -342,9 +342,8 @@ namespace CORBA std::atomic<uint32_t> refcount_; private: - // = Unimplemented methods - ACE_UNIMPLEMENTED_FUNC (Object (const Object &)) - ACE_UNIMPLEMENTED_FUNC (Object &operator = (const Object &)) + Object (const Object &) = delete; + Object &operator = (const Object &) = delete; private: /// Specify whether this is a local object or not. diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index d6560cab557..156d2348018 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -44,9 +44,9 @@ CORBA::Object::_duplicate (CORBA::Object_ptr obj) ACE_INLINE CORBA::Object_ptr -CORBA::Object::_nil (void) +CORBA::Object::_nil () { - return 0; + return nullptr; } ACE_INLINE @@ -57,31 +57,31 @@ CORBA::Object::_narrow (CORBA::Object_ptr obj) } ACE_INLINE CORBA::Boolean -CORBA::Object::is_evaluated (void) const +CORBA::Object::is_evaluated () const { return this->is_evaluated_; } ACE_INLINE TAO_ORB_Core * -CORBA::Object::orb_core (void) const +CORBA::Object::orb_core () const { return this->orb_core_; } ACE_INLINE IOP::IOR * -CORBA::Object::steal_ior (void) +CORBA::Object::steal_ior () { return this->ior_._retn (); } ACE_INLINE const IOP::IOR & -CORBA::Object::ior (void) const +CORBA::Object::ior () const { return this->ior_.in (); } ACE_INLINE void -CORBA::Object::_decr_refcount (void) +CORBA::Object::_decr_refcount () { this->_remove_ref (); } diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index 55fa8ddcc0c..cda65442d17 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -116,8 +116,8 @@ namespace TAO int unbind_i (Refcounted_ObjectKey *&key); private: - ACE_UNIMPLEMENTED_FUNC (ObjectKey_Table (const ObjectKey_Table &)) - ACE_UNIMPLEMENTED_FUNC (ObjectKey_Table &operator= (const ObjectKey_Table &)) + ObjectKey_Table (const ObjectKey_Table &) = delete; + ObjectKey_Table &operator= (const ObjectKey_Table &) = delete; /// Some useful typedefs. typedef ACE_RB_Tree<TAO::ObjectKey, diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index aba8e1fb7b8..c33199df6ee 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -258,8 +258,7 @@ TAO_ORBInitInfo::add_server_request_interceptor_with_policy ( void TAO_ORBInitInfo::add_ior_interceptor_with_policy ( PortableInterceptor::IORInterceptor_ptr interceptor, - const CORBA::PolicyList& policies - ) + const CORBA::PolicyList& policies) { this->check_validity (); @@ -297,8 +296,7 @@ TAO_ORBInitInfo::allocate_slot_id () void TAO_ORBInitInfo::register_policy_factory ( CORBA::PolicyType type, - PortableInterceptor::PolicyFactory_ptr policy_factory - ) + PortableInterceptor::PolicyFactory_ptr policy_factory) { this->check_validity (); diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index a8b960f33d4..9f5f800645f 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -204,7 +204,7 @@ public: static TAO_ORBInitInfo_ptr _nil () { - return (TAO_ORBInitInfo_ptr)0; + return nullptr; } //@} diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index bd30f17ad50..e7e9478d11d 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -508,8 +508,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id ( "TAO (%P|%t) - TAO_Unique_Id_Strategy::" "bind_using_user_id: type=%C, id=%C\n", repository_id.in (), - hex_idstr.c_str() - )); + hex_idstr.c_str())); } #endif @@ -534,8 +533,7 @@ TAO_Unique_Id_Strategy::unbind_using_user_id ( TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Unique_Id_Strategy::unbind_using_user_id: id=%C\n", - hex_idstr.c_str() - )); + hex_idstr.c_str())); } if (entry->servant_ != 0) @@ -731,8 +729,7 @@ TAO_Multiple_Id_Strategy::unbind_using_user_id ( TAOLIB_DEBUG ((LM_DEBUG, "TAO (%P|%t) - TAO_Multiple_Id_Strategy::unbind_using_user_id: id=%C\n", - hex_idstr.c_str() - )); + hex_idstr.c_str())); } result = this->active_object_map_->id_hint_strategy_->unbind (*entry); diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index 292af28f3fe..ea69a7d7c71 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -155,8 +155,7 @@ interceptor_value (CORBA::Any *any) const typedef typename S_var::s_traits::from_type from_type; Insert_Policy<from_type>::any_insert ( any, - from_type (this->x_.in (), BOUND) - ); + from_type (this->x_.in (), BOUND)); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index fa862566239..c93cae20dc6 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -233,8 +233,6 @@ _TAO_collocation_Object_Proxy_Broker_Factory_Initializer (size_t) static int _TAO_collocation_Object_Proxy_Broker_Factory_Initializer_Scarecrow = _TAO_collocation_Object_Proxy_Broker_Factory_Initializer ( - reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer - ) - ); + reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer)); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp index 1d6a722f548..f215d512ae1 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp @@ -50,8 +50,7 @@ namespace TAO void IdUniquenessStrategyFactoryImpl::destroy ( - IdUniquenessStrategy *strategy - ) + IdUniquenessStrategy *strategy) { switch (strategy->type ()) { diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 30563653abf..c805fabf79d 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -14,15 +14,13 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_init ( - TAO_Root_POA *poa - ) + TAO_Root_POA *poa) { poa_ = poa; } void - IdUniquenessStrategyUnique::strategy_cleanup ( - ) + IdUniquenessStrategyUnique::strategy_cleanup () { poa_ = 0; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp index 571175c03cf..71383493628 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp @@ -33,8 +33,7 @@ namespace TAO void IdUniquenessStrategyUniqueFactoryImpl::destroy ( - IdUniquenessStrategy *strategy - ) + IdUniquenessStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index c2172cc7cb9..d9035f5bcae 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -44,8 +44,7 @@ namespace TAO void ImplicitActivationStrategyFactoryImpl::destroy ( - ImplicitActivationStrategy * /*strategy*/ - ) + ImplicitActivationStrategy * /*strategy*/) { // Noop because both types are singletons } diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl index 664b6a09c8c..5a931cd93e6 100644 --- a/TAO/tao/PortableServer/POA.pidl +++ b/TAO/tao/PortableServer/POA.pidl @@ -113,16 +113,13 @@ module PortableServer #endif # if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA) ImplicitActivationPolicy create_implicit_activation_policy ( - in ImplicitActivationPolicyValue value - ); + in ImplicitActivationPolicyValue value); ServantRetentionPolicy create_servant_retention_policy ( - in ServantRetentionPolicyValue value - ); + in ServantRetentionPolicyValue value); RequestProcessingPolicy create_request_processing_policy ( - in RequestProcessingPolicyValue value - ); + in RequestProcessingPolicyValue value); # endif // POA attributes diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl index e50901d097f..baacfce238a 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.pidl +++ b/TAO/tao/PortableServer/POAManagerFactory.pidl @@ -35,8 +35,8 @@ module PortableServer POAManager create_POAManager( in string id, - in CORBA::PolicyList policies - ) raises(ManagerAlreadyExists, CORBA::PolicyError); + in CORBA::PolicyList policies) + raises(ManagerAlreadyExists, CORBA::PolicyError); POAManagerSeq list(); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 9660fdfede2..4b3ac88f9c4 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -40,8 +40,7 @@ namespace TAO } void - Cached_Policies::update (TAO_POA_Policy_Set &policy_set - ) + Cached_Policies::update (TAO_POA_Policy_Set &policy_set) { for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++) { @@ -52,8 +51,7 @@ namespace TAO } void - Cached_Policies::update_policy (const CORBA::Policy_ptr policy - ) + Cached_Policies::update_policy (const CORBA::Policy_ptr policy) { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index d95abb8b3ca..e47ea8010a6 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -15,8 +15,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ) + TAO_Object_Adapter *object_adapter) : TAO_Root_POA (name, poa_manager, policies, @@ -24,8 +23,7 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, lock, thread_lock, orb_core, - object_adapter - ), + object_adapter), parent_ (parent) { } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index b8661b7fd00..cd58b8697d9 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -83,8 +83,7 @@ namespace TAO TAO_SERVANT_LOCATION RequestProcessingStrategyDefaultServant::locate_servant ( const PortableServer::ObjectId & system_id, - PortableServer::Servant & servant - ) + PortableServer::Servant & servant) { TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 85cd906d642..2ba133bb309 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -233,8 +233,7 @@ namespace TAO void RequestProcessingStrategyServantActivator::cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ) + const PortableServer::ObjectId &user_id) { // If a servant manager is associated with the POA, // ServantLocator::etherealize will be invoked with the oid and the diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp index 2650c125988..5d5881e9582 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp @@ -39,8 +39,7 @@ namespace TAO void ServantRetentionStrategyNonRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy - ) + ServantRetentionStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp index df444547a4b..ab5b254407c 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp @@ -36,8 +36,7 @@ namespace TAO void ServantRetentionStrategyRetainFactoryImpl::destroy ( - ServantRetentionStrategy *strategy - ) + ServantRetentionStrategy *strategy) { strategy->strategy_cleanup (); diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp index a444714bd23..03673db270e 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp @@ -52,8 +52,7 @@ namespace TAO void ThreadStrategyFactoryImpl::destroy ( - ThreadStrategy *strategy - ) + ThreadStrategy *strategy) { switch (strategy->type ()) { diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 199c000a022..ce95fbe024c 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -68,8 +68,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, typedef typename S_forany::_slice_type slice_type; Insert_Policy<S_forany>::any_insert ( any, - S_forany (const_cast <slice_type *>(this->x_)) - ); + S_forany (const_cast <slice_type *>(this->x_))); } #endif /* TAO_HAS_INTERCEPTORS */ diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 756aac6a9a6..0b7fe0cc9cc 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -61,13 +61,13 @@ namespace CORBA // The pseudo object operations. static Principal * _duplicate (Principal *); - static Principal * _nil (void); + static Principal * _nil (); // = Stuff required for memory management. - unsigned long _incr_refcount (void); - unsigned long _decr_refcount (void); + unsigned long _incr_refcount (); + unsigned long _decr_refcount (); - Principal (void); + Principal (); // Useful for template programming. typedef Principal_ptr _ptr_type; diff --git a/TAO/tao/Principal.inl b/TAO/tao/Principal.inl index 99769b607e9..bf5e3c6993d 100644 --- a/TAO/tao/Principal.inl +++ b/TAO/tao/Principal.inl @@ -3,9 +3,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE unsigned long -CORBA::Principal::_decr_refcount (void) +CORBA::Principal::_decr_refcount () { - unsigned long new_count = --this->refcount_; + unsigned long const new_count = --this->refcount_; if (new_count == 0) delete this; @@ -15,7 +15,7 @@ CORBA::Principal::_decr_refcount (void) ACE_INLINE unsigned long -CORBA::Principal::_incr_refcount (void) +CORBA::Principal::_incr_refcount () { return ++this->refcount_; } @@ -25,7 +25,7 @@ ACE_INLINE CORBA::Principal * CORBA::Principal::_duplicate (CORBA::Principal * x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -36,9 +36,9 @@ CORBA::Principal::_duplicate (CORBA::Principal * x) ACE_INLINE CORBA::Principal * -CORBA::Principal::_nil (void) +CORBA::Principal::_nil () { - return 0; + return nullptr; } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 00b5370e7c6..45de2e87c27 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -905,9 +905,7 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x) && (cdr.orb_core() == nullptr || 1 == cdr.orb_core()-> resource_factory()-> - input_cdr_allocator_type_locked() - ) - ) + input_cdr_allocator_type_locked())) { x.replace (length, cdr.start ()); x.mb ()->wr_ptr (x.mb ()->rd_ptr () + length); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index 397351e07ff..aa311e58224 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -20,8 +20,7 @@ TAO_Network_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj) { return TAO_Network_Priority_Mapping_Manager::_duplicate ( - dynamic_cast<TAO_Network_Priority_Mapping_Manager_ptr> (obj) - ); + dynamic_cast<TAO_Network_Priority_Mapping_Manager_ptr> (obj)); } TAO_Network_Priority_Mapping_Manager_ptr diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index a87243ef23f..be5a8568954 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -62,15 +62,13 @@ public: // the static operations static TAO_Network_Priority_Mapping_Manager_ptr _duplicate ( - TAO_Network_Priority_Mapping_Manager_ptr obj - ); + TAO_Network_Priority_Mapping_Manager_ptr obj); static TAO_Network_Priority_Mapping_Manager_ptr _narrow ( - CORBA::Object_ptr obj - ); + CORBA::Object_ptr obj); - static TAO_Network_Priority_Mapping_Manager_ptr _nil (void) + static TAO_Network_Priority_Mapping_Manager_ptr _nil () { - return (TAO_Network_Priority_Mapping_Manager_ptr)0; + return nullptr; } virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 62b81e723a0..783e1487f93 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -61,26 +61,23 @@ public: static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj); static TAO_Priority_Mapping_Manager_ptr _narrow (CORBA::Object_ptr obj); - static TAO_Priority_Mapping_Manager_ptr _nil (void) + static TAO_Priority_Mapping_Manager_ptr _nil () { - return (TAO_Priority_Mapping_Manager_ptr)0; + return nullptr; } - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: - /// Protected destructor to enforce proper memory management of this /// reference counted object. - ~TAO_Priority_Mapping_Manager (void); + ~TAO_Priority_Mapping_Manager (); private: - TAO_Priority_Mapping_Manager (const TAO_Priority_Mapping_Manager &); void operator= (const TAO_Priority_Mapping_Manager &); private: - TAO_Priority_Mapping *mapping_; }; diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index aeea492acd3..d45c28b2535 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -98,9 +98,9 @@ namespace RTCORBA static ProtocolProperties_ptr _narrow (::CORBA::Object_ptr obj); static ProtocolProperties_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static ProtocolProperties_ptr _nil (void) + static ProtocolProperties_ptr _nil () { - return static_cast<ProtocolProperties_ptr> (0); + return nullptr; } static void _tao_any_destructor (void *); diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 4648487aab2..9f7e37d1229 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -516,8 +516,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, static_threads, dynamic_threads, lifespan, - dynamic_thread_time - )); + dynamic_thread_time)); } TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, @@ -561,8 +560,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager, lanes[i].static_threads, lanes[i].dynamic_threads, lifespan, - dynamic_thread_time - )); + dynamic_thread_time)); } void diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h index 2c2d3f66eda..2e90b0f4046 100644 --- a/TAO/tao/RTPortableServer/RT_POA.h +++ b/TAO/tao/RTPortableServer/RT_POA.h @@ -218,8 +218,7 @@ protected: const char *type_id, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, - TAO_PriorityBandedConnectionPolicy *priority_bands - ); + TAO_PriorityBandedConnectionPolicy *priority_bands); int lane_required (TAO_Thread_Lane *lane, TAO_PriorityBandedConnectionPolicy *priority_bands); diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h index a093fcf25fb..7d48ae05968 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h @@ -45,14 +45,12 @@ public: void pre_invoke_remote_request (TAO_Root_POA &poa, CORBA::Short servant_priority, TAO_ServerRequest &req, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); /// Pre_invoke collocated request. void pre_invoke_collocated_request (TAO_Root_POA &poa, CORBA::Short servant_priority, - TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state - ); + TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state); /// Post_invoke request. void post_invoke (TAO_Root_POA &poa, @@ -65,8 +63,7 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ); + TAO_Object_Adapter *object_adapter); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index c8735b4bb16..7865ac7dc3b 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -392,8 +392,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment( void TAO_RTScheduler_Current_i::update_scheduling_segment (const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param - ) + CORBA::Policy_ptr implicit_sched_param) { // Check if DT has been cancelled if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) @@ -459,8 +458,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param, CORBA::ULong stack_size, - RTCORBA::Priority base_priority - ) + RTCORBA::Priority base_priority) { // Check if DT has been cancelled. if (this->dt_->state () == RTScheduling::DistributableThread::CANCELLED) @@ -513,8 +511,7 @@ TAO_RTScheduler_Current_i::spawn (RTScheduling::ThreadAction_ptr start, int DTTask::activate_task (RTCORBA::Priority base_priority, - CORBA::ULong stack_size - ) + CORBA::ULong stack_size) { // Activate thread. long default_flags = THR_NEW_LWP | THR_JOINABLE; @@ -767,12 +764,12 @@ TAO_RTScheduler_Current_i::implicit_scheduling_parameter (CORBA::Policy_ptr impl // Operations for class TAO_RTScheduler_Current_var // ************************************************************* -TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (void) // default constructor +TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var () // default constructor : ptr_ (TAO_RTScheduler_Current::_nil ()) {} ::TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::ptr (void) const +TAO_RTScheduler_Current_var::ptr () const { return this->ptr_; } @@ -782,7 +779,7 @@ TAO_RTScheduler_Current_var::TAO_RTScheduler_Current_var (const ::TAO_RTSchedule ptr_ (TAO_RTScheduler_Current::_duplicate (p.ptr ())) {} -TAO_RTScheduler_Current_var::~TAO_RTScheduler_Current_var (void) // destructor +TAO_RTScheduler_Current_var::~TAO_RTScheduler_Current_var () // destructor { ::CORBA::release (this->ptr_); } @@ -870,10 +867,7 @@ TAO_RTScheduler_Current_var::nil (void) } TAO_RTScheduler_Current_ptr -TAO_RTScheduler_Current_var::narrow ( - CORBA::Object *p - - ) +TAO_RTScheduler_Current_var::narrow (CORBA::Object *p) { return ::TAO_RTScheduler_Current::_narrow (p); } @@ -887,14 +881,11 @@ TAO_RTScheduler_Current_var::upcast (void *src) } TAO_RTScheduler_Current_ptr TAO_RTScheduler_Current::_narrow ( - CORBA::Object_ptr obj - - ) + CORBA::Object_ptr obj) { return TAO_RTScheduler_Current::_duplicate ( - dynamic_cast<TAO_RTScheduler_Current *> (obj) - ); + dynamic_cast<TAO_RTScheduler_Current *> (obj)); } TAO_RTScheduler_Current_ptr diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index 4edf9c5ceb9..df68b4994fd 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -145,14 +145,11 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current static TAO_RTScheduler_Current_ptr _duplicate (TAO_RTScheduler_Current_ptr obj); - static TAO_RTScheduler_Current_ptr _narrow ( - CORBA::Object_ptr obj - ); + static TAO_RTScheduler_Current_ptr _narrow (CORBA::Object_ptr obj); - - static TAO_RTScheduler_Current_ptr _nil (void) + static TAO_RTScheduler_Current_ptr _nil () { - return (TAO_RTScheduler_Current_ptr)0; + return nullptr; } virtual const char* _interface_repository_id (void) const; @@ -197,11 +194,8 @@ public: // for non-defined forward declared interfaces. static TAO_RTScheduler_Current_ptr duplicate (TAO_RTScheduler_Current_ptr); static void release (TAO_RTScheduler_Current_ptr); - static TAO_RTScheduler_Current_ptr nil (void); - static TAO_RTScheduler_Current_ptr narrow ( - CORBA::Object * - - ); + static TAO_RTScheduler_Current_ptr nil (); + static TAO_RTScheduler_Current_ptr narrow (CORBA::Object *); static CORBA::Object * upcast (void *); private: diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp index d9b29cfdf5c..87d8ef10926 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.cpp +++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp @@ -3,31 +3,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_DistributableThread::TAO_DistributableThread (void) - :state_ (RTScheduling::DistributableThread::ACTIVE) -{ -} - -TAO_DistributableThread::~TAO_DistributableThread (void) -{ -} - void -TAO_DistributableThread::cancel (void) +TAO_DistributableThread::cancel () { this->state_ = RTScheduling::DistributableThread::CANCELLED; } RTScheduling::DistributableThread::DT_State -TAO_DistributableThread::state (void) +TAO_DistributableThread::state () { return this->state_; } RTScheduling::DistributableThread_ptr -TAO_DistributableThread_Factory::create_DT (void) +TAO_DistributableThread_Factory::create_DT () { - TAO_DistributableThread* DT = 0; + TAO_DistributableThread* DT = nullptr; ACE_NEW_THROW_EX (DT, TAO_DistributableThread, diff --git a/TAO/tao/RTScheduling/Distributable_Thread.h b/TAO/tao/RTScheduling/Distributable_Thread.h index 3b57102d827..dd4b9ccab81 100644 --- a/TAO/tao/RTScheduling/Distributable_Thread.h +++ b/TAO/tao/RTScheduling/Distributable_Thread.h @@ -13,23 +13,22 @@ class TAO_RTScheduler_Export TAO_DistributableThread: public ::CORBA::LocalObject { public: - TAO_DistributableThread (void); + TAO_DistributableThread () = default; - ~TAO_DistributableThread (void); + ~TAO_DistributableThread () = default; - virtual void cancel (void); + void cancel () override; - virtual RTScheduling::DistributableThread::DT_State state (void); + RTScheduling::DistributableThread::DT_State state () override; private: - RTScheduling::DistributableThread::DT_State state_; + RTScheduling::DistributableThread::DT_State state_ {RTScheduling::DistributableThread::ACTIVE}; }; - class TAO_DistributableThread_Factory { public: - static RTScheduling::DistributableThread_ptr create_DT (void); + static RTScheduling::DistributableThread_ptr create_DT (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp index a4c71837e35..a5b75dc14a5 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp @@ -7,13 +7,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void) : - orb_ (0) +TAO_RTScheduler_Manager::TAO_RTScheduler_Manager () : + orb_ (nullptr) { - } -TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager (void) +TAO_RTScheduler_Manager::~TAO_RTScheduler_Manager () { } @@ -22,8 +21,7 @@ TAO_RTScheduler_Manager::_narrow (CORBA::Object_ptr obj) { return TAO_RTScheduler_Manager::_duplicate ( - dynamic_cast<TAO_RTScheduler_Manager *> (obj) - ); + dynamic_cast<TAO_RTScheduler_Manager *> (obj)); } TAO_RTScheduler_Manager_ptr diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 4e90e0cbf9c..b0d0221e9a7 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -49,9 +49,9 @@ public: // the static operations static TAO_RTScheduler_Manager_ptr _duplicate (TAO_RTScheduler_Manager_ptr obj); static TAO_RTScheduler_Manager_ptr _narrow (CORBA::Object_ptr obj); - static TAO_RTScheduler_Manager_ptr _nil (void) + static TAO_RTScheduler_Manager_ptr _nil () { - return (TAO_RTScheduler_Manager_ptr)0; + return nullptr; } virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp index 38a1cc996d5..31ed703d13a 100644 --- a/TAO/tao/Remote_Object_Proxy_Broker.cpp +++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp @@ -90,8 +90,7 @@ namespace TAO { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); + TAO_ORB_Core::ifr_client_adapter_name ()); if (adapter == nullptr) { diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index 3479e3eca92..8b695fe6027 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -250,8 +250,7 @@ TAO_DIOP_Connection_Handler::open_server (void) ACE_TEXT("TAO (%P|%t) - DIOP_Connection_Handler::open_server, ") ACE_TEXT("listening on %C:%d\n"), this->local_addr_.get_host_name (), - this->local_addr_.get_port_number () - )); + this->local_addr_.get_port_number ())); } this->transport ()->id ((size_t) this->peer ().get_handle ()); diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 7dc23aa3e40..13a837277c4 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -937,9 +937,8 @@ CORBA::name ::_tao_type (void) const \ { \ TAO_AnyTypeCode_Adapter *adapter = \ ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( \ - "AnyTypeCode_Adapter" \ - ); \ - if (adapter != 0) \ + "AnyTypeCode_Adapter"); \ + if (adapter != nullptr) \ return adapter->_tao_type_ ## name (); \ else \ { \ diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp index 52578239720..1d7b01a5c1c 100644 --- a/TAO/tao/TAO_Server_Request.cpp +++ b/TAO/tao/TAO_Server_Request.cpp @@ -337,8 +337,7 @@ TAO_ServerRequest::send_no_exception_reply () TAOLIB_ERROR (( LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_no_exception_reply, ") - ACE_TEXT ("cannot send NO_EXCEPTION reply\n") - )); + ACE_TEXT ("cannot send NO_EXCEPTION reply\n"))); } } } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 13bfa7174f7..8fbeea0093d 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -184,8 +184,7 @@ TAO_Transport::~TAO_Transport () if (TAO_debug_level > 9) { TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::~Transport\n"), - this->id_ - )); + this->id_)); } delete this->messaging_object_; diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 4b3c84d069d..c673e8f2360 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -138,8 +138,8 @@ namespace TAO } private: - ACE_UNIMPLEMENTED_FUNC (Drain_Constraints (const Drain_Constraints &)) - ACE_UNIMPLEMENTED_FUNC (Drain_Constraints &operator= (const Drain_Constraints &)) + Drain_Constraints (const Drain_Constraints &) = delete; + Drain_Constraints &operator= (const Drain_Constraints &) = delete; ACE_Time_Value * timeout_; bool block_on_io_; @@ -1036,8 +1036,8 @@ protected: int notify_reactor_now (); private: - ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &)) + TAO_Transport (const TAO_Transport &) = delete; + TAO_Transport &operator= (const TAO_Transport &) = delete; /// Assume the lock is held void send_connection_closed_notifications_i (); diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h index bfc363cf8c4..f47317b4790 100644 --- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h +++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h @@ -48,11 +48,8 @@ namespace TAO make_current_instance (TAO_ORB_Core* core, size_t tss_slot_id) = 0; protected: const ACE_TString id_; -#if defined (ACE_WIN32_VC14) - // Workaround for connect issue 1577211 - ACE_UNIMPLEMENTED_FUNC (Current_ORBInitializer_Base (const Current_ORBInitializer_Base &)) - ACE_UNIMPLEMENTED_FUNC (Current_ORBInitializer_Base &operator = (const Current_ORBInitializer_Base &)) -#endif + Current_ORBInitializer_Base (const Current_ORBInitializer_Base &) = delete; + Current_ORBInitializer_Base &operator = (const Current_ORBInitializer_Base &) = delete; }; } /* namespace Transport */ diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index ab7a56adf36..dbcdc66ed15 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -209,8 +209,7 @@ namespace TAO int_id.transport ()->id (), ext_id.hash (), ext_id.index (), - this->current_size () - )); + this->current_size ())); } } @@ -308,8 +307,7 @@ namespace TAO ACE_TEXT ("found available Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), entry->ext_id_.hash (), - entry->ext_id_.index () - )); + entry->ext_id_.index ())); } } else if (this->is_entry_connecting_i (*entry)) @@ -321,8 +319,7 @@ namespace TAO ACE_TEXT ("found connecting Transport[%d] @hash:index {%d:%d}\n"), entry->item ().transport ()->id (), entry->ext_id_.hash (), - entry->ext_id_.index () - )); + entry->ext_id_.index ())); } // if this is the first interesting entry if (found != CACHE_FOUND_CONNECTING) @@ -660,8 +657,7 @@ namespace TAO TAOLIB_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T::purge, ") ACE_TEXT ("Cache size after purging is [%d]\n"), - this->current_size () - )); + this->current_size ())); } #if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1) diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 65ceaddfd57..d992671e8a8 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -72,8 +72,7 @@ namespace TAO TAOLIB_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport_Cache_Manager_T") ACE_TEXT ("::mark_connected, %s Transport[%d]\n"), (state ? ACE_TEXT("true") : ACE_TEXT("false")), - entry->item ().transport ()->id () - )); + entry->item ().transport ()->id ())); entry->item().is_connected (state); } diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index fa70136f350..7b64dd1090c 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -103,7 +103,7 @@ namespace TAO } private: - ACE_UNIMPLEMENTED_FUNC (Transport_Selection_Guard (const Transport_Selection_Guard&)) + Transport_Selection_Guard (const Transport_Selection_Guard&) = delete; #if TAO_HAS_TRANSPORT_CURRENT == 1 /// This is pointing to the guard that was active prior to diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl index eeca959bb01..926a5701b10 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl @@ -30,112 +30,92 @@ module CORBA TypeCode create_struct_tc ( in RepositoryId id, in Identifier name, - in StructMemberSeq members - ); + in StructMemberSeq members); TypeCode create_union_tc ( in RepositoryId id, in Identifier name, in TypeCode discriminator_type, - in UnionMemberSeq members - ); + in UnionMemberSeq members); TypeCode create_enum_tc ( in RepositoryId id, in Identifier name, - in EnumMemberSeq members - ); + in EnumMemberSeq members); TypeCode create_alias_tc ( in RepositoryId id, in Identifier name, - in TypeCode original_type - ); + in TypeCode original_type); TypeCode create_exception_tc ( in RepositoryId id, in Identifier name, - in StructMemberSeq members - ); + in StructMemberSeq members); TypeCode create_interface_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_string_tc ( - in unsigned long bound - ); + in unsigned long bound); TypeCode create_wstring_tc ( - in unsigned long bound - ); + in unsigned long bound); TypeCode create_fixed_tc ( in unsigned short digits, - in unsigned short scale - ); + in unsigned short scale); TypeCode create_sequence_tc ( in unsigned long bound, - in TypeCode element_type - ); + in TypeCode element_type); TypeCode create_array_tc ( in unsigned long length, - in TypeCode element_type - ); + in TypeCode element_type); TypeCode create_value_tc ( in RepositoryId id, in Identifier name, in ValueModifier type_modifier, in TypeCode concrete_base, - in ValueMemberSeq members - ); + in ValueMemberSeq members); TypeCode create_value_box_tc ( in RepositoryId id, in Identifier name, - in TypeCode boxed_type - ); + in TypeCode boxed_type); TypeCode create_native_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_recursive_tc ( - in RepositoryId id - ); + in RepositoryId id); TypeCode create_abstract_interface_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_local_interface_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_component_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_home_tc ( in RepositoryId id, - in Identifier name - ); + in Identifier name); TypeCode create_event_tc ( in RepositoryId id, in Identifier name, in ValueModifier type_modifier, in TypeCode concrete_base, - in ValueMemberSeq members - ); + in ValueMemberSeq members); }; }; diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index e9fc435fd4b..634b61c4d5d 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -63,8 +63,7 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) if (result == 0) { TAOLIB_ERROR ((LM_INFO, - "%T %C (%P|%t) Ready %C\n", name_, servant.identity () - )); + "%T %C (%P|%t) Ready %C\n", name_, servant.identity ())); ////////////////////////////////// // Run the event loop for the ORB. @@ -87,22 +86,19 @@ TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) TAOLIB_ERROR ((LM_INFO, "%T %C (%P|%t) Terminated normally. %C\n", name_, - servant.identity () - )); + servant.identity ())); } else { TAOLIB_ERROR ((LM_ERROR, - "%T %C (%P|%t) Registration failed: %m\n", name_ - )); + "%T %C (%P|%t) Registration failed: %m\n", name_)); result = -1; } } else { TAOLIB_ERROR ((LM_ERROR, - "%T %C (%P|%t) ORB manager init failed\n", name_ - )); + "%T %C (%P|%t) ORB manager init failed\n", name_)); result = -1; } } diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index e078a365a89..9e4329c0358 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -17,9 +17,9 @@ CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj) ACE_INLINE CORBA::AbstractBase_ptr -CORBA::AbstractBase::_nil (void) +CORBA::AbstractBase::_nil () { - return static_cast <CORBA::AbstractBase_ptr> (0); + return nullptr; } ACE_INLINE CORBA::AbstractBase_ptr @@ -30,14 +30,14 @@ CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj) ACE_INLINE CORBA::Boolean -CORBA::AbstractBase::_is_objref (void) const +CORBA::AbstractBase::_is_objref () const { return this->is_objref_; } ACE_INLINE TAO_Stub * -CORBA::AbstractBase::_stubobj (void) const +CORBA::AbstractBase::_stubobj () const { if (this->is_objref_) { @@ -51,27 +51,27 @@ CORBA::AbstractBase::_stubobj (void) const ACE_INLINE CORBA::Boolean -CORBA::AbstractBase::_is_collocated (void) const +CORBA::AbstractBase::_is_collocated () const { return this->is_collocated_; } ACE_INLINE TAO_Abstract_ServantBase * -CORBA::AbstractBase::_servant (void) const +CORBA::AbstractBase::_servant () const { return this->servant_; } ACE_INLINE CORBA::Object_ptr -CORBA::AbstractBase::equivalent_objref (void) +CORBA::AbstractBase::equivalent_objref () { return this->equivalent_obj_.in (); } ACE_INLINE void -CORBA::AbstractBase::_decr_refcount (void) +CORBA::AbstractBase::_decr_refcount () { this->_remove_ref (); } diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index 0f4f33161b6..456947d78bd 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -1440,8 +1440,7 @@ operator<< (TAO_OutputCDR &strm, return CORBA::ValueBase::_tao_marshal ( strm, _tao_valuetype, - reinterpret_cast<ptrdiff_t> (&CORBA::ValueBase::_downcast) - ); + reinterpret_cast<ptrdiff_t> (&CORBA::ValueBase::_downcast)); } CORBA::Boolean diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp index 9d1b8968288..80223c32b0d 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.cpp @@ -30,13 +30,11 @@ int TAO_Valuetype_Adapter_Factory_Impl::Initializer (void) { TAO_ORB_Core::valuetype_adapter_factory_name ( - "Concrete_Valuetype_Adapter_Factory" - ); + "Concrete_Valuetype_Adapter_Factory"); return ACE_Service_Config::process_directive ( - ace_svc_desc_TAO_Valuetype_Adapter_Factory_Impl - ); + ace_svc_desc_TAO_Valuetype_Adapter_Factory_Impl); } diff --git a/TAO/tao/VarOut_T.cpp b/TAO/tao/VarOut_T.cpp index f576e87ef4a..b04e5a9b0b9 100644 --- a/TAO/tao/VarOut_T.cpp +++ b/TAO/tao/VarOut_T.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> TAO_Var_Base_T<T>::TAO_Var_Base_T (const TAO_Var_Base_T<T> & p) - : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0) + : ptr_ (p.ptr_ ? new T (*p.ptr_) : nullptr) { } diff --git a/TAO/tao/VarOut_T.inl b/TAO/tao/VarOut_T.inl index fb4519660af..752f519ff6f 100644 --- a/TAO/tao/VarOut_T.inl +++ b/TAO/tao/VarOut_T.inl @@ -3,8 +3,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename T> ACE_INLINE -TAO_Var_Base_T<T>::TAO_Var_Base_T (void) - : ptr_ (0) +TAO_Var_Base_T<T>::TAO_Var_Base_T () + : ptr_ (nullptr) {} template<typename T> @@ -15,7 +15,7 @@ TAO_Var_Base_T<T>::TAO_Var_Base_T (T * p) template<typename T> ACE_INLINE -TAO_Var_Base_T<T>::~TAO_Var_Base_T (void) +TAO_Var_Base_T<T>::~TAO_Var_Base_T () { delete this->ptr_; } @@ -23,7 +23,7 @@ TAO_Var_Base_T<T>::~TAO_Var_Base_T (void) template<typename T> ACE_INLINE const T * -TAO_Var_Base_T<T>::operator-> (void) const +TAO_Var_Base_T<T>::operator-> () const { return this->ptr_; } @@ -31,7 +31,7 @@ TAO_Var_Base_T<T>::operator-> (void) const template<typename T> ACE_INLINE T * -TAO_Var_Base_T<T>::operator-> (void) +TAO_Var_Base_T<T>::operator-> () { return this->ptr_; } @@ -39,7 +39,7 @@ TAO_Var_Base_T<T>::operator-> (void) template<typename T> ACE_INLINE const T & -TAO_Var_Base_T<T>::in (void) const +TAO_Var_Base_T<T>::in () const { return *this->ptr_; } @@ -47,7 +47,7 @@ TAO_Var_Base_T<T>::in (void) const template<typename T> ACE_INLINE T & -TAO_Var_Base_T<T>::inout (void) +TAO_Var_Base_T<T>::inout () { return *this->ptr_; } @@ -55,7 +55,7 @@ TAO_Var_Base_T<T>::inout (void) template<typename T> ACE_INLINE T * -TAO_Var_Base_T<T>::ptr (void) const +TAO_Var_Base_T<T>::ptr () const { return this->ptr_; } @@ -71,7 +71,7 @@ TAO_Var_Base_T<T>::operator T *& () template<typename T> ACE_INLINE -TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T (void) +TAO_Fixed_Var_T<T>::TAO_Fixed_Var_T () {} template<typename T> @@ -119,8 +119,10 @@ TAO_Fixed_Var_T<T>::operator T & () // Use plain new, using the ACE_NEW macros will mean we dereference a // nil pointer and crash which is more bad then plain new which could // lead to a bad_alloc exception - if (this->ptr_ == 0) + if (!this->ptr_) + { this->ptr_ = new T; + } return *this->ptr_; } @@ -136,13 +138,15 @@ TAO_Fixed_Var_T<T>::operator T & () const template<typename T> ACE_INLINE T & -TAO_Fixed_Var_T<T>::out (void) +TAO_Fixed_Var_T<T>::out () { // Use plain new, using the ACE_NEW macros will mean we dereference a // nil pointer and crash which is more bad then plain new which could // lead to a bad_alloc exception - if (this->ptr_ == 0) + if (!this->ptr_) + { this->ptr_ = new T; + } return *this->ptr_; } @@ -150,7 +154,7 @@ TAO_Fixed_Var_T<T>::out (void) template<typename T> ACE_INLINE T -TAO_Fixed_Var_T<T>::_retn (void) +TAO_Fixed_Var_T<T>::_retn () { return *this->ptr_; } @@ -159,7 +163,7 @@ TAO_Fixed_Var_T<T>::_retn (void) template<typename T> ACE_INLINE -TAO_Var_Var_T<T>::TAO_Var_Var_T (void) +TAO_Var_Var_T<T>::TAO_Var_Var_T () {} template<typename T> @@ -209,20 +213,20 @@ TAO_Var_Var_T<T>::operator T & () const template<typename T> ACE_INLINE T *& -TAO_Var_Var_T<T>::out (void) +TAO_Var_Var_T<T>::out () { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return this->ptr_; } template<typename T> ACE_INLINE T * -TAO_Var_Var_T<T>::_retn (void) +TAO_Var_Var_T<T>::_retn () { T * tmp = this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; return tmp; } @@ -233,7 +237,7 @@ ACE_INLINE TAO_Out_T<T>::TAO_Out_T (T *& p) : ptr_ (p) { - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T> @@ -242,7 +246,7 @@ TAO_Out_T<T>::TAO_Out_T (T_var & p) : ptr_ (p.out ()) { delete this->ptr_; - this->ptr_ = 0; + this->ptr_ = nullptr; } template<typename T> @@ -279,7 +283,7 @@ TAO_Out_T<T>::operator T *& () template<typename T> ACE_INLINE T *& -TAO_Out_T<T>::ptr (void) +TAO_Out_T<T>::ptr () { return this->ptr_; } @@ -287,7 +291,7 @@ TAO_Out_T<T>::ptr (void) template<typename T> ACE_INLINE T * -TAO_Out_T<T>::operator-> (void) +TAO_Out_T<T>::operator-> () { return this->ptr_; } diff --git a/TAO/tao/Vector_Argument_T.cpp b/TAO/tao/Vector_Argument_T.cpp index 17c65923526..2e6b2bc35bd 100644 --- a/TAO/tao/Vector_Argument_T.cpp +++ b/TAO/tao/Vector_Argument_T.cpp @@ -33,7 +33,7 @@ TAO::In_Vector_Argument_T<S,Insert_Policy>::interceptor_value ( template<typename S, template <typename> class Insert_Policy> -TAO::In_Vector_Clonable_Argument_T<S,Insert_Policy>::~In_Vector_Clonable_Argument_T (void) +TAO::In_Vector_Clonable_Argument_T<S,Insert_Policy>::~In_Vector_Clonable_Argument_T () { if (this->is_clone_) { @@ -45,7 +45,7 @@ TAO::In_Vector_Clonable_Argument_T<S,Insert_Policy>::~In_Vector_Clonable_Argumen template<typename S, template <typename> class Insert_Policy> TAO::Argument* -TAO::In_Vector_Clonable_Argument_T<S,Insert_Policy>::clone (void) +TAO::In_Vector_Clonable_Argument_T<S,Insert_Policy>::clone () { S* clone_x = new S (this->x_); In_Vector_Clonable_Argument_T<S,Insert_Policy>* clone_arg @@ -60,8 +60,7 @@ template<typename S, template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Vector_Argument_T<S,Insert_Policy>::marshal ( - TAO_OutputCDR &cdr - ) + TAO_OutputCDR &cdr) { return cdr << this->x_; } @@ -70,8 +69,7 @@ template<typename S, template <typename> class Insert_Policy> CORBA::Boolean TAO::Inout_Vector_Argument_T<S,Insert_Policy>::demarshal ( - TAO_InputCDR & cdr - ) + TAO_InputCDR & cdr) { return cdr >> this->x_; } @@ -82,8 +80,7 @@ template<typename S, template <typename> class Insert_Policy> void TAO::Inout_Vector_Argument_T<S,Insert_Policy>::interceptor_value ( - CORBA::Any *any - ) const + CORBA::Any *any) const { Insert_Policy<S>::any_insert (any, this->x_); } @@ -96,8 +93,7 @@ template<typename S, template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Vector_Argument_T<S,Insert_Policy>::demarshal ( - TAO_InputCDR & cdr - ) + TAO_InputCDR & cdr) { return cdr >> this->x_; } @@ -108,8 +104,7 @@ template<typename S, template <typename> class Insert_Policy> void TAO::Out_Vector_Argument_T<S,Insert_Policy>::interceptor_value ( - CORBA::Any *any - ) const + CORBA::Any *any) const { Insert_Policy<S>::any_insert (any, this->x_); } @@ -122,8 +117,7 @@ template<typename S, template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Vector_Argument_T<S,Insert_Policy>::demarshal ( - TAO_InputCDR & cdr - ) + TAO_InputCDR & cdr) { return cdr >> this->x_; } @@ -134,8 +128,7 @@ template<typename S, template <typename> class Insert_Policy> void TAO::Ret_Vector_Argument_T<S,Insert_Policy>::interceptor_value ( - CORBA::Any *any - ) const + CORBA::Any *any) const { Insert_Policy<S>::any_insert (any, this->x_); } diff --git a/TAO/tao/Vector_Argument_T.h b/TAO/tao/Vector_Argument_T.h index aa1f8dca07d..3c7a22ac3b2 100644 --- a/TAO/tao/Vector_Argument_T.h +++ b/TAO/tao/Vector_Argument_T.h @@ -41,7 +41,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: S const & x_; @@ -61,9 +61,9 @@ namespace TAO { public: In_Vector_Clonable_Argument_T (S const & x); - virtual ~In_Vector_Clonable_Argument_T (void); + virtual ~In_Vector_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -129,16 +129,16 @@ namespace TAO class Ret_Vector_Argument_T : public RetArgument { public: - Ret_Vector_Argument_T (void); + Ret_Vector_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); protected: S x_; diff --git a/TAO/tao/Vector_Argument_T.inl b/TAO/tao/Vector_Argument_T.inl index 64cb530b676..ced1dda2f53 100644 --- a/TAO/tao/Vector_Argument_T.inl +++ b/TAO/tao/Vector_Argument_T.inl @@ -13,7 +13,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S const & -TAO::In_Vector_Argument_T<S,Insert_Policy>::arg (void) const +TAO::In_Vector_Argument_T<S,Insert_Policy>::arg () const { return this->x_; } @@ -40,7 +40,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Vector_Argument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Vector_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -51,8 +51,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Vector_Argument_T<S,Insert_Policy>::Out_Vector_Argument_T ( - S & x - ) + S & x) : x_ (x) {} @@ -60,7 +59,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Vector_Argument_T<S,Insert_Policy>::arg (void) +TAO::Out_Vector_Argument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/XtResource/XtResource_Factory.cpp b/TAO/tao/XtResource/XtResource_Factory.cpp index 637a783140a..f97a97b28bb 100644 --- a/TAO/tao/XtResource/XtResource_Factory.cpp +++ b/TAO/tao/XtResource/XtResource_Factory.cpp @@ -8,8 +8,8 @@ namespace TAO { XtResource_Factory::XtResource_Factory (XtAppContext p_context): - reactor_impl_( 0 ), - context_( p_context ) + reactor_impl_(nullptr), + context_(p_context) { } @@ -17,19 +17,19 @@ namespace TAO XtResource_Factory::reactor_impl (void) { // synchronized by external locks - if (this->context_ == 0) + if (!this->context_) { TAOLIB_ERROR ((LM_ERROR, ACE_TEXT("TAO (%P|%t) - XtAppContext is undefined.") ACE_TEXT(" Cannot create ACE_XtReactor\n"))); - return 0; + return nullptr; // Private and undefined; } if (!this->reactor_impl_) { ACE_NEW_RETURN (this->reactor_impl_, ACE_XtReactor (this->context_), - 0); + nullptr); if (TAO_debug_level > 0) TAOLIB_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp index ad2f23caf6a..d1f84d8d256 100644 --- a/TAO/tao/ZIOP/ZIOP.cpp +++ b/TAO/tao/ZIOP/ZIOP.cpp @@ -541,8 +541,7 @@ TAO_ZIOP_Loader::complete_compression (Compression::Compressor_ptr compressor, ACE_TEXT ("compressed length (%u >= %u) ") ACE_TEXT ("uncompressed length, (did not compress).\n"), static_cast <unsigned int> (output.length () + Compression_Overhead), - static_cast <unsigned int> (original_data_length) - )); + static_cast <unsigned int> (original_data_length))); } return false; } diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index e1ff41ce021..9e95c9be4fa 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -55,11 +55,11 @@ class TAO_RSF_Timer_Queue_Ptr; class TAO_Export TAO_Codeset_Parameters { public: - TAO_Codeset_Parameters (void); - ~TAO_Codeset_Parameters (void); + TAO_Codeset_Parameters (); + ~TAO_Codeset_Parameters (); /// The native codeset (getter) - const ACE_TCHAR* native (void); + const ACE_TCHAR* native (); /// The native codeset (setter) void native (const ACE_TCHAR* n); @@ -70,14 +70,14 @@ public: typedef ACE_Unbounded_Queue_Iterator<ACE_TCHAR*> iterator; /// Iterate through the registered translators - iterator translators (void); + iterator translators (); /// Apply the parameters to the said descriptor void apply_to (TAO_Codeset_Descriptor_Base *csd); private: - ACE_UNIMPLEMENTED_FUNC (TAO_Codeset_Parameters (const TAO_Codeset_Parameters &)) - ACE_UNIMPLEMENTED_FUNC (TAO_Codeset_Parameters &operator= (const TAO_Codeset_Parameters &)) + TAO_Codeset_Parameters (const TAO_Codeset_Parameters &) = delete; + TAO_Codeset_Parameters &operator= (const TAO_Codeset_Parameters &) = delete; ACE_Unbounded_Queue<ACE_TCHAR*> translators_; ACE_TCHAR* native_; @@ -117,12 +117,11 @@ class TAO_Export TAO_Default_Resource_Factory : public TAO_Resource_Factory { public: - /// Constructor. - TAO_Default_Resource_Factory (void); + TAO_Default_Resource_Factory (); /// Destructor. - virtual ~TAO_Default_Resource_Factory (void); + virtual ~TAO_Default_Resource_Factory (); /** * @name Service Configurator Hooks @@ -151,49 +150,48 @@ public: int cdr_allocator_source (void); // = Resource Retrieval - virtual int use_locked_data_blocks (void) const; - virtual ACE_Reactor *get_reactor (void); + virtual int use_locked_data_blocks () const; + virtual ACE_Reactor *get_reactor (); virtual void reclaim_reactor (ACE_Reactor *); - virtual TAO_Acceptor_Registry *get_acceptor_registry (void); - virtual TAO_Connector_Registry *get_connector_registry (void); + virtual TAO_Acceptor_Registry *get_acceptor_registry (); + virtual TAO_Connector_Registry *get_connector_registry (); virtual void use_local_memory_pool (bool); - virtual ACE_Allocator* input_cdr_dblock_allocator (void); - virtual ACE_Allocator* input_cdr_buffer_allocator (void); - virtual ACE_Allocator* input_cdr_msgblock_allocator (void); - virtual int input_cdr_allocator_type_locked (void); - virtual ACE_Allocator* output_cdr_dblock_allocator (void); - virtual ACE_Allocator* output_cdr_buffer_allocator (void); - virtual ACE_Allocator* output_cdr_msgblock_allocator (void); - virtual ACE_Allocator* amh_response_handler_allocator (void); - virtual ACE_Allocator* ami_response_handler_allocator (void); - virtual TAO_ProtocolFactorySet *get_protocol_factories (void); - - virtual int init_protocol_factories (void); - - virtual TAO_Codeset_Manager * codeset_manager (void); - - virtual int cache_maximum (void) const; - virtual int purge_percentage (void) const; - virtual int max_muxed_connections (void) const; - virtual ACE_Lock *create_cached_connection_lock (void); - virtual int locked_transport_cache (void); - virtual TAO_Flushing_Strategy *create_flushing_strategy (void); - virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void); - TAO_Resource_Factory::Resource_Usage resource_usage_strategy (void) const; - virtual TAO_LF_Strategy *create_lf_strategy (void); + virtual ACE_Allocator* input_cdr_dblock_allocator (); + virtual ACE_Allocator* input_cdr_buffer_allocator (); + virtual ACE_Allocator* input_cdr_msgblock_allocator (); + virtual int input_cdr_allocator_type_locked (); + virtual ACE_Allocator* output_cdr_dblock_allocator (); + virtual ACE_Allocator* output_cdr_buffer_allocator (); + virtual ACE_Allocator* output_cdr_msgblock_allocator (); + virtual ACE_Allocator* amh_response_handler_allocator (); + virtual ACE_Allocator* ami_response_handler_allocator (); + virtual TAO_ProtocolFactorySet *get_protocol_factories (); + + virtual int init_protocol_factories (); + + virtual TAO_Codeset_Manager * codeset_manager (); + + virtual int cache_maximum () const; + virtual int purge_percentage () const; + virtual int max_muxed_connections () const; + virtual ACE_Lock *create_cached_connection_lock (); + virtual int locked_transport_cache (); + virtual TAO_Flushing_Strategy *create_flushing_strategy (); + virtual TAO_Connection_Purging_Strategy *create_purging_strategy (); + TAO_Resource_Factory::Resource_Usage resource_usage_strategy () const; + virtual TAO_LF_Strategy *create_lf_strategy (); virtual TAO_GIOP_Fragmentation_Strategy* create_fragmentation_strategy (TAO_Transport * transport, CORBA::ULong max_message_size) const; - virtual void disable_factory (void); - virtual bool drop_replies_during_shutdown (void) const; + virtual void disable_factory (); + virtual bool drop_replies_during_shutdown () const; //@} protected: - friend class TAO_RSF_Timer_Queue_Ptr; #if (TAO_HAS_TIME_POLICY == 1) - TAO_Time_Policy_Manager* time_policy_manager (void) const; + TAO_Time_Policy_Manager* time_policy_manager () const; #endif ACE_Timer_Queue * create_timer_queue (void) const; @@ -210,7 +208,6 @@ protected: const ACE_TCHAR* option_value); protected: - /// The type of data blocks that the ORB should use int use_locked_data_blocks_; |