diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-25 06:23:35 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-25 06:23:35 +0000 |
| commit | 9534254820c193806c574765bd235b4a23d9add9 (patch) | |
| tree | b9d0c05b6dafb934272c14be7a50457e7770d0b9 | |
| parent | 336d0ba18ff99324f3e8c05e35d56abb61e8b4df (diff) | |
| download | ATCD-9534254820c193806c574765bd235b4a23d9add9.tar.gz | |
ChangeLogTag:Thu Feb 24 22:19:33 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
44 files changed, 280 insertions, 370 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4527fc73e7f..4eefb0f51eb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,52 @@ +Thu Feb 24 22:19:33 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Sequence.cpp: + * tao/Sequence_T.cpp: + * tao/DynamicAny/DynAny_i.cpp: + * tao/DynamicAny/DynArray_i.cpp: + * tao/DynamicAny/DynCommon.cpp: + * tao/DynamicAny/DynSequence_i.cpp: + * tao/DynamicAny/DynUnion_i.cpp: + * tao/Messaging/Asynch_Invocation_Adapter.cpp: + * tao/Messaging/Connection_Timeout_Policy_i.cpp: + * tao/PortableServer/Active_Object_Map.cpp: + * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp: + * tao/RTCORBA/Network_Priority_Mapping_Manager.i: + * tao/RTCORBA/Priority_Mapping_Manager.i: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + * tao/RTCORBA/RT_ORB.cpp: + * tao/RTCORBA/RT_Policy_i.cpp: + * tao/RTCORBA/RT_Protocols_Hooks.cpp: + * tao/RTCORBA/RT_Stub.cpp: + * tao/RTCORBA/RT_Transport_Descriptor.cpp: + * tao/RTCORBA/RT_Transport_Descriptor_Property.cpp: + * tao/RTPortableServer/RT_Policy_Validator.cpp: + * tao/RTScheduling/Current.cpp: + * tao/RTScheduling/RTScheduler_Manager.i: + * tao/RTScheduling/Request_Interceptor.cpp: + * tao/Strategies/DIOP_Acceptor.cpp: + * tao/Strategies/DIOP_Connector.cpp: + * tao/Strategies/DIOP_Endpoint.cpp: + * tao/Strategies/DIOP_Profile.cpp: + * tao/Strategies/SCIOP_Acceptor.cpp: + * tao/Strategies/SCIOP_Connector.cpp: + * tao/Strategies/SCIOP_Endpoint.cpp: + * tao/Strategies/SCIOP_Profile.cpp: + * tao/Strategies/SCIOP_Transport.cpp: + * tao/Strategies/UIOP_Endpoint.cpp: + * tao/Strategies/sciop_endpoints.cpp: + * tao/Strategies/sciop_endpoints.i: + * tao/Strategies/uiop_endpoints.cpp: + * tao/Strategies/uiop_endpoints.i: + * tao/Valuetype/AbstractBase.cpp: + * tao/Valuetype/Sequence_T.inl: + * tao/Valuetype/ValueBase.cpp: + * tao/Valuetype/ValueFactory_Map.cpp: + * tao/Valuetype/Value_VarOut_T.cpp: + + Converting remaining deprecated ACE cast macro calls to their + standard C++ counterparts. + Thu Feb 24 22:09:24 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/PortableServer/Upcall_Wrapper.cpp (upcall): diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 9610c1ac243..b8562e2af63 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -70,23 +70,23 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc this->any_._tao_set_typecode (CORBA::_tc_void); break; case CORBA::tk_short: - this->any_ <<= ACE_static_cast (CORBA::Short, 0); + this->any_ <<= static_cast<CORBA::Short> (0); break; case CORBA::tk_long: - this->any_ <<= ACE_static_cast (CORBA::Long, 0); + this->any_ <<= static_cast<CORBA::Long> (0); break; case CORBA::tk_ushort: - this->any_ <<= ACE_static_cast (CORBA::UShort, 0); + this->any_ <<= static_cast<CORBA::UShort> (0); break; case CORBA::tk_ulong: - this->any_ <<= ACE_static_cast (CORBA::ULong, 0); + this->any_ <<= static_cast<CORBA::ULong> (0); break; #if !defined (ACE_LACKS_LONGLONG_T) case CORBA::tk_longlong: - this->any_ <<= ACE_static_cast (CORBA::LongLong, 0); + this->any_ <<= static_cast<CORBA::LongLong> (0); break; case CORBA::tk_ulonglong: - this->any_ <<= ACE_static_cast (CORBA::ULongLong, 0); + this->any_ <<= static_cast<CORBA::ULongLong> (0); break; #endif /* ACE_LACKS_LONGLONG_T */ case CORBA::tk_boolean: @@ -102,10 +102,10 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc this->any_ <<= CORBA::Any::from_wchar (0); break; case CORBA::tk_float: - this->any_ <<= ACE_static_cast (CORBA::Float, 0); + this->any_ <<= static_cast<CORBA::Float> (0); break; case CORBA::tk_double: - this->any_ <<= ACE_static_cast (CORBA::Double, 0); + this->any_ <<= static_cast<CORBA::Double> (0); break; case CORBA::tk_any: this->any_._tao_set_typecode (CORBA::_tc_null); diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 60e29395a60..371fb0467b4 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -28,8 +28,7 @@ TAO_DynArray_i::init_common (void) this->has_components_ = 1; this->destroyed_ = 0; this->current_position_ = 0; - this->component_count_ = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ()); } void @@ -222,8 +221,7 @@ TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) 0); } - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); DynamicAny::AnySeq *elements = 0; ACE_NEW_THROW_EX (elements, @@ -354,8 +352,7 @@ TAO_DynArray_i::set_elements_as_dyn_any ( ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); } - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); if (values.length () != length) { @@ -435,8 +432,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any cdr = tmp_in; } - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); CORBA::ULong arg_length = this->get_tc_length (tc.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -584,8 +580,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs for (CORBA::ULong i = 0; i < this->component_count_; ++i) { - rhs->seek (ACE_static_cast (CORBA::Long, - i) + rhs->seek (static_cast<CORBA::Long> (i) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -653,8 +648,7 @@ TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL) return DynamicAny::DynAny::_nil (); } - CORBA::ULong index = ACE_static_cast (CORBA::ULong, - this->current_position_); + CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_); this->set_flag (this->da_members_[index].in (), 0 diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp index 7b08240452a..039093b5baa 100644 --- a/TAO/tao/DynamicAny/DynCommon.cpp +++ b/TAO/tao/DynamicAny/DynCommon.cpp @@ -436,8 +436,7 @@ TAO_DynCommon::insert_string (const char * value ACE_THROW (DynamicAny::DynAny::InvalidValue ()); } - this->any_ <<= CORBA::Any::from_string (ACE_const_cast (char *, - value), + this->any_ <<= CORBA::Any::from_string (const_cast<char *> (value), bound); } } @@ -736,8 +735,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value ACE_THROW (DynamicAny::DynAny::InvalidValue ()); } - this->any_ <<= CORBA::Any::from_wstring (ACE_const_cast (CORBA::WChar *, - value), + this->any_ <<= CORBA::Any::from_wstring (const_cast<CORBA::WChar *> (value), bound); } } @@ -1552,8 +1550,7 @@ TAO_DynCommon::seek (CORBA::Long slot this->current_position_ = -1; return 0; } - else if (slot < 0 || slot >= ACE_static_cast (CORBA::Long, - this->component_count_)) + else if (slot < 0 || slot >= static_cast<CORBA::Long> (this->component_count_)) { this->current_position_ = -1; return 0; @@ -1594,9 +1591,7 @@ TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL) } if (this->has_components_ == 0 - || this->current_position_ + 1 >= ACE_static_cast ( - CORBA::Long, - this->component_count_ + || this->current_position_ + 1 >= static_cast<CORBA::Long> (this->component_count_ )) { this->current_position_ = -1; diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index 6af07a1b9a8..f3307fc080a 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -28,8 +28,7 @@ TAO_DynSequence_i::init_common (void) this->has_components_ = 1; this->destroyed_ = 0; this->current_position_ = -1; - this->component_count_ = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + this->component_count_ = static_cast<CORBA::ULong> (this->da_members_.size ()); } void @@ -229,15 +228,13 @@ TAO_DynSequence_i::set_length (CORBA::ULong length if (this->current_position_ == -1) { // Set it to the first new slot. - this->current_position_ = ACE_static_cast (CORBA::Long, - this->component_count_); + this->current_position_ = static_cast<CORBA::Long> (this->component_count_); } } else if (length < this->component_count_) { // If the current position will no longer exist.. - if (this->current_position_ >= ACE_static_cast (CORBA::Long, - length)) + if (this->current_position_ >= static_cast<CORBA::Long> (length)) { this->current_position_ = -1; } @@ -288,8 +285,7 @@ TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL) 0); } - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - this->da_members_.size ()); + CORBA::ULong length = static_cast<CORBA::ULong> (this->da_members_.size ()); DynamicAny::AnySeq *elements; ACE_NEW_THROW_EX (elements, @@ -754,8 +750,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs for (CORBA::ULong i = 0; i < this->component_count_; ++i) { - rhs->seek (ACE_static_cast (CORBA::Long, - i) + rhs->seek (static_cast<CORBA::Long> (i) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -823,8 +818,7 @@ TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL) return DynamicAny::DynAny::_nil (); } - CORBA::ULong index = ACE_static_cast (CORBA::ULong, - this->current_position_); + CORBA::ULong index = static_cast<CORBA::ULong> (this->current_position_); this->set_flag (this->da_members_[index].in (), 0 diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index 06536297cdf..1e762006c60 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -269,8 +269,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any, } else { - CORBA::ULong index = ACE_static_cast (CORBA::ULong, - default_index); + CORBA::ULong index = static_cast<CORBA::ULong> (default_index); CORBA::TypeCode_var default_tc = tc->member_type (index @@ -441,8 +440,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->member_slot_ = ACE_static_cast (CORBA::ULong, - default_index); + this->member_slot_ = static_cast<CORBA::ULong> (default_index); } } @@ -484,8 +482,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL) } else { - CORBA::ULong index = ACE_static_cast (CORBA::ULong, - default_index); + CORBA::ULong index = static_cast<CORBA::ULong> (default_index); CORBA::TypeCode_var default_tc = unaliased_tc->member_type (index diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 26e003f138d..52bcd0a134b 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -79,8 +79,7 @@ namespace TAO if (ami_allocator) { ACE_NEW_MALLOC (rd, - ACE_static_cast (TAO_Asynch_Reply_Dispatcher *, - ami_allocator->malloc (sizeof (TAO_Asynch_Reply_Dispatcher))), + static_cast<TAO_Asynch_Reply_Dispatcher *> (ami_allocator->malloc (sizeof (TAO_Asynch_Reply_Dispatcher))), TAO_Asynch_Reply_Dispatcher (reply_handler_skel, reply_handler_ptr, stub->orb_core (), diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index b1677a2689d..56a75c6984d 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -102,7 +102,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) { CORBA::ULong msecs = - ACE_static_cast (CORBA::ULong, microseconds / 1000); + static_cast<CORBA::ULong> (microseconds / 1000); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"), msecs)); diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 0a7320f06e4..673049665c5 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -885,8 +885,7 @@ TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id, // Smartly copy all the data; <user_id does not own the data>. user_id.replace (system_id.maximum (), system_id.length (), - ACE_const_cast (CORBA::Octet *, - system_id.get_buffer ()), + const_cast<CORBA::Octet *> (system_id.get_buffer ()), 0); return 0; diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 25e1cb605f8..720f2842071 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -279,8 +279,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 ( - ACE_reinterpret_cast ( - size_t, - _TAO_collocation_Object_Proxy_Broker_Factory_Initializer + reinterpret_cast<size_t> (_TAO_collocation_Object_Proxy_Broker_Factory_Initializer ) ); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i index 4540b1d1cf4..6a483ec6cd9 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i @@ -129,7 +129,7 @@ ACE_INLINE CORBA::Object * TAO_Network_Priority_Mapping_Manager_var::upcast (void *src) { TAO_Network_Priority_Mapping_Manager **tmp = - ACE_static_cast (TAO_Network_Priority_Mapping_Manager **, src); + static_cast<TAO_Network_Priority_Mapping_Manager **> (src); return *tmp; } @@ -155,13 +155,13 @@ TAO_Network_Priority_Mapping_Manager_out::TAO_Network_Priority_Mapping_Manager_o ACE_INLINE TAO_Network_Priority_Mapping_Manager_out::TAO_Network_Priority_Mapping_Manager_out (const ::TAO_Network_Priority_Mapping_Manager_out &p) // copy constructor - : ptr_ (ACE_const_cast (TAO_Network_Priority_Mapping_Manager_out &, p).ptr_) + : ptr_ (const_cast<TAO_Network_Priority_Mapping_Manager_out &> (p).ptr_) {} ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_out & TAO_Network_Priority_Mapping_Manager_out::operator= (const ::TAO_Network_Priority_Mapping_Manager_out &p) { - this->ptr_ = ACE_const_cast (TAO_Network_Priority_Mapping_Manager_out&, p).ptr_; + this->ptr_ = const_cast<TAO_Network_Priority_Mapping_Manager_out&> (p).ptr_; return *this; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i index 718af03a334..77eb6dec547 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i @@ -129,7 +129,7 @@ ACE_INLINE CORBA::Object * TAO_Priority_Mapping_Manager_var::upcast (void *src) { TAO_Priority_Mapping_Manager **tmp = - ACE_static_cast (TAO_Priority_Mapping_Manager **, src); + static_cast<TAO_Priority_Mapping_Manager **> (src); return *tmp; } @@ -155,13 +155,13 @@ TAO_Priority_Mapping_Manager_out::TAO_Priority_Mapping_Manager_out (TAO_Priority ACE_INLINE TAO_Priority_Mapping_Manager_out::TAO_Priority_Mapping_Manager_out (const ::TAO_Priority_Mapping_Manager_out &p) // copy constructor - : ptr_ (ACE_const_cast (TAO_Priority_Mapping_Manager_out &, p).ptr_) + : ptr_ (const_cast<TAO_Priority_Mapping_Manager_out &> (p).ptr_) {} ACE_INLINE ::TAO_Priority_Mapping_Manager_out & TAO_Priority_Mapping_Manager_out::operator= (const ::TAO_Priority_Mapping_Manager_out &p) { - this->ptr_ = ACE_const_cast (TAO_Priority_Mapping_Manager_out&, p).ptr_; + this->ptr_ = const_cast<TAO_Priority_Mapping_Manager_out&> (p).ptr_; return *this; } diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 757beea5e38..eff4b4a1520 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -69,8 +69,7 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint ( /// Cast to TAO_ClientProtocolPolicy TAO_ClientProtocolPolicy *tao_client_protocol_policy = - ACE_static_cast (TAO_ClientProtocolPolicy *, - client_protocol_policy.in ()); + static_cast<TAO_ClientProtocolPolicy *> (client_protocol_policy.in ()); /// Get the ProtocolList RTCORBA::ProtocolList &client_protocols = @@ -342,9 +341,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( if (!CORBA::is_nil (private_connection_policy.in ())) { private_connection_descriptor_property.init - (ACE_static_cast (long, - ACE_reinterpret_cast (ptrdiff_t, - r.stub ()))); + (static_cast<long> (reinterpret_cast<ptrdiff_t> (r.stub ()))); rt_transport_descriptor.insert (&private_connection_descriptor_property); } diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp index 78453c72188..d7d1ac44138 100644 --- a/TAO/tao/RTCORBA/RT_ORB.cpp +++ b/TAO/tao/RTCORBA/RT_ORB.cpp @@ -110,8 +110,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_RT_Mutex *tao_mutex = - ACE_dynamic_cast (TAO_RT_Mutex *, - mutex); + dynamic_cast<TAO_RT_Mutex *> (mutex); // If this mutex is named, then we need to remove it from our table. // Otherwise, we don't have to do anything. diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 7adaebcf324..abcc9239638 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -140,8 +140,7 @@ TAO_PriorityModelPolicy::_tao_scope (void) const // server priority field is set dynamically depending on the model // and the servant's priority. Therefore, it can't be simply // copied to the list of client exposed policies. - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_ORB_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); } @@ -233,8 +232,7 @@ TAO_ThreadpoolPolicy::_tao_cached_type (void) const TAO_Policy_Scope TAO_ThreadpoolPolicy::_tao_scope (void) const { - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_ORB_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); } @@ -312,8 +310,7 @@ TAO_PrivateConnectionPolicy::_tao_cached_type (void) const TAO_Policy_Scope TAO_PrivateConnectionPolicy::_tao_scope (void) const { - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_OBJECT_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_OBJECT_SCOPE | TAO_POLICY_THREAD_SCOPE | TAO_POLICY_ORB_SCOPE); } @@ -429,8 +426,7 @@ TAO_PriorityBandedConnectionPolicy::_tao_cached_type (void) const TAO_Policy_Scope TAO_PriorityBandedConnectionPolicy::_tao_scope (void) const { - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_DEFAULT_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); } @@ -535,8 +531,7 @@ TAO_ServerProtocolPolicy::_tao_cached_type (void) const TAO_Policy_Scope TAO_ServerProtocolPolicy::_tao_scope (void) const { - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_ORB_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_ORB_SCOPE | TAO_POLICY_POA_SCOPE); } @@ -646,8 +641,7 @@ TAO_ClientProtocolPolicy::_tao_cached_type (void) const TAO_Policy_Scope TAO_ClientProtocolPolicy::_tao_scope (void) const { - return ACE_static_cast (TAO_Policy_Scope, - TAO_POLICY_DEFAULT_SCOPE | + return static_cast<TAO_Policy_Scope> (TAO_POLICY_DEFAULT_SCOPE | TAO_POLICY_CLIENT_EXPOSED); } diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 7493930e3be..b6d22045983 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -92,8 +92,7 @@ TAO_RT_Protocols_Hooks::server_protocol_properties (IOP::ProfileId protocol_tag, return 0; TAO_ServerProtocolPolicy *server_protocols = - ACE_dynamic_cast (TAO_ServerProtocolPolicy *, - server_protocol_policy.in ()); + dynamic_cast<TAO_ServerProtocolPolicy *> (server_protocol_policy.in ()); if (server_protocols == 0) return 0; @@ -130,8 +129,7 @@ TAO_RT_Protocols_Hooks::client_protocol_properties (IOP::ProfileId protocol_tag, return 0; TAO_ClientProtocolPolicy *client_protocols = - ACE_dynamic_cast (TAO_ClientProtocolPolicy *, - client_protocol_policy.in ()); + dynamic_cast<TAO_ClientProtocolPolicy *> (client_protocol_policy.in ()); if (client_protocols == 0) return 0; @@ -575,8 +573,7 @@ TAO_RT_Protocols_Hooks::rt_service_context ( if (!restart) { TAO_RT_Stub *rt_stub = - ACE_dynamic_cast (TAO_RT_Stub *, - stub); + dynamic_cast<TAO_RT_Stub *> (stub); CORBA::Policy_var priority_model_policy = rt_stub->get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL @@ -622,8 +619,7 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook ( ACE_CHECK; TAO_PriorityModelPolicy *priority_model = - ACE_static_cast (TAO_PriorityModelPolicy *, - model_policy_ptr.in ()); + static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ()); if (priority_model->get_priority_model () == RTCORBA::CLIENT_PROPAGATED) { @@ -652,8 +648,7 @@ TAO_RT_Protocols_Hooks::get_selector_hook ( RTCORBA::PriorityModelPolicy::_narrow (model_policy); TAO_PriorityModelPolicy *priority_model_policy = - ACE_static_cast (TAO_PriorityModelPolicy *, - model_policy_ptr.in ()); + static_cast<TAO_PriorityModelPolicy *> (model_policy_ptr.in ()); if (priority_model_policy->get_priority_model () == RTCORBA::CLIENT_PROPAGATED) @@ -682,8 +677,7 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook ( RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands_policy); TAO_PriorityBandedConnectionPolicy *priority_bands_policy = - ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, - bands_policy_ptr.in ()); + static_cast<TAO_PriorityBandedConnectionPolicy *> (bands_policy_ptr.in ()); // Find the band with the range covering our target priority. RTCORBA::PriorityBands &bands = diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp index 8edb28797ea..ee6e6611302 100644 --- a/TAO/tao/RTCORBA/RT_Stub.cpp +++ b/TAO/tao/RTCORBA/RT_Stub.cpp @@ -219,8 +219,7 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_PriorityBandedConnectionPolicy *override_policy = - ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, - override_policy_var.in ()); + static_cast<TAO_PriorityBandedConnectionPolicy *> (override_policy_var.in ()); RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var = RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in () @@ -228,8 +227,7 @@ TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_PriorityBandedConnectionPolicy *exposed_policy = - ACE_static_cast (TAO_PriorityBandedConnectionPolicy *, - exposed_policy_var.in ()); + static_cast<TAO_PriorityBandedConnectionPolicy *> (exposed_policy_var.in ()); // Both override and exposed have been set. // See if either of them has empty priority bands. @@ -272,8 +270,7 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_ClientProtocolPolicy *override_policy = - ACE_static_cast (TAO_ClientProtocolPolicy *, - override_policy_var.in ()); + static_cast<TAO_ClientProtocolPolicy *> (override_policy_var.in ()); RTCORBA::ClientProtocolPolicy_var exposed_policy_var = RTCORBA::ClientProtocolPolicy::_narrow (exposed.in () @@ -281,8 +278,7 @@ TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL) ACE_CHECK_RETURN (CORBA::Policy::_nil ()); TAO_ClientProtocolPolicy *exposed_policy = - ACE_static_cast (TAO_ClientProtocolPolicy *, - exposed_policy_var.in ()); + static_cast<TAO_ClientProtocolPolicy *> (exposed_policy_var.in ()); // Both override and exposed have been set. // See if either of them has empty priority bands. diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp index cc622e2a3c1..8eb6ded878a 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp @@ -75,8 +75,7 @@ CORBA::Boolean TAO_RT_Transport_Descriptor::is_equivalent (const TAO_Transport_Descriptor_Interface *other_prop) { const TAO_RT_Transport_Descriptor *rhs = - ACE_dynamic_cast (const TAO_RT_Transport_Descriptor*, - other_prop); + dynamic_cast<const TAO_RT_Transport_Descriptor*> (other_prop); if (rhs == 0) return 0; diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp index 1df477fce45..bc59aab60d0 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp @@ -39,8 +39,7 @@ CORBA::Boolean TAO_RT_Transport_Descriptor_Private_Connection_Property::is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) { const TAO_RT_Transport_Descriptor_Private_Connection_Property *rhs = - ACE_dynamic_cast (const TAO_RT_Transport_Descriptor_Private_Connection_Property*, - other_prop); + dynamic_cast<const TAO_RT_Transport_Descriptor_Private_Connection_Property*> (other_prop); return (rhs != 0 && this->object_id_ == rhs->object_id_); } @@ -69,8 +68,7 @@ CORBA::Boolean TAO_RT_Transport_Descriptor_Banded_Connection_Property::is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) { const TAO_RT_Transport_Descriptor_Banded_Connection_Property *rhs = - ACE_dynamic_cast (const TAO_RT_Transport_Descriptor_Banded_Connection_Property*, - other_prop); + dynamic_cast<const TAO_RT_Transport_Descriptor_Banded_Connection_Property*> (other_prop); return (rhs != 0 && this->low_priority_ == rhs->low_priority_ && diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp index 97242642f66..b05334a0dbe 100644 --- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp +++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp @@ -216,8 +216,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies ACE_CHECK; TAO_PriorityBandedConnectionPolicy *bands_policy = - ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *, - priority_bands.in ()); + dynamic_cast<TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ()); // If priority banded connections are set, make sure that: // 0. A priority model was specified. diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp index d7f7e8b0db7..830a49a42d6 100644 --- a/TAO/tao/RTScheduling/Current.cpp +++ b/TAO/tao/RTScheduling/Current.cpp @@ -254,8 +254,7 @@ TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current) TAO_TSS_RESOURCES::instance (); TAO_RTScheduler_Current_i *old = - ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); tss->rtscheduler_current_impl_ = new_current; return old; @@ -268,8 +267,7 @@ TAO_RTScheduler_Current::implementation (void) TAO_TSS_RESOURCES::instance (); TAO_RTScheduler_Current_i* impl = - ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); return impl; } @@ -955,7 +953,7 @@ CORBA::Object * TAO_RTScheduler_Current_var::upcast (void *src) { TAO_RTScheduler_Current **tmp = - ACE_static_cast (TAO_RTScheduler_Current **, src); + static_cast<TAO_RTScheduler_Current **> (src); return *tmp; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.i b/TAO/tao/RTScheduling/RTScheduler_Manager.i index 509027f2112..6f1009b016d 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.i +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.i @@ -131,7 +131,7 @@ ACE_INLINE CORBA::Object * TAO_RTScheduler_Manager_var::upcast (void *src) { TAO_RTScheduler_Manager **tmp = - ACE_static_cast (TAO_RTScheduler_Manager **, src); + static_cast<TAO_RTScheduler_Manager **> (src); return *tmp; } @@ -157,13 +157,13 @@ TAO_RTScheduler_Manager_out::TAO_RTScheduler_Manager_out (TAO_RTScheduler_Manage ACE_INLINE TAO_RTScheduler_Manager_out::TAO_RTScheduler_Manager_out (const ::TAO_RTScheduler_Manager_out &p) // copy constructor - : ptr_ (ACE_const_cast (TAO_RTScheduler_Manager_out &, p).ptr_) + : ptr_ (const_cast<TAO_RTScheduler_Manager_out &> (p).ptr_) {} ACE_INLINE ::TAO_RTScheduler_Manager_out & TAO_RTScheduler_Manager_out::operator= (const ::TAO_RTScheduler_Manager_out &p) { - this->ptr_ = ACE_const_cast (TAO_RTScheduler_Manager_out&, p).ptr_; + this->ptr_ = const_cast<TAO_RTScheduler_Manager_out&> (p).ptr_; return *this; } diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index 47af7c3dfcb..0050f5ce576 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -38,8 +38,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) { @@ -132,8 +131,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) current->scheduler ()->send_poll (ri); @@ -152,8 +150,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) current->scheduler ()->receive_reply (ri); } @@ -173,8 +170,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) { @@ -237,8 +233,7 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) current->scheduler ()->receive_other (ri); @@ -399,8 +394,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) { @@ -424,8 +418,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri current->cleanup_current (); // Get the previous current if any. - prev_current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_previous_current_impl_); + prev_current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_previous_current_impl_); // Restore the previous current. tss->rtscheduler_current_impl_ = prev_current; @@ -452,8 +445,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) { // Inform scheduler that upcall is complete. @@ -478,8 +470,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance (); - current = ACE_static_cast (TAO_RTScheduler_Current_i *, - tss->rtscheduler_current_impl_); + current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_); if (current != 0) { // Inform scheduler that upcall is complete. diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index e806e220410..50b11409ea4 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -119,7 +119,7 @@ TAO_Unbounded_String_Sequence::TAO_Unbounded_String_Sequence ( TAO_Unbounded_String_Sequence::allocbuf (this->maximum_); char ** const tmp2 = - ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_); + reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -151,8 +151,7 @@ TAO_Unbounded_String_Sequence::operator= ( if (this->release_) { - char ** tmp = ACE_reinterpret_cast (char **, - this->buffer_); + char ** tmp = reinterpret_cast<char **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -184,8 +183,7 @@ TAO_Unbounded_String_Sequence::operator= ( TAO_Unbounded_Base_Sequence::operator= (rhs); char ** tmp1 = reinterpret_cast <char **> (this->buffer_); - char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, - rhs.buffer_); + char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -200,8 +198,7 @@ TAO_Unbounded_String_Sequence::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); char ** const tmp = - ACE_reinterpret_cast (char ** ACE_CAST_CONST, - this->buffer_); + reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_); return TAO_SeqElem_String_Manager (tmp + slot, this->release_); } @@ -294,8 +291,7 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan) const char ** TAO_Unbounded_String_Sequence::get_buffer (void) const { - return ACE_reinterpret_cast (const char ** ACE_CAST_CONST, - this->buffer_); + return reinterpret_cast<const char ** ACE_CAST_CONST> (this->buffer_); } void @@ -418,8 +414,7 @@ TAO_Unbounded_WString_Sequence::TAO_Unbounded_WString_Sequence ( TAO_Unbounded_WString_Sequence::allocbuf (this->maximum_); CORBA::WChar ** const tmp2 = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -484,8 +479,7 @@ TAO_Unbounded_WString_Sequence::operator= ( CORBA::WChar ** tmp1 = reinterpret_cast <CORBA::WChar **> (this->buffer_); CORBA::WChar ** const tmp2 = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i=0; i < rhs.length_; ++i) { @@ -500,8 +494,7 @@ TAO_Unbounded_WString_Sequence::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); CORBA::WChar ** const tmp = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - this->buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_); return TAO_SeqElem_WString_Manager (tmp + slot, this->release_); } @@ -551,8 +544,7 @@ TAO_Unbounded_WString_Sequence::_tao_any_destructor ( ) { TAO_Unbounded_WString_Sequence * tmp = - ACE_static_cast (TAO_Unbounded_WString_Sequence *, - _tao_void_pointer); + static_cast<TAO_Unbounded_WString_Sequence *> (_tao_void_pointer); delete tmp; } @@ -572,8 +564,7 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan) } else { - result = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + result = reinterpret_cast<CORBA::WChar **> (this->buffer_); } } else // if (orphan == 1) @@ -582,8 +573,7 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan) { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + result = reinterpret_cast<CORBA::WChar **> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -597,8 +587,7 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan) const CORBA::WChar ** TAO_Unbounded_WString_Sequence::get_buffer (void) const { - return ACE_reinterpret_cast (const CORBA::WChar ** ACE_CAST_CONST, - this->buffer_); + return reinterpret_cast<const CORBA::WChar ** ACE_CAST_CONST> (this->buffer_); } void @@ -608,8 +597,7 @@ TAO_Unbounded_WString_Sequence::_allocate_buffer (CORBA::ULong length) if (this->buffer_ != 0) { - CORBA::WChar ** old = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** old = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -645,8 +633,7 @@ TAO_Unbounded_WString_Sequence::_deallocate_buffer (void) return; } - CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -665,8 +652,7 @@ void TAO_Unbounded_WString_Sequence::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { - CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { CORBA::wstring_free (tmp[i]); @@ -682,8 +668,7 @@ TAO_Unbounded_WString_Sequence::replace (CORBA::ULong maximum, { if (this->release_ == 1) { - CORBA::WChar **tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar **tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -718,8 +703,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::TAO_Unbounded_Sequence ( CORBA::Octet * const tmp2 = - ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_); #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) if (rhs.mb_ == 0) @@ -778,8 +762,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= ( if (this->maximum_ < rhs.length_) { // free the old buffer - CORBA::Octet * tmp = ACE_reinterpret_cast (CORBA::Octet *, - this->buffer_); + CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_); TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp); this->buffer_ = TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_); @@ -800,10 +783,9 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= ( TAO_Unbounded_Base_Sequence::operator= (rhs); - CORBA::Octet * tmp1 = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_); + CORBA::Octet * tmp1 = reinterpret_cast<CORBA::Octet *> (this->buffer_); CORBA::Octet * const tmp2 = - ACE_reinterpret_cast (CORBA::Octet * ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::Octet * ACE_CAST_CONST> (rhs.buffer_); #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) // for (CORBA::ULong i = 0; i < this->length_; ++i) @@ -907,7 +889,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan) else { result = - ACE_reinterpret_cast (CORBA::Octet*,this->buffer_); + reinterpret_cast<CORBA::Octet*> (this->buffer_); } } #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) @@ -928,7 +910,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan) { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast(CORBA::Octet *, this->buffer_); + result = reinterpret_cast<CORBA::Octet *> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -937,7 +919,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::get_buffer (CORBA::Boolean orphan) #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ else { - result = ACE_reinterpret_cast (CORBA::Octet*,this->buffer_); + result = reinterpret_cast<CORBA::Octet*> (this->buffer_); if (this->release_ != 0) { @@ -1009,8 +991,7 @@ void TAO_Unbounded_Sequence<CORBA::Octet>::_tao_any_destructor (void * x) { TAO_Unbounded_Sequence<CORBA::Octet> * tmp = - ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet> *, - x); + static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (x); delete tmp; } @@ -1021,8 +1002,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::_allocate_buffer (CORBA::ULong length) if (this->buffer_ != 0) { - CORBA::Octet * old = ACE_reinterpret_cast (CORBA::Octet *, - this->buffer_); + CORBA::Octet * old = reinterpret_cast<CORBA::Octet *> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -1054,7 +1034,7 @@ void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void) #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ && this->release_ != 0) { - CORBA::Octet * tmp = ACE_reinterpret_cast (CORBA::Octet *, this->buffer_); + CORBA::Octet * tmp = reinterpret_cast<CORBA::Octet *> (this->buffer_); TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp); } #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) @@ -1092,7 +1072,7 @@ TAO_Unbounded_Sequence<CORBA::Octet>::replace (CORBA::ULong max, if (this->buffer_ && this->release_ == 1) { CORBA::Octet * tmp = - ACE_reinterpret_cast(CORBA::Octet *, this->buffer_); + reinterpret_cast<CORBA::Octet *> (this->buffer_); TAO_Unbounded_Sequence<CORBA::Octet>::freebuf (tmp); } diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp index f3a23d998e7..2c5d5bea180 100644 --- a/TAO/tao/Sequence_T.cpp +++ b/TAO/tao/Sequence_T.cpp @@ -821,8 +821,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( if (this->release_) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -849,10 +848,8 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - T ** tmp1 = ACE_reinterpret_cast (T **, - this->buffer_); - T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + T ** tmp1 = reinterpret_cast<T **> (this->buffer_); + T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i=0; i < rhs.length_; ++i) { @@ -923,8 +920,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer ( return; } - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp); this->buffer_ = 0; this->length_ = 0; @@ -938,7 +934,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::_shrink_buffer ( CORBA::ULong ol ) { - T ** tmp = ACE_reinterpret_cast (T **, this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { @@ -974,8 +970,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence ( TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (this->maximum_); T ** const tmp2 = - ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -1009,8 +1004,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::operator= ( if (this->release_) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -1040,10 +1034,8 @@ TAO_Unbounded_Pseudo_Sequence<T>::operator= ( TAO_Unbounded_Base_Sequence::operator= (rhs); - T ** tmp1 = ACE_reinterpret_cast (T **, - this->buffer_); - T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + T ** tmp1 = reinterpret_cast<T **> (this->buffer_); + T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -1102,8 +1094,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length) if (this->buffer_ != 0) { - T ** old = ACE_reinterpret_cast (T **, - this->buffer_); + T ** old = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) // Only call duplicate when we did not own the previous @@ -1138,8 +1129,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::_deallocate_buffer (void) return; } - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -1159,7 +1149,7 @@ void TAO_Unbounded_Pseudo_Sequence<T>::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { - T ** tmp = ACE_static_cast (T **, this->buffer_); + T ** tmp = static_cast<T **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { @@ -1193,7 +1183,7 @@ TAO_Bounded_Pseudo_Sequence<T,MAX>::TAO_Bounded_Pseudo_Sequence ( TAO_Bounded_Pseudo_Sequence<T,MAX>::allocbuf (MAX); T ** const tmp2 = - ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_); + reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -1221,8 +1211,7 @@ TAO_Bounded_Pseudo_Sequence<T,MAX>::operator= ( if (this->release_) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -1247,10 +1236,8 @@ TAO_Bounded_Pseudo_Sequence<T,MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - T ** tmp1 = ACE_reinterpret_cast (T **, - this->buffer_); - T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, - rhs.buffer_); + T ** tmp1 = reinterpret_cast<T **> (this->buffer_); + T ** const tmp2 = reinterpret_cast<T ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i=0; i < rhs.length_; ++i) { @@ -1317,8 +1304,7 @@ TAO_Bounded_Pseudo_Sequence<T,MAX>::_deallocate_buffer (void) return; } - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); TAO_Bounded_Pseudo_Sequence<T,MAX>::freebuf (tmp); this->buffer_ = 0; this->length_ = 0; @@ -1330,8 +1316,7 @@ void TAO_Bounded_Pseudo_Sequence<T,MAX>::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { - T ** tmp = ACE_reinterpret_cast (T **, - this->buffer_); + T ** tmp = reinterpret_cast<T **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { @@ -1366,13 +1351,10 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::TAO_Unbounded_Array_Sequence ( { typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE; T * tmp1 = - ACE_reinterpret_cast ( - T *, - SEQ_TYPE::allocbuf (this->maximum_) + reinterpret_cast<T *> (SEQ_TYPE::allocbuf (this->maximum_) ); - const T * tmp2 = ACE_reinterpret_cast (const T *, - rhs.buffer_); + const T * tmp2 = reinterpret_cast<const T *> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { TAO::Array_Traits<T,T_slice,TAG>::copy (tmp1[i], tmp2[i]); @@ -1410,8 +1392,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= ( if (this->maximum_ < rhs.maximum_) { // free the old buffer - T * tmp = ACE_reinterpret_cast (T *, - this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp); if (rhs.maximum_ == 0) @@ -1447,10 +1428,8 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::operator= ( for (CORBA::ULong i = 0; i < rhs.length_; ++i) { TAO::Array_Traits<T,T_slice,TAG>::copy ( - ACE_reinterpret_cast (T *, - this->buffer_)[i], - ACE_reinterpret_cast (const T *, - rhs.buffer_)[i] + reinterpret_cast<T *> (this->buffer_)[i], + reinterpret_cast<const T *> (rhs.buffer_)[i] ); } @@ -1484,8 +1463,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer ( else { result = - ACE_reinterpret_cast (T *, - this->buffer_); + reinterpret_cast<T *> (this->buffer_); } } else @@ -1494,8 +1472,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::get_buffer ( { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast (T *, - this->buffer_); + result = reinterpret_cast<T *> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -1514,9 +1491,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_allocate_buffer ( { typedef TAO_Unbounded_Array_Sequence<T,T_slice,TAG> SEQ_TYPE; T * tmp = - ACE_reinterpret_cast ( - T *, - SEQ_TYPE::allocbuf (length) + reinterpret_cast<T *> (SEQ_TYPE::allocbuf (length) ); if (this->buffer_ != 0) @@ -1545,8 +1520,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::_deallocate_buffer (void) return; } - T * tmp = ACE_reinterpret_cast (T *, - this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp); this->buffer_ = 0; @@ -1567,8 +1541,7 @@ TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::replace (CORBA::ULong max, if (this->buffer_ && this->release_ == 1) { - T * tmp = ACE_reinterpret_cast (T *, - this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); TAO_Unbounded_Array_Sequence<T,T_slice,TAG>::freebuf (tmp); } @@ -1602,9 +1575,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::TAO_Bounded_Array_Sequence ( { typedef TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX> SEQ_TYPE; T * tmp1 = - ACE_reinterpret_cast ( - T *, - SEQ_TYPE::allocbuf (MAX) + reinterpret_cast<T *> (SEQ_TYPE::allocbuf (MAX) ); const T* tmp2 = (const T *) rhs.buffer_; @@ -1694,7 +1665,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (CORBA::Boolean orphan else { result = - ACE_reinterpret_cast (T *, this->buffer_); + reinterpret_cast<T *> (this->buffer_); } } else @@ -1702,7 +1673,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::get_buffer (CORBA::Boolean orphan if (this->release_ != 0) { // We set the state back to default and relinquish ownership. - result = ACE_reinterpret_cast(T *,this->buffer_); + result = reinterpret_cast<T *> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -1746,8 +1717,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::_deallocate_buffer (void) return; } - T * tmp = ACE_reinterpret_cast (T *, - this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp); @@ -1768,8 +1738,7 @@ TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::replace (CORBA::ULong max, if (this->buffer_ && this->release_ == 1) { - T * tmp = ACE_reinterpret_cast (T *, - this->buffer_); + T * tmp = reinterpret_cast<T *> (this->buffer_); TAO_Bounded_Array_Sequence<T,T_slice,TAG,MAX>::freebuf (tmp); } @@ -1802,8 +1771,7 @@ TAO_Bounded_String_Sequence<MAX>::TAO_Bounded_String_Sequence ( TAO_Bounded_String_Sequence<MAX>::allocbuf (this->maximum_); char ** const tmp2 = - ACE_reinterpret_cast (char ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -1831,8 +1799,7 @@ TAO_Bounded_String_Sequence<MAX>::operator= ( if (this->release_) { - char ** tmp = ACE_reinterpret_cast (char **, - this->buffer_); + char ** tmp = reinterpret_cast<char **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -1857,10 +1824,8 @@ TAO_Bounded_String_Sequence<MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - char ** tmp1 = ACE_reinterpret_cast (char **, - this->buffer_); - char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, - rhs.buffer_); + char ** tmp1 = reinterpret_cast<char **> (this->buffer_); + char ** const tmp2 = reinterpret_cast<char ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -1875,8 +1840,7 @@ TAO_SeqElem_String_Manager TAO_Bounded_String_Sequence<MAX>::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); - char ** const tmp = ACE_reinterpret_cast (char ** ACE_CAST_CONST, - this->buffer_); + char ** const tmp = reinterpret_cast<char ** ACE_CAST_CONST> (this->buffer_); return TAO_SeqElem_String_Manager (tmp + slot, this->release_); } @@ -1937,8 +1901,7 @@ TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void) return; } - char ** tmp = ACE_reinterpret_cast (char **, - this->buffer_); + char ** tmp = reinterpret_cast<char **> (this->buffer_); TAO_Bounded_String_Sequence<MAX>::freebuf (tmp); this->buffer_ = 0; this->length_ = 0; @@ -1950,8 +1913,7 @@ void TAO_Bounded_String_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { - char ** tmp = ACE_reinterpret_cast (char **, - this->buffer_); + char ** tmp = reinterpret_cast<char **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { @@ -2000,8 +1962,7 @@ TAO_Bounded_WString_Sequence<MAX>::TAO_Bounded_WString_Sequence ( TAO_Bounded_WString_Sequence<MAX>::allocbuf (this->maximum_); CORBA::WChar ** const tmp2 = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -2029,8 +1990,7 @@ TAO_Bounded_WString_Sequence<MAX>::operator= ( if (this->release_) { - CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) { @@ -2055,11 +2015,9 @@ TAO_Bounded_WString_Sequence<MAX>::operator= ( TAO_Bounded_Base_Sequence::operator= (rhs); - CORBA::WChar ** tmp1 = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** tmp1 = reinterpret_cast<CORBA::WChar **> (this->buffer_); CORBA::WChar ** const tmp2 = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - rhs.buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < rhs.length_; ++i) { @@ -2075,8 +2033,7 @@ TAO_Bounded_WString_Sequence<MAX>::operator[] (CORBA::ULong slot) const { TAO_SEQUENCE_ASSERT (slot, this->maximum_); CORBA::WChar ** const tmp = - ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST, - this->buffer_); + reinterpret_cast<CORBA::WChar ** ACE_CAST_CONST> (this->buffer_); return TAO_SeqElem_WString_Manager (tmp + slot, this->release_); } @@ -2139,8 +2096,7 @@ TAO_Bounded_WString_Sequence<MAX>::_deallocate_buffer (void) return; } - CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); TAO_Bounded_WString_Sequence<MAX>::freebuf (tmp); this->buffer_ = 0; this->length_ = 0; @@ -2152,8 +2108,7 @@ void TAO_Bounded_WString_Sequence<MAX>::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) { - CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **, - this->buffer_); + CORBA::WChar ** tmp = reinterpret_cast<CORBA::WChar **> (this->buffer_); for (CORBA::ULong i = nl; i < ol; ++i) { diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 1130801d00d..ac7765a5f84 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -139,8 +139,7 @@ TAO_DIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, pfile = mprofile.get_profile (i); if (pfile->tag () == TAO_TAG_DIOP_PROFILE) { - iiop_profile = ACE_dynamic_cast (TAO_DIOP_Profile *, - pfile); + iiop_profile = dynamic_cast<TAO_DIOP_Profile *> (pfile); break; } } @@ -199,7 +198,7 @@ int TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) { const TAO_DIOP_Endpoint *endp = - ACE_dynamic_cast (const TAO_DIOP_Endpoint *, endpoint); + dynamic_cast<const TAO_DIOP_Endpoint *> (endpoint); // Make sure the dynamically cast pointer is valid. if (endp == 0) @@ -252,10 +251,8 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core, return -1; if (major >=0 && minor >= 0) - this->version_.set_version (ACE_static_cast (CORBA::Octet, - major), - ACE_static_cast (CORBA::Octet, - minor)); + this->version_.set_version (static_cast<CORBA::Octet> (major), + static_cast<CORBA::Octet> (minor)); // Parse options if (this->parse_options (options) == -1) return -1; @@ -282,7 +279,7 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Now reset the port and set the host. if (addr.set (addr.get_port_number (), - ACE_static_cast (ACE_UINT32, INADDR_ANY), + static_cast<ACE_UINT32> (INADDR_ANY), 1) != 0) return -1; else @@ -360,10 +357,8 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, } if (major >=0 && minor >= 0) - this->version_.set_version (ACE_static_cast (CORBA::Octet, - major), - ACE_static_cast (CORBA::Octet, - minor)); + this->version_.set_version (static_cast<CORBA::Octet> (major), + static_cast<CORBA::Octet> (minor)); // Parse options if (this->parse_options (options) == -1) @@ -379,7 +374,7 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, ACE_INET_Addr addr; if (addr.set (static_cast<unsigned short> (0), - ACE_static_cast(ACE_UINT32, INADDR_ANY), + static_cast<ACE_UINT32> (INADDR_ANY), 1) != 0) return -1; @@ -555,9 +550,9 @@ TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) // in the list of interfaces to query for a hostname, otherwise // exclude it from the list. if (if_cnt == lo_cnt) - this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt); + this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt); else - this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt - lo_cnt); + this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt - lo_cnt); ACE_NEW_RETURN (this->addrs_, ACE_INET_Addr[this->endpoint_count_], @@ -612,7 +607,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) TAO_InputCDR cdr (profile.profile_data.mb ()); #else - TAO_InputCDR cdr (ACE_reinterpret_cast(char*,profile.profile_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()), profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ @@ -704,8 +699,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) if (j < option_count - 1) end = options.find (option_delimiter, begin); else - end = ACE_static_cast (int, - len - begin); // Handle last endpoint differently + end = static_cast<int> (len - begin); // Handle last endpoint differently if (end == begin) ACE_ERROR_RETURN ((LM_ERROR, @@ -717,7 +711,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) int slot = opt.find ("="); - if (slot == ACE_static_cast (int, len - 1) + if (slot == static_cast<int> (len - 1) || slot == ACE_CString::npos) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ") diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 54910624a03..fddf82d6106 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -241,8 +241,7 @@ TAO_DIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return 0; TAO_DIOP_Endpoint *diop_endpoint = - ACE_dynamic_cast (TAO_DIOP_Endpoint *, - endpoint ); + dynamic_cast<TAO_DIOP_Endpoint *> (endpoint ); if (diop_endpoint == 0) return 0; diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index 9ac0cdde44f..f10fb9c0f7e 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -166,11 +166,9 @@ TAO_DIOP_Endpoint::duplicate (void) CORBA::Boolean TAO_DIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) { - TAO_Endpoint *endpt = ACE_const_cast (TAO_Endpoint *, - other_endpoint); + TAO_Endpoint *endpt = const_cast<TAO_Endpoint *> (other_endpoint); - TAO_DIOP_Endpoint *endpoint = ACE_dynamic_cast (TAO_DIOP_Endpoint *, - endpt); + TAO_DIOP_Endpoint *endpoint = dynamic_cast<TAO_DIOP_Endpoint *> (endpt); if (endpoint == 0) return 0; @@ -215,8 +213,7 @@ TAO_DIOP_Endpoint::object_addr (void) const // We need to modify the object_addr_ in this method. Do so // using a non-const copy of the <this> pointer. TAO_DIOP_Endpoint *endpoint = - ACE_const_cast (TAO_DIOP_Endpoint *, - this); + const_cast<TAO_DIOP_Endpoint *> (this); ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index 6b556eab16d..af1c9aabad4 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -160,7 +160,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior tmp[length_port] = '\0'; this->endpoint_.port_ = - ACE_static_cast (CORBA::UShort, ACE_OS::atoi (tmp.in ())); + static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ())); length_host = cp_pos - ior; } @@ -219,7 +219,7 @@ CORBA::Boolean TAO_DIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) { const TAO_DIOP_Profile *op = - ACE_dynamic_cast (const TAO_DIOP_Profile *, other_profile); + dynamic_cast<const TAO_DIOP_Profile *> (other_profile); // Check endpoints equivalence. const TAO_DIOP_Endpoint *other_endp = &op->endpoint_; @@ -308,7 +308,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 1 /* object key separator */ + ACE_OS::strlen (key.in ())); - char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen)); + char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen)); static const char digits [] = "0123456789"; @@ -396,8 +396,7 @@ TAO_DIOP_Profile::encode_endpoints (void) IOP::TaggedComponent tagged_component; tagged_component.tag = TAO_TAG_ENDPOINTS; - tagged_component.component_data.length (ACE_static_cast (CORBA::ULong, - length)); + tagged_component.component_data.length (static_cast<CORBA::ULong> (length)); CORBA::Octet *buf = tagged_component.component_data.get_buffer (); @@ -429,14 +428,14 @@ TAO_DIOP_Profile::decode_endpoints (void) const CORBA::Octet *buf = tagged_component.component_data.get_buffer (); - TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf), + TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf), tagged_component.component_data.length ()); // Extract the Byte Order. CORBA::Boolean byte_order; if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return -1; - in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); + in_cdr.reset_byte_order (static_cast<int> (byte_order)); // Extract endpoints sequence. TAO::IIOPEndpointSequence endpoints; diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 8ebda1efd8c..80229c24def 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -206,7 +206,7 @@ int TAO_SCIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint) { const TAO_SCIOP_Endpoint *endp = - ACE_dynamic_cast (const TAO_SCIOP_Endpoint *, endpoint); + dynamic_cast<const TAO_SCIOP_Endpoint *> (endpoint); // Make sure the dynamically cast pointer is valid. if (endp == 0) @@ -288,7 +288,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // Now reset the port and set the host. if (addr.set (temp_addr.get_port_number (), - ACE_static_cast (ACE_UINT32, INADDR_ANY), + static_cast<ACE_UINT32> (INADDR_ANY), 1) != 0) return -1; else @@ -510,8 +510,8 @@ TAO_SCIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // address. ACE_Multihomed_INET_Addr addr; - if (addr.set (ACE_static_cast(u_short, 0), - ACE_static_cast(ACE_UINT32, INADDR_ANY), + if (addr.set (static_cast<u_short> (0), + static_cast<ACE_UINT32> (INADDR_ANY), 1) != 0) return -1; @@ -766,9 +766,9 @@ TAO_SCIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) // in the list of interfaces to query for a hostname, otherwise // exclude it from the list. if (if_cnt == lo_cnt) - this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt); + this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt); else - this->endpoint_count_ = ACE_static_cast (CORBA::ULong, if_cnt - lo_cnt); + this->endpoint_count_ = static_cast<CORBA::ULong> (if_cnt - lo_cnt); ACE_NEW_RETURN (this->addrs_, ACE_INET_Addr[this->endpoint_count_], @@ -897,7 +897,7 @@ TAO_SCIOP_Acceptor::object_key (IOP::TaggedProfile &profile, #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) TAO_InputCDR cdr (profile.profile_data.mb ()); #else - TAO_InputCDR cdr (ACE_reinterpret_cast(char*,profile.profile_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<char*> (profile.profile_data.get_buffer ()), profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ @@ -989,7 +989,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) if (j < option_count - 1) end = options.find (option_delimiter, begin); else - end = ACE_static_cast (CORBA::ULong, len) + end = static_cast<CORBA::ULong> (len) - begin; // Handle last endpoint differently if (end == begin) @@ -1002,7 +1002,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) int slot = opt.find ("="); - if (slot == ACE_static_cast (int, len - 1) + if (slot == static_cast<int> (len - 1) || slot == ACE_CString::npos) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) SCIOP option <%s> is ") @@ -1028,7 +1028,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) } else if (name == "portspan") { - int range = ACE_static_cast (int, ACE_OS::atoi (value.c_str ())); + int range = static_cast<int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) ACE_ERROR_RETURN ((LM_ERROR, @@ -1038,7 +1038,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) value.c_str (), ACE_MAX_DEFAULT_PORT), -1); - this->port_span_ = ACE_static_cast (u_short, range); + this->port_span_ = static_cast<u_short> (range); } else if (name == "hostname_in_ior") { diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp index f70dea4539d..45485461b0d 100644 --- a/TAO/tao/Strategies/SCIOP_Connector.cpp +++ b/TAO/tao/Strategies/SCIOP_Connector.cpp @@ -436,8 +436,7 @@ TAO_SCIOP_Connector::remote_endpoint (TAO_Endpoint *endpoint) return 0; TAO_SCIOP_Endpoint *sciop_endpoint = - ACE_dynamic_cast (TAO_SCIOP_Endpoint *, - endpoint ); + dynamic_cast<TAO_SCIOP_Endpoint *> (endpoint ); if (sciop_endpoint == 0) return 0; diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.cpp b/TAO/tao/Strategies/SCIOP_Endpoint.cpp index b6806457b62..9f3b206ba9f 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp @@ -177,10 +177,10 @@ CORBA::Boolean TAO_SCIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) { TAO_Endpoint *endpt = - ACE_const_cast (TAO_Endpoint *, other_endpoint); + const_cast<TAO_Endpoint *> (other_endpoint); TAO_SCIOP_Endpoint *endpoint = - ACE_dynamic_cast (TAO_SCIOP_Endpoint *, endpt); + dynamic_cast<TAO_SCIOP_Endpoint *> (endpt); if (endpoint == 0) return 0; diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 275e6fce242..cfac8eec957 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -179,7 +179,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior tmp[length_port] = '\0'; this->endpoint_.port_ = - ACE_static_cast (CORBA::UShort, ACE_OS::atoi (tmp.in ())); + static_cast<CORBA::UShort> (ACE_OS::atoi (tmp.in ())); length_host = cp_pos - ior; } @@ -239,7 +239,7 @@ CORBA::Boolean TAO_SCIOP_Profile::do_is_equivalent (const TAO_Profile *other_profile) { const TAO_SCIOP_Profile *op = - ACE_dynamic_cast (const TAO_SCIOP_Profile *, other_profile); + dynamic_cast<const TAO_SCIOP_Profile *> (other_profile); if (op == 0) return 0; @@ -331,7 +331,7 @@ TAO_SCIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 1 /* object key separator */ + ACE_OS::strlen (key.in ())); - char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen)); + char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen)); static const char digits [] = "0123456789"; @@ -468,14 +468,14 @@ TAO_SCIOP_Profile::decode_endpoints (void) const CORBA::Octet *buf = tagged_component.component_data.get_buffer (); - TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf), + TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf), tagged_component.component_data.length ()); // Extract the Byte Order. CORBA::Boolean byte_order; if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return -1; - in_cdr.reset_byte_order (ACE_static_cast(int, byte_order)); + in_cdr.reset_byte_order (static_cast<int> (byte_order)); // Extract endpoints sequence. TAO_SCIOPEndpointSequence endpoints; diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 0fbaca58cda..aa75017ed3b 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -251,7 +251,7 @@ TAO_SCIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr) if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return -1; - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int> (byte_order)); IIOP::ListenPointList listen_list; if ((cdr >> listen_list) == 0) @@ -317,8 +317,7 @@ TAO_SCIOP_Transport::get_listen_point ( TAO_Acceptor *acceptor) { TAO_SCIOP_Acceptor *sciop_acceptor = - ACE_dynamic_cast (TAO_SCIOP_Acceptor *, - acceptor ); + dynamic_cast<TAO_SCIOP_Acceptor *> (acceptor ); // Get the array of endpoints serviced by TAO_SCIOP_Acceptor const ACE_INET_Addr *endpoint_addr = diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index 581563cf34e..d843a8b2d14 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -70,8 +70,7 @@ TAO_UIOP_Endpoint::duplicate (void) CORBA::Boolean TAO_UIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint) { - TAO_Endpoint *endpt = ACE_const_cast (TAO_Endpoint *, - other_endpoint); + TAO_Endpoint *endpt = const_cast<TAO_Endpoint *> (other_endpoint); TAO_UIOP_Endpoint *endpoint = dynamic_cast<TAO_UIOP_Endpoint *> (endpt); diff --git a/TAO/tao/Strategies/sciop_endpoints.cpp b/TAO/tao/Strategies/sciop_endpoints.cpp index 13b9b279c2d..5eba45fa45c 100644 --- a/TAO/tao/Strategies/sciop_endpoints.cpp +++ b/TAO/tao/Strategies/sciop_endpoints.cpp @@ -34,7 +34,7 @@ CORBA::TypeCode_ptr _tc_TAO_SCIOP_Endpoint_Info = &_tc_TAO_tc_TAO_SCIOP_Endpoint void TAO_SCIOP_Endpoint_Info::_tao_any_destructor (void *x) { - TAO_SCIOP_Endpoint_Info *tmp = ACE_static_cast (TAO_SCIOP_Endpoint_Info*,x); + TAO_SCIOP_Endpoint_Info *tmp = static_cast<TAO_SCIOP_Endpoint_Info*> (x); delete tmp; } @@ -52,7 +52,7 @@ void TAO_SCIOP_Endpoint_Info::_tao_any_destructor (void *x) if (this->buffer_ != 0) { - TAO_SCIOP_Endpoint_Info *old = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info *,this->buffer_); + TAO_SCIOP_Endpoint_Info *old = reinterpret_cast<TAO_SCIOP_Endpoint_Info *> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; @@ -70,7 +70,7 @@ void TAO_SCIOP_Endpoint_Info::_tao_any_destructor (void *x) if (this->buffer_ == 0 || this->release_ == 0) return; - TAO_SCIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info *,this->buffer_); + TAO_SCIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_SCIOP_Endpoint_Info *> (this->buffer_); _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::freebuf (tmp); this->buffer_ = 0; @@ -127,7 +127,7 @@ TAO_SCIOPEndpointSequence::~TAO_SCIOPEndpointSequence (void) // dtor {} void TAO_SCIOPEndpointSequence::_tao_any_destructor (void *x) { - TAO_SCIOPEndpointSequence *tmp = ACE_static_cast (TAO_SCIOPEndpointSequence*,x); + TAO_SCIOPEndpointSequence *tmp = static_cast<TAO_SCIOPEndpointSequence*> (x); delete tmp; } diff --git a/TAO/tao/Strategies/sciop_endpoints.i b/TAO/tao/Strategies/sciop_endpoints.i index 7c4b76c3531..93fca367c2a 100644 --- a/TAO/tao/Strategies/sciop_endpoints.i +++ b/TAO/tao/Strategies/sciop_endpoints.i @@ -60,7 +60,7 @@ if (rhs.buffer_ != 0) { TAO_SCIOP_Endpoint_Info *tmp1 = _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::allocbuf (this->maximum_); - TAO_SCIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); + TAO_SCIOP_Endpoint_Info * const tmp2 = reinterpret_cast<TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; @@ -85,7 +85,7 @@ if (this->maximum_ < rhs.maximum_) { // free the old buffer - TAO_SCIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info *, this->buffer_); + TAO_SCIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_SCIOP_Endpoint_Info *> (this->buffer_); _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::freebuf (tmp); this->buffer_ = _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::allocbuf (rhs.maximum_); } @@ -95,8 +95,8 @@ TAO_Unbounded_Base_Sequence::operator= (rhs); - TAO_SCIOP_Endpoint_Info *tmp1 = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info *, this->buffer_); - TAO_SCIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); + TAO_SCIOP_Endpoint_Info *tmp1 = reinterpret_cast<TAO_SCIOP_Endpoint_Info *> (this->buffer_); + TAO_SCIOP_Endpoint_Info * const tmp2 = reinterpret_cast<TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; @@ -110,7 +110,7 @@ // operator [] { ACE_ASSERT (i < this->maximum_); - TAO_SCIOP_Endpoint_Info* tmp = ACE_reinterpret_cast(TAO_SCIOP_Endpoint_Info*,this->buffer_); + TAO_SCIOP_Endpoint_Info* tmp = reinterpret_cast<TAO_SCIOP_Endpoint_Info*> (this->buffer_); return tmp[i]; } @@ -119,7 +119,7 @@ // operator [] { ACE_ASSERT (i < this->maximum_); - TAO_SCIOP_Endpoint_Info * const tmp = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info* ACE_CAST_CONST, this->buffer_); + TAO_SCIOP_Endpoint_Info * const tmp = reinterpret_cast<TAO_SCIOP_Endpoint_Info* ACE_CAST_CONST> (this->buffer_); return tmp[i]; } @@ -140,7 +140,7 @@ } else { - result = ACE_reinterpret_cast (TAO_SCIOP_Endpoint_Info*, this->buffer_); + result = reinterpret_cast<TAO_SCIOP_Endpoint_Info*> (this->buffer_); } } else // if (orphan == 1) @@ -149,7 +149,7 @@ { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast(TAO_SCIOP_Endpoint_Info*,this->buffer_); + result = reinterpret_cast<TAO_SCIOP_Endpoint_Info*> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -162,7 +162,7 @@ ACE_INLINE const TAO_SCIOP_Endpoint_Info * _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::get_buffer (void) const { - return ACE_reinterpret_cast(const TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST, this->buffer_); + return reinterpret_cast<const TAO_SCIOP_Endpoint_Info * ACE_CAST_CONST> (this->buffer_); } ACE_INLINE void @@ -175,7 +175,7 @@ this->length_ = length; if (this->buffer_ && this->release_ == 1) { - TAO_SCIOP_Endpoint_Info *tmp = ACE_reinterpret_cast(TAO_SCIOP_Endpoint_Info*,this->buffer_); + TAO_SCIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_SCIOP_Endpoint_Info*> (this->buffer_); _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence::freebuf (tmp); } this->buffer_ = data; diff --git a/TAO/tao/Strategies/uiop_endpoints.cpp b/TAO/tao/Strategies/uiop_endpoints.cpp index b5d7e8c4242..1ae0241ac7b 100644 --- a/TAO/tao/Strategies/uiop_endpoints.cpp +++ b/TAO/tao/Strategies/uiop_endpoints.cpp @@ -32,7 +32,7 @@ CORBA::TypeCode_ptr _tc_TAO_UIOP_Endpoint_Info = &_tc_TAO_tc_TAO_UIOP_Endpoint_I void TAO_UIOP_Endpoint_Info::_tao_any_destructor (void *x) { - TAO_UIOP_Endpoint_Info *tmp = ACE_static_cast (TAO_UIOP_Endpoint_Info*,x); + TAO_UIOP_Endpoint_Info *tmp = static_cast<TAO_UIOP_Endpoint_Info*> (x); delete tmp; } @@ -50,7 +50,7 @@ void TAO_UIOP_Endpoint_Info::_tao_any_destructor (void *x) if (this->buffer_ != 0) { - TAO_UIOP_Endpoint_Info *old = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info *,this->buffer_); + TAO_UIOP_Endpoint_Info *old = reinterpret_cast<TAO_UIOP_Endpoint_Info *> (this->buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; @@ -68,7 +68,7 @@ void TAO_UIOP_Endpoint_Info::_tao_any_destructor (void *x) if (this->buffer_ == 0 || this->release_ == 0) return; - TAO_UIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info *,this->buffer_); + TAO_UIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_UIOP_Endpoint_Info *> (this->buffer_); _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::freebuf (tmp); this->buffer_ = 0; @@ -125,7 +125,7 @@ TAO_UIOPEndpointSequence::~TAO_UIOPEndpointSequence (void) // dtor {} void TAO_UIOPEndpointSequence::_tao_any_destructor (void *x) { - TAO_UIOPEndpointSequence *tmp = ACE_static_cast (TAO_UIOPEndpointSequence*,x); + TAO_UIOPEndpointSequence *tmp = static_cast<TAO_UIOPEndpointSequence*> (x); delete tmp; } diff --git a/TAO/tao/Strategies/uiop_endpoints.i b/TAO/tao/Strategies/uiop_endpoints.i index 9468dd21950..17eab0cb467 100644 --- a/TAO/tao/Strategies/uiop_endpoints.i +++ b/TAO/tao/Strategies/uiop_endpoints.i @@ -58,7 +58,7 @@ if (rhs.buffer_ != 0) { TAO_UIOP_Endpoint_Info *tmp1 = _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::allocbuf (this->maximum_); - TAO_UIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); + TAO_UIOP_Endpoint_Info * const tmp2 = reinterpret_cast<TAO_UIOP_Endpoint_Info * ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; @@ -83,7 +83,7 @@ if (this->maximum_ < rhs.maximum_) { // free the old buffer - TAO_UIOP_Endpoint_Info *tmp = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info *, this->buffer_); + TAO_UIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_UIOP_Endpoint_Info *> (this->buffer_); _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::freebuf (tmp); this->buffer_ = _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::allocbuf (rhs.maximum_); } @@ -93,8 +93,8 @@ TAO_Unbounded_Base_Sequence::operator= (rhs); - TAO_UIOP_Endpoint_Info *tmp1 = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info *, this->buffer_); - TAO_UIOP_Endpoint_Info * const tmp2 = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info * ACE_CAST_CONST, rhs.buffer_); + TAO_UIOP_Endpoint_Info *tmp1 = reinterpret_cast<TAO_UIOP_Endpoint_Info *> (this->buffer_); + TAO_UIOP_Endpoint_Info * const tmp2 = reinterpret_cast<TAO_UIOP_Endpoint_Info * ACE_CAST_CONST> (rhs.buffer_); for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; @@ -108,7 +108,7 @@ // operator [] { ACE_ASSERT (i < this->maximum_); - TAO_UIOP_Endpoint_Info* tmp = ACE_reinterpret_cast(TAO_UIOP_Endpoint_Info*,this->buffer_); + TAO_UIOP_Endpoint_Info* tmp = reinterpret_cast<TAO_UIOP_Endpoint_Info*> (this->buffer_); return tmp[i]; } @@ -117,7 +117,7 @@ // operator [] { ACE_ASSERT (i < this->maximum_); - TAO_UIOP_Endpoint_Info * const tmp = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info* ACE_CAST_CONST, this->buffer_); + TAO_UIOP_Endpoint_Info * const tmp = reinterpret_cast<TAO_UIOP_Endpoint_Info* ACE_CAST_CONST> (this->buffer_); return tmp[i]; } @@ -138,7 +138,7 @@ } else { - result = ACE_reinterpret_cast (TAO_UIOP_Endpoint_Info*, this->buffer_); + result = reinterpret_cast<TAO_UIOP_Endpoint_Info*> (this->buffer_); } } else // if (orphan == 1) @@ -147,7 +147,7 @@ { // We set the state back to default and relinquish // ownership. - result = ACE_reinterpret_cast(TAO_UIOP_Endpoint_Info*,this->buffer_); + result = reinterpret_cast<TAO_UIOP_Endpoint_Info*> (this->buffer_); this->maximum_ = 0; this->length_ = 0; this->buffer_ = 0; @@ -160,7 +160,7 @@ ACE_INLINE const TAO_UIOP_Endpoint_Info * _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::get_buffer (void) const { - return ACE_reinterpret_cast(const TAO_UIOP_Endpoint_Info * ACE_CAST_CONST, this->buffer_); + return reinterpret_cast<const TAO_UIOP_Endpoint_Info * ACE_CAST_CONST> (this->buffer_); } ACE_INLINE void @@ -173,7 +173,7 @@ this->length_ = length; if (this->buffer_ && this->release_ == 1) { - TAO_UIOP_Endpoint_Info *tmp = ACE_reinterpret_cast(TAO_UIOP_Endpoint_Info*,this->buffer_); + TAO_UIOP_Endpoint_Info *tmp = reinterpret_cast<TAO_UIOP_Endpoint_Info*> (this->buffer_); _TAO_Unbounded_Sequence_TAO_UIOPEndpointSequence::freebuf (tmp); } this->buffer_ = data; diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp index 3ad0c0c7b5f..a18b4e98ac2 100644 --- a/TAO/tao/Valuetype/AbstractBase.cpp +++ b/TAO/tao/Valuetype/AbstractBase.cpp @@ -129,7 +129,7 @@ CORBA::AbstractBase::_remove_ref (void) void CORBA::AbstractBase::_tao_any_destructor (void *x) { - CORBA::AbstractBase_ptr tmp = ACE_static_cast (CORBA::AbstractBase_ptr, x); + CORBA::AbstractBase_ptr tmp = static_cast<CORBA::AbstractBase_ptr> (x); CORBA::release (tmp); } diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl index 3468c13718a..96a071166d7 100644 --- a/TAO/tao/Valuetype/Sequence_T.inl +++ b/TAO/tao/Valuetype/Sequence_T.inl @@ -132,7 +132,7 @@ TAO_Unbounded_Valuetype_Sequence<T,T_var>::operator[] ( ) const { ACE_ASSERT (slot < this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_); } @@ -168,6 +168,6 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::operator[] ( ) const { ACE_ASSERT (slot < this->maximum_); - T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_); + T ** const tmp = reinterpret_cast<T ** ACE_CAST_CONST> (this->buffer_); return TAO_Valuetype_Manager<T,T_var> (tmp + slot, this->release_); } diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp index c8025ec12ed..8c1b9d25b46 100644 --- a/TAO/tao/Valuetype/ValueBase.cpp +++ b/TAO/tao/Valuetype/ValueBase.cpp @@ -63,7 +63,7 @@ CORBA::ValueBase::_downcast (CORBA::ValueBase *vt) void CORBA::ValueBase::_tao_any_destructor (void *x) { - CORBA::ValueBase *tmp = ACE_static_cast (CORBA::ValueBase *, x); + CORBA::ValueBase *tmp = static_cast<CORBA::ValueBase *> (x); CORBA::remove_ref (tmp); } @@ -500,8 +500,7 @@ operator<< (TAO_OutputCDR &strm, { return CORBA::ValueBase::_tao_marshal ( strm, - ACE_const_cast (CORBA::ValueBase *, - _tao_valuetype), + const_cast<CORBA::ValueBase *> (_tao_valuetype), (ptrdiff_t) &CORBA::ValueBase::_downcast ); } diff --git a/TAO/tao/Valuetype/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp index a8eac3ec938..0e16b990347 100644 --- a/TAO/tao/Valuetype/ValueFactory_Map.cpp +++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp @@ -54,7 +54,7 @@ TAO_ValueFactory_Map::rebind (const char *repo_id, if (ret == 1) // there was a previous factory { factory = prev_factory; - CORBA::string_free (ACE_const_cast(char*,prev_repo_id)); + CORBA::string_free (const_cast<char*> (prev_repo_id)); } } @@ -73,7 +73,7 @@ TAO_ValueFactory_Map::unbind (const char *repo_id, { // set factory to the previous factory, factory = prev_entry->int_id_; - char *temp = ACE_const_cast (char *, prev_entry->ext_id_); + char *temp = const_cast<char *> (prev_entry->ext_id_); ret = this->map_.unbind (prev_entry); if (ret == 0) diff --git a/TAO/tao/Valuetype/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp index 507177e74d8..ccd2ffcf704 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.cpp +++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp @@ -160,14 +160,14 @@ TAO_Value_Out_T<T>::TAO_Value_Out_T (TAO_Value_Var_T<T> & p) template <typename T> TAO_Value_Out_T<T>::TAO_Value_Out_T (const TAO_Value_Out_T<T> & p) - : ptr_ (ACE_const_cast (THIS_OUT_TYPE &, p).ptr_) + : ptr_ (const_cast<THIS_OUT_TYPE &> (p).ptr_) {} template <typename T> TAO_Value_Out_T<T> & TAO_Value_Out_T<T>::operator= (const TAO_Value_Out_T<T> & p) { - this->ptr_ = ACE_const_cast (THIS_OUT_TYPE &, p).ptr_; + this->ptr_ = const_cast<THIS_OUT_TYPE &> (p).ptr_; return *this; } |