diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
167 files changed, 589 insertions, 759 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 2683f611ed7..bc789ded026 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -2866,7 +2866,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos, result = this->mcast_entry_map_.find (mcast_key, entry); if (result == 0) { - mcast_addr = ACE_dynamic_cast (ACE_INET_Addr *, entry->address ()); + mcast_addr = dynamic_cast<ACE_INET_Addr *>(entry->address ()); char str_addr [BUFSIZ]; result = mcast_addr->addr_to_string (str_addr, BUFSIZ); if (result < 0) @@ -3066,7 +3066,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos, { TAO_FlowSpec_Entry *mcast_entry = 0; ACE_INET_Addr *mcast_addr; - mcast_addr = ACE_dynamic_cast (ACE_INET_Addr *, forward_entry->address ()); + mcast_addr = dynamic_cast<ACE_INET_Addr *>(forward_entry->address ()); if (mcast_addr == 0) ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect::Address missing in flowspec_entry\n"), 0); result = this->mcast_entry_map_.find (mcast_key, mcast_entry); @@ -5231,7 +5231,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter) else { substring = new_string.substring (pos); - pos = ACE_static_cast (int, new_string.length ()); + pos = static_cast<int>(new_string.length ()); } char *token = CORBA::string_dup (substring.c_str ()); result = this->token_array_.set (token, count); @@ -5281,7 +5281,7 @@ TAO_Tokenizer::token (void) int TAO_Tokenizer::num_tokens (void) { - return ACE_static_cast (int, this->num_tokens_); + return static_cast<int>(this->num_tokens_); } const char * diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp index f2628b87477..7a8b7b82606 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp @@ -411,8 +411,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint, } } - AVStreams::flowSpec new_flowspec (ACE_static_cast (CORBA::ULong, - flow_spec_set.size ())); + AVStreams::flowSpec new_flowspec (static_cast<CORBA::ULong>(flow_spec_set.size ())); int i=0; TAO_AV_FlowSpecSetItor connect_end = address_flow_set.end (); TAO_AV_FlowSpecSetItor connect = address_flow_set.begin (); diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index 442f8b04d09..f147a242045 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -556,7 +556,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (AC "%s:%s:%ld", "VDev", this->host_, - ACE_static_cast (long, this->pid_)); + static_cast<long>(this->pid_)); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name)); // create the name @@ -791,7 +791,7 @@ TAO_AV_Child_Process_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc "%s:%s:%ld", "Stream_Endpoint_A", this->host_, - ACE_static_cast (long, this->pid_)); + static_cast<long>(this->pid_)); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); this->stream_endpoint_name_.length (1); @@ -817,7 +817,7 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc "%s:%s:%ld", "Stream_Endpoint_B", this->host_, - ACE_static_cast (long, this->pid_)); + static_cast<long>(this->pid_)); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name)); this->stream_endpoint_name_.length (1); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index f29715633bf..be4bbc397b2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -199,7 +199,7 @@ TAO_FlowSpec_Entry::set_protocol (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n")); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->address_); char buf[BUFSIZ]; inet_addr->addr_to_string (buf,BUFSIZ); if (TAO_debug_level > 0) @@ -469,7 +469,7 @@ TAO_FlowSpec_Entry::get_local_addr_str (void) char [BUFSIZ], 0); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,this->local_addr_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *>(this->local_addr_); inet_addr->addr_to_string (buf,BUFSIZ); ACE_CString cstring (buf, 0, 0); @@ -650,7 +650,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SCTP_SEQ: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->address_); inet_addr->addr_to_string (address,BUFSIZ); } break; @@ -699,7 +699,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SCTP_SEQ: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->address_); control_port = inet_addr->get_port_number() + 1; ACE_INET_Addr *inet_control_addr; ACE_NEW_RETURN (inet_control_addr, @@ -730,7 +730,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SCTP_SEQ: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->peer_addr_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->peer_addr_); inet_addr->addr_to_string (address,BUFSIZ); //inet_addr->get_host_name (address, BUFSIZ); @@ -777,7 +777,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SCTP_SEQ: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->control_address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->control_address_); control_port = inet_addr->get_port_number(); } break; @@ -932,7 +932,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_SFP_UDP: case TAO_AV_Core::TAO_AV_USERDEFINED_UDP: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->address_); inet_addr->addr_to_string (address,BUFSIZ); } break; @@ -979,7 +979,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void) case TAO_AV_Core::TAO_AV_TCP: case TAO_AV_Core::TAO_AV_SCTP_SEQ: { - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->control_address_); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(this->control_address_); control_port = inet_addr->get_port_number(); } break; diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 53b7e2f1489..7ef539d2aac 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -117,7 +117,7 @@ TAO_AV_UDP_MCast_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value if (i->length () > 0) { iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ()); + iov[iovcnt].iov_len = static_cast<u_long>(i->length ()); iovcnt++; // The buffer is full make a OS call. @@ TODO this should diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index b4420b21ee5..f166914d97f 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -491,7 +491,7 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) if (TAO_debug_level > 0) { char buf [BUFSIZ]; - ACE_INET_Addr *remote_addr = ACE_dynamic_cast (ACE_INET_Addr*, address); + ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*>(address); remote_addr->addr_to_string (buf, BUFSIZ); @@ -502,12 +502,12 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address) ACE_INET_Addr *inet_addr = - ACE_dynamic_cast (ACE_INET_Addr*,address); + dynamic_cast<ACE_INET_Addr*>(address); this->peer_addr_ = *inet_addr; TAO_AV_UDP_QoS_Transport *transport = - ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_); + dynamic_cast<TAO_AV_UDP_QoS_Transport*>(this->transport_); if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER) { @@ -624,7 +624,7 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, if (i->length () > 0) { iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ()); + iov[iovcnt].iov_len = static_cast<u_long>(i->length ()); iovcnt++; // The buffer is full make a OS call. @@ TODO this should @@ -1174,7 +1174,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, if (entry->get_peer_addr () != 0) { - local_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->get_peer_addr ()); + local_addr = dynamic_cast<ACE_INET_Addr*>(entry->get_peer_addr ()); } else ACE_NEW_RETURN (local_addr, @@ -1194,8 +1194,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry, handler->flowspec_entry (this->entry_); handler->av_core (this->av_core_); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, - entry->address ()); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(entry->address ()); ACE_QoS_Params qos_params; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index a9a8236c777..cac59798968 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -48,7 +48,7 @@ int TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data, const ACE_Addr &peer_address) { - int length = ACE_static_cast (int, data->length ()); + int length = static_cast<int>(data->length ()); int more = length; char *buf_ptr = data->rd_ptr (); char first_rtcp_packet = 1; @@ -479,8 +479,7 @@ TAO_AV_RTCP_Object::handle_control_input (ACE_Message_Block *frame, int TAO_AV_RTCP_Object::handle_control_output (ACE_Message_Block *frame) { - TAO_AV_RTCP_Callback *cb = ACE_dynamic_cast (TAO_AV_RTCP_Callback*, - this->callback_); + TAO_AV_RTCP_Callback *cb = dynamic_cast<TAO_AV_RTCP_Callback*>(this->callback_); return cb->send_frame (frame); } @@ -488,8 +487,7 @@ TAO_AV_RTCP_Object::handle_control_output (ACE_Message_Block *frame) void TAO_AV_RTCP_Object::ts_offset (ACE_UINT32 ts_offset) { - TAO_AV_RTCP_Callback *cb = ACE_dynamic_cast (TAO_AV_RTCP_Callback*, - this->callback_); + TAO_AV_RTCP_Callback *cb = dynamic_cast<TAO_AV_RTCP_Callback*>(this->callback_); cb->ts_offset (ts_offset); } @@ -540,8 +538,7 @@ int TAO_AV_RTCP_Callback::send_report (int bye) { // get the RTCP control object in order to get the ssrc - TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*, - this->protocol_object_); + TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*>(this->protocol_object_); ACE_UINT32 my_ssrc = rtcp_prot_obj->ssrc (); RTCP_Packet *cp; @@ -784,7 +781,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame, { RTCP_Channel_In *c; - RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length())); + RTP_Packet packet (frame->rd_ptr(), static_cast<int>(frame->length())); if (this->inputs_.find (packet.ssrc(), c) < 0) { @@ -803,7 +800,7 @@ TAO_AV_RTCP_Callback::receive_frame (ACE_Message_Block *frame, int TAO_AV_RTCP_Callback::send_frame (ACE_Message_Block *frame) { - RTP_Packet packet (frame->rd_ptr(), ACE_static_cast (int, frame->length())); + RTP_Packet packet (frame->rd_ptr(), static_cast<int>(frame->length())); this->output_.updateStatistics (&packet); return 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp index 9be17255e06..69193ec9685 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.cpp @@ -20,8 +20,7 @@ RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc, no_data_counter_ (0), data_since_last_report_ (0) { - const ACE_INET_Addr *const_inet_addr = ACE_dynamic_cast (const ACE_INET_Addr*, - peer_addr); + const ACE_INET_Addr *const_inet_addr = dynamic_cast<const ACE_INET_Addr*>(peer_addr); ACE_INET_Addr *inet_addr; ACE_NEW (inet_addr, @@ -226,7 +225,7 @@ RTCP_Channel_In::recv_rtp_packet(ACE_Message_Block *mb, ACE_DEBUG ((LM_DEBUG, "RTCP_Channel_In::recv_rtp_packet - possible loop/collision detected")); - RTP_Packet data_packet(mb->rd_ptr (), ACE_static_cast (int, mb->length ())); + RTP_Packet data_packet(mb->rd_ptr (), static_cast<int>(mb->length ())); // make sure the packet is valid if (data_packet.is_valid ()) diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 8c0d3625d6e..c47f98e4cc0 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -97,7 +97,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list, { size_t text_length = ACE_OS::strlen(text); memcpy(this->reason_, text, text_length); - this->reason_length_ = ACE_static_cast (unsigned char, text_length); + this->reason_length_ = static_cast<unsigned char>(text_length); } else this->reason_length_ = 0; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index eeb27381690..3bfc756d0f7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -349,7 +349,7 @@ TAO_AV_RTP_Object::handle_input (void) char *data_ptr; ACE_UINT16 length; RTP_Packet rtp_packet(this->frame_.rd_ptr (), - ACE_static_cast (int, this->frame_.length ())); + static_cast<int>(this->frame_.length ())); rtp_packet.get_frame_info (&frame_info); rtp_packet.get_payload(&data_ptr, length); @@ -388,8 +388,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; - TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*, - this->control_object_); + TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*>(this->control_object_); // set the ssrc on the control object so the RTCP traffic can be matched // to the RTP traffic rtcp_prot_obj->ssrc(this->ssrc_); @@ -477,8 +476,7 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, if (result < 0) ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP::send_frame failed\n"),result); - TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*, - this->control_object_); + TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*>(this->control_object_); if (rtcp_prot_obj) rtcp_prot_obj->handle_control_output (&mb); @@ -512,8 +510,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; - TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*, - this->control_object_); + TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*>(this->control_object_); // set the ssrc on the control object so the RTCP traffic can be matched // to the RTP traffic rtcp_prot_obj->ssrc(this->ssrc_); @@ -670,7 +667,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list) case TAO_AV_PAYLOAD_TYPE_POLICY: { TAO_AV_Payload_Type_Policy *payload_policy = - ACE_static_cast (TAO_AV_Payload_Type_Policy *,policy); + static_cast<TAO_AV_Payload_Type_Policy *>(policy); if (payload_policy == 0) ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:Payload policy not defined\n"),-1); this->format_ = payload_policy->value (); @@ -679,7 +676,7 @@ TAO_AV_RTP_Object::set_policies (const TAO_AV_PolicyList &policy_list) case TAO_AV_SSRC_POLICY: { TAO_AV_SSRC_Policy *ssrc_policy = - ACE_static_cast (TAO_AV_SSRC_Policy *,policy); + static_cast<TAO_AV_SSRC_Policy *>(policy); if (ssrc_policy == 0) ACE_ERROR_RETURN ( (LM_ERROR,"TAO_AV_RTP_Object::send_frame:SSRC policy not defined\n"),-1); this->ssrc_ = ssrc_policy->value ();; @@ -697,8 +694,7 @@ void TAO_AV_RTP_Object::control_object (TAO_AV_Protocol_Object *object) { this->control_object_ = object; - TAO_AV_RTCP_Object *rtcp_prot_obj = ACE_dynamic_cast (TAO_AV_RTCP_Object*, - this->control_object_); + TAO_AV_RTCP_Object *rtcp_prot_obj = dynamic_cast<TAO_AV_RTCP_Object*>(this->control_object_); rtcp_prot_obj->ssrc (this->ssrc_); rtcp_prot_obj->ts_offset (this->timestamp_offset_); } diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp index d357b0fc287..b11a7c8767b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp @@ -76,7 +76,7 @@ TAO_AV_SCTP_SEQ_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value * if (i->length () > 0) { iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ()); + iov[iovcnt].iov_len = static_cast<u_long>(i->length ()); iovcnt++; // The buffer is full make a OS call. @@ TODO this should @@ -478,7 +478,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, else this->flowname_ = entry->flowname (); ACE_Addr *remote_addr = entry->address (); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,remote_addr); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *>(remote_addr); TAO_AV_SCTP_SEQ_Flow_Handler *handler = 0; ACE_Multihomed_INET_Addr remote_multi_addr; @@ -492,7 +492,7 @@ TAO_AV_SCTP_SEQ_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_INET_Addr *addr; if (entry->get_peer_addr () != 0) { - addr = ACE_dynamic_cast (ACE_INET_Addr *, entry->get_peer_addr ()); + addr = dynamic_cast<ACE_INET_Addr *>(entry->get_peer_addr ()); } else { diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index b6ca6136030..3bbea2b69d8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -67,7 +67,7 @@ TAO_AV_TCP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *) if (i->length () > 0) { iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ()); + iov[iovcnt].iov_len = static_cast<u_long>(i->length ()); iovcnt++; // The buffer is full make a OS call. @@ TODO this should @@ -416,7 +416,7 @@ TAO_AV_TCP_Connector::connect (TAO_FlowSpec_Entry *entry, else this->flowname_ = entry->flowname (); ACE_Addr *remote_addr = entry->address (); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr *,remote_addr); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *>(remote_addr); TAO_AV_TCP_Flow_Handler *handler; int result = this->connector_.connector_connect (handler, *inet_addr); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index 0c3e7bc36a2..fd75358b520 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -61,11 +61,9 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Flow_Handler::set_remote_address\n")); - ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, - address); + ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*>(address); this->peer_addr_ = *inet_addr; - TAO_AV_UDP_Transport *transport = ACE_dynamic_cast (TAO_AV_UDP_Transport*, - this->transport_); + TAO_AV_UDP_Transport *transport = dynamic_cast<TAO_AV_UDP_Transport*>(this->transport_); return transport->set_remote_address (*inet_addr); } @@ -224,7 +222,7 @@ TAO_AV_UDP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *) if (i->length () > 0) { iov[iovcnt].iov_base = i->rd_ptr (); - iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ()); + iov[iovcnt].iov_len = static_cast<u_long>(i->length ()); iovcnt++; // The buffer is full make a OS call. @@ TODO this should @@ -442,8 +440,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr, { flow_handler = this->entry_->control_handler (); - local_addr = ACE_dynamic_cast (ACE_INET_Addr*, - this->entry_->get_local_control_addr ()); + local_addr = dynamic_cast<ACE_INET_Addr*>(this->entry_->get_local_control_addr ()); } else { @@ -610,13 +607,13 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, if (flow_component == TAO_AV_Core::TAO_AV_CONTROL) { this->flowname_ = TAO_AV_Core::get_control_flowname (entry->flowname()); - inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->control_address ()); + inet_addr = dynamic_cast<ACE_INET_Addr*>(entry->control_address ()); } else { this->flowname_ = entry->flowname (); - inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->address ()); - control_inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, entry->control_address ()); + inet_addr = dynamic_cast<ACE_INET_Addr*>(entry->address ()); + control_inet_addr = dynamic_cast<ACE_INET_Addr*>(entry->control_address ()); } TAO_AV_Flow_Handler *flow_handler = 0; @@ -630,8 +627,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, flow_handler = this->entry_->control_handler (); flow_handler->set_remote_address (inet_addr); - local_addr = ACE_dynamic_cast (ACE_INET_Addr*, - this->entry_->get_local_control_addr ()); + local_addr = dynamic_cast<ACE_INET_Addr*>(this->entry_->get_local_control_addr ()); } else { @@ -647,7 +643,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_Addr *addr; if ((addr = entry->get_peer_addr ()) != 0) { - local_addr = ACE_dynamic_cast (ACE_INET_Addr*,addr); + local_addr = dynamic_cast<ACE_INET_Addr*>(addr); char buf [BUFSIZ]; local_addr->addr_to_string (buf, BUFSIZ); } @@ -675,8 +671,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, TAO_AV_Flow_Handler *control_flow_handler = 0; if (entry->is_multicast ()) - control_inet_addr = ACE_dynamic_cast (ACE_INET_Addr*, - entry->control_address ()) ; + control_inet_addr = dynamic_cast<ACE_INET_Addr*>(entry->control_address ()) ; else { @@ -698,7 +693,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry, ACE_INET_Addr ("0"), -1); else - control_inet_address_ = ACE_dynamic_cast (ACE_INET_Addr*,entry->control_address ()); + control_inet_address_ = dynamic_cast<ACE_INET_Addr*>(entry->control_address ()); } TAO_AV_UDP_Connection_Setup::setup (control_flow_handler, diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 616a56e0c73..022a6a13442 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -65,7 +65,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) return; } - frame_header_len = ACE_static_cast (u_int, output_cdr.total_length ()); + frame_header_len = static_cast<u_int>(output_cdr.total_length ()); // fill in the default fragment message fields. fragment.magic_number [0] = 'F'; fragment.magic_number [1] = 'R'; @@ -78,7 +78,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) return; } - fragment_len = ACE_static_cast (u_int, output_cdr.total_length ()); + fragment_len = static_cast<u_int>(output_cdr.total_length ()); // fill in the default Start message fields. start.magic_number [0] = '='; start.magic_number [1] = 'S'; @@ -94,7 +94,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) return; } - start_len = ACE_static_cast (u_int, output_cdr.total_length ()); + start_len = static_cast<u_int>(output_cdr.total_length ()); // fill in the default StartReply message fields. start_reply.magic_number [0] = '='; start_reply.magic_number [1] = 'S'; @@ -108,7 +108,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) return; } - start_reply_len = ACE_static_cast (u_int, output_cdr.total_length ()); + start_reply_len = static_cast<u_int>(output_cdr.total_length ()); // fill in the default Credit message fields. credit.magic_number [0] = '='; @@ -122,7 +122,7 @@ TAO_SFP_Base::TAO_SFP_Base (void) ACE_ERROR ((LM_ERROR, "TAO_SFP constructor\n")); return; } - credit_len = ACE_static_cast (u_int, output_cdr.total_length ()); + credit_len = static_cast<u_int>(output_cdr.total_length ()); } int @@ -284,8 +284,7 @@ TAO_SFP_Base::read_frame (TAO_AV_Transport *transport, ACE_NEW_RETURN (new_node, TAO_SFP_Fragment_Node, 0); - new_node->fragment_info_.frag_sz = ACE_static_cast (CORBA::ULong, - data->length ()); + new_node->fragment_info_.frag_sz = static_cast<CORBA::ULong>(data->length ()); new_node->fragment_info_.frag_number = 0; if (state.frame_.source_ids.length () > 0) new_node->fragment_info_.source_id = state.frame_.source_ids [0]; @@ -597,12 +596,11 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, TAO_OutputCDR &stream, ACE_Message_Block *mb) { - CORBA::ULong total_len = ACE_static_cast (CORBA::ULong, - stream.total_length ()); + CORBA::ULong total_len = static_cast<CORBA::ULong>(stream.total_length ()); if (mb != 0) { for (ACE_Message_Block *temp = mb;temp != 0;temp = temp->cont ()) - total_len += ACE_static_cast (CORBA::ULong, temp->length ()); + total_len += static_cast<CORBA::ULong>(temp->length ()); char *buf = (char *) stream.buffer (); size_t offset = TAO_SFP_MESSAGE_SIZE_OFFSET; @@ -619,8 +617,7 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = total_len; else - ACE_CDR::swap_4 (ACE_reinterpret_cast (char *, - &total_len), + ACE_CDR::swap_4 (reinterpret_cast<char *>(&total_len), buf + offset); #endif /* ACE_ENABLE_SWAP_ON_WRITE */ } @@ -714,7 +711,7 @@ TAO_SFP_Base::read_start_message (TAO_AV_Transport *transport, char *buf = input.rd_ptr (); int n = transport->recv (buf, start_len); - if (n != ACE_static_cast (int, start_len)) + if (n != static_cast<int>(start_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start\n"),0); else { @@ -734,7 +731,7 @@ TAO_SFP_Base::read_start_reply_message (TAO_AV_Transport *transport, char *buf = input.rd_ptr (); int n = transport->recv (buf, start_reply_len); - if (n != ACE_static_cast (int, start_len)) + if (n != static_cast<int>(start_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_start_reply_message"),0); else { @@ -753,7 +750,7 @@ TAO_SFP_Base::read_credit_message (TAO_AV_Transport *transport, char *buf = input.rd_ptr (); int n = transport->recv (buf, credit_len); - if (n != ACE_static_cast (int, credit_len)) + if (n != static_cast<int>(credit_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_credit_message"),0); else { @@ -772,7 +769,7 @@ TAO_SFP_Base::read_endofstream_message (TAO_AV_Transport *transport, char *buf = input.rd_ptr (); int n = transport->recv (buf, frame_header_len); - if (n != ACE_static_cast (int, frame_header_len)) + if (n != static_cast<int>(frame_header_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { @@ -792,7 +789,7 @@ TAO_SFP_Base::peek_frame_header (TAO_AV_Transport *transport, int n = transport->recv (buf, frame_header_len, MSG_PEEK); - if (n != ACE_static_cast (int, frame_header_len)) + if (n != static_cast<int>(frame_header_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { @@ -812,7 +809,7 @@ TAO_SFP_Base::peek_fragment_header (TAO_AV_Transport *transport, int n = transport->recv (buf, fragment_len, MSG_PEEK); - if (n != ACE_static_cast (int, fragment_len)) + if (n != static_cast<int>(fragment_len)) ACE_ERROR_RETURN ((LM_ERROR,"%p","TAO_SFP_Base::read_endofstream_message"),0); else { @@ -949,8 +946,7 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame, return 0; } size_t last_len,current_len; - int message_len = ACE_static_cast (int, - out_stream.total_length ()); + int message_len = static_cast<int>(out_stream.total_length ()); ACE_Message_Block *mb = frame; ACE_Message_Block *fragment_mb = this->get_fragment (mb, @@ -1100,7 +1096,7 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies) case TAO_AV_SFP_CREDIT_POLICY: { TAO_AV_SFP_Credit_Policy *credit_policy = - ACE_reinterpret_cast (TAO_AV_SFP_Credit_Policy*,policy); + reinterpret_cast<TAO_AV_SFP_Credit_Policy*>(policy); this->max_credit_ = credit_policy->value (); } default: diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp index 5a3cd81e26a..3f0e426e45f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp @@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void) "EC (%P|%t) getq error in Dispatching Queue\n")); TAO_CEC_Dispatch_Command *command = - ACE_dynamic_cast(TAO_CEC_Dispatch_Command*, mb); + dynamic_cast<TAO_CEC_Dispatch_Command*>(mb); if (command == 0) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h index 55f9282abe2..8f6340c3c64 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h @@ -105,7 +105,7 @@ public: { public: u_long operator() (PortableServer::ServantBase* const & ptr) const { - return ACE_reinterpret_cast(u_long, ptr); + return reinterpret_cast<u_long>(ptr); } }; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i index d503ac6da19..2a3b7fcb629 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i @@ -160,7 +160,7 @@ TAO_CEC_TypedEventChannel::supported_interface (void) const ACE_INLINE CORBA::RepositoryId TAO_CEC_TypedEventChannel::base_interfaces (CORBA::ULong index) const { - return ACE_const_cast (char *, this->base_interfaces_[index].in ()); + return const_cast<char *>(this->base_interfaces_[index].in ()); } ACE_INLINE CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp index c6cf8c280f3..f8d112d1068 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp @@ -19,7 +19,7 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg) if (arg != 0) { ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = - *ACE_static_cast(CORBA::Environment*, arg)); + *static_cast<CORBA::Environment*>(arg)); this->target_->connected_i (this->object_ ACE_ENV_ARG_PARAMETER); } @@ -41,7 +41,7 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg) if (arg != 0) { ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = - *ACE_static_cast(CORBA::Environment*, arg)); + *static_cast<CORBA::Environment*>(arg)); this->target_->reconnected_i (this->object_ ACE_ENV_ARG_PARAMETER); } @@ -62,7 +62,7 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg) if (arg != 0) { ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = - *ACE_static_cast(CORBA::Environment*, arg)); + *static_cast<CORBA::Environment*>(arg)); this->target_->disconnected_i (this->object_ ACE_ENV_ARG_PARAMETER); } @@ -83,7 +83,7 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg) if (arg != 0) { ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV = - *ACE_static_cast(CORBA::Environment*, arg)); + *static_cast<CORBA::Environment*>(arg)); this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER); } else diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i index 848e058cd6d..129518c2107 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i @@ -82,7 +82,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign, string_ (0) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer); + dynamic_cast<TAO_ETCL_Integer_Literal*>(integer); } ACE_INLINE @@ -91,7 +91,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string) integer_ (0) { this->string_ = - ACE_dynamic_cast (TAO_ETCL_String_Literal*, string); + dynamic_cast<TAO_ETCL_String_Literal*>(string); } ACE_INLINE int @@ -121,7 +121,7 @@ TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value, : component_ (component) { this->union_value_ = - ACE_dynamic_cast (TAO_ETCL_Union_Value*, union_value); + dynamic_cast<TAO_ETCL_Union_Value*>(union_value); } ACE_INLINE TAO_ETCL_Union_Value * @@ -144,7 +144,7 @@ TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos (TAO_ETCL_Constraint *integer, : component_ (component) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer); + dynamic_cast<TAO_ETCL_Integer_Literal*>(integer); } ACE_INLINE TAO_ETCL_Integer_Literal * @@ -167,7 +167,7 @@ TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc (TAO_ETCL_Constraint *identif : component_ (component) { this->identifier_ = - ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier); + dynamic_cast<TAO_ETCL_Identifier*>(identifier); } ACE_INLINE TAO_ETCL_Identifier * @@ -190,7 +190,7 @@ TAO_ETCL_Component_Array::TAO_ETCL_Component_Array (TAO_ETCL_Constraint *integer : component_ (component) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Integer_Literal*, integer); + dynamic_cast<TAO_ETCL_Integer_Literal*>(integer); } ACE_INLINE TAO_ETCL_Integer_Literal * @@ -227,7 +227,7 @@ TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier, : component_ (component) { this->identifier_ = - ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier); + dynamic_cast<TAO_ETCL_Identifier*>(identifier); } ACE_INLINE TAO_ETCL_Identifier * diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl index dd9532df920..aa29e2d4a3c 100644 --- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl +++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.inl @@ -33,7 +33,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (int sign, string_ (0) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer); + dynamic_cast<TAO_ETCL_Literal_Constraint*>(integer); } ACE_INLINE @@ -42,7 +42,7 @@ TAO_ETCL_Union_Value::TAO_ETCL_Union_Value (TAO_ETCL_Constraint *string) integer_ (0) { this->string_ = - ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, string); + dynamic_cast<TAO_ETCL_Literal_Constraint*>(string); } ACE_INLINE int @@ -72,7 +72,7 @@ TAO_ETCL_Union_Pos::TAO_ETCL_Union_Pos (TAO_ETCL_Constraint *union_value, : component_ (component) { this->union_value_ = - ACE_dynamic_cast (TAO_ETCL_Union_Value*, union_value); + dynamic_cast<TAO_ETCL_Union_Value*>(union_value); } ACE_INLINE TAO_ETCL_Union_Value * @@ -97,7 +97,7 @@ TAO_ETCL_Component_Pos::TAO_ETCL_Component_Pos ( : component_ (component) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer); + dynamic_cast<TAO_ETCL_Literal_Constraint*>(integer); } ACE_INLINE TAO_ETCL_Literal_Constraint * @@ -122,7 +122,7 @@ TAO_ETCL_Component_Assoc::TAO_ETCL_Component_Assoc ( : component_ (component) { this->identifier_ = - ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier); + dynamic_cast<TAO_ETCL_Identifier*>(identifier); } ACE_INLINE TAO_ETCL_Identifier * @@ -147,7 +147,7 @@ TAO_ETCL_Component_Array::TAO_ETCL_Component_Array ( : component_ (component) { this->integer_ = - ACE_dynamic_cast (TAO_ETCL_Literal_Constraint*, integer); + dynamic_cast<TAO_ETCL_Literal_Constraint*>(integer); } ACE_INLINE TAO_ETCL_Literal_Constraint * @@ -184,7 +184,7 @@ TAO_ETCL_Component::TAO_ETCL_Component (TAO_ETCL_Constraint *identifier, : component_ (component) { this->identifier_ = - ACE_dynamic_cast (TAO_ETCL_Identifier*, identifier); + dynamic_cast<TAO_ETCL_Identifier*>(identifier); } ACE_INLINE TAO_ETCL_Identifier * diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 0e781c19364..05f96a10b3e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -67,20 +67,18 @@ ACE_ES_Dispatch_Request::make_copy (RtecEventComm::EventSet &dest) const // buffer, without owning it, thus it is not removed! // @@ TODO Check what happens in the collocated case. dest.replace (1, 1, - ACE_const_cast(RtecEventComm::Event*, - &this->single_event_.event ()), + const_cast<RtecEventComm::Event*>(&this->single_event_.event ()), 0); } else if (this->event_set_.size () == 1) { dest.replace (1, 1, - ACE_const_cast(RtecEventComm::Event*, - &this->event_set_[0].event ()), + const_cast<RtecEventComm::Event*>(&this->event_set_[0].event ()), 0); } else { - dest.length (ACE_static_cast (CORBA::ULong, this->event_set_.size ())); + dest.length (static_cast<CORBA::ULong>(this->event_set_.size ())); int c = 0; for (CORBA::ULong i = 0; i < this->event_set_.size (); ++i) diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i index 1d4542b46cd..8605255f193 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i @@ -119,7 +119,7 @@ ACE_ES_Dispatch_Request::number_of_events (void) const if (this->use_single_event_) return 1; else - return ACE_static_cast (CORBA::ULong, this->event_set_.size ()); + return static_cast<CORBA::ULong>(this->event_set_.size ()); } ACE_INLINE RtecScheduler::OS_Priority diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 8c214f9e959..9ae881a2159 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -201,7 +201,7 @@ TAO_ECG_CDR_Message_Sender::send_fragment (const ACE_INET_Addr &addr, CORBA::ULong header[TAO_ECG_CDR_Message_Sender::ECG_HEADER_SIZE / sizeof(CORBA::ULong) + ACE_CDR::MAX_ALIGNMENT]; - char* buf = ACE_reinterpret_cast(char*,header); + char* buf = reinterpret_cast<char*>(header); TAO_OutputCDR cdr (buf, sizeof(header)); cdr.write_boolean (TAO_ENCAP_BYTE_ORDER); // Insert some known values in the padding bytes, so we can smoke diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp index 068957271f7..2fd81f81a60 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp @@ -152,7 +152,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, char* argv[]) { const char* opt = arg_shifter.get_current (); unsigned long tmp = ACE_OS::strtoul (opt, 0, 0) & 0xff; - this->ttl_value_ = ACE_static_cast (u_char, tmp); + this->ttl_value_ = static_cast<u_char>(tmp); arg_shifter.consume_arg (); } } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i index 3a38214b37c..c4b865612f8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i @@ -7,7 +7,7 @@ TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) , address_server_type_ (TAO_ECG_DEFAULT_ADDRESS_SERVER) , address_server_arg_ ((const char *) TAO_ECG_DEFAULT_ADDRESS_SERVER_ARG) , ttl_value_ (TAO_ECG_DEFAULT_TTL) - , nic_ (ACE_static_cast(const char *,TAO_ECG_DEFAULT_NIC)) + , nic_ (static_cast<const char *>(TAO_ECG_DEFAULT_NIC)) , ip_multicast_loop_ (TAO_ECG_DEFAULT_IP_MULTICAST_LOOP) , non_blocking_ (TAO_ECG_DEFAULT_NON_BLOCKING) , consumer_qos_ () @@ -21,7 +21,7 @@ TAO_ECG_Mcast_Gateway::Attributes::Attributes (void) , handler_type (TAO_ECG_DEFAULT_HANDLER) , service_type (TAO_ECG_DEFAULT_SERVICE) , ttl_value (TAO_ECG_DEFAULT_TTL) - , nic (ACE_static_cast(const char *,TAO_ECG_DEFAULT_NIC)) + , nic (static_cast<const char *>(TAO_ECG_DEFAULT_NIC)) , ip_multicast_loop (TAO_ECG_DEFAULT_IP_MULTICAST_LOOP) , non_blocking (TAO_ECG_DEFAULT_NON_BLOCKING) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index d3d8eb90a5e..7c19c2b941b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -49,7 +49,7 @@ TAO_EC_And_Filter::end (void) const int TAO_EC_And_Filter::size (void) const { - return ACE_static_cast (CORBA::ULong, this->n_); + return static_cast<CORBA::ULong>(this->n_); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index c9ec83bc658..0a42696f672 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -23,13 +23,13 @@ TAO_EC_Bitmask_Filter::~TAO_EC_Bitmask_Filter (void) TAO_EC_Filter::ChildrenIterator TAO_EC_Bitmask_Filter::begin (void) const { - return ACE_const_cast(TAO_EC_Filter**,&this->child_); + return const_cast<TAO_EC_Filter**>(&this->child_); } TAO_EC_Filter::ChildrenIterator TAO_EC_Bitmask_Filter::end (void) const { - return ACE_const_cast(TAO_EC_Filter**,&this->child_) + 1; + return const_cast<TAO_EC_Filter**>(&this->child_) + 1; } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index 67d42f4d31a..d2301294243 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -73,7 +73,7 @@ TAO_EC_Conjunction_Filter::end (void) const int TAO_EC_Conjunction_Filter::size (void) const { - return ACE_static_cast (int, this->n_); + return static_cast<int>(this->n_); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index 918859c6098..82b5e8dd084 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -49,7 +49,7 @@ TAO_EC_Disjunction_Filter::end (void) const int TAO_EC_Disjunction_Filter::size (void) const { - return ACE_static_cast (int, this->n_); + return static_cast<int>(this->n_); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index dcc485dc789..2e19a6da3f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -17,7 +17,7 @@ ACE_RCSID (Event, int TAO_EC_Queue::is_full_i (void) { - return ACE_static_cast (size_t, this->cur_count_) > this->high_water_mark_; + return static_cast<size_t>(this->cur_count_) > this->high_water_mark_; } // **************************************************************** @@ -39,7 +39,7 @@ TAO_EC_Dispatching_Task::svc (void) "EC (%P|%t) getq error in Dispatching Queue\n")); TAO_EC_Dispatch_Command *command = - ACE_dynamic_cast(TAO_EC_Dispatch_Command*, mb); + dynamic_cast<TAO_EC_Dispatch_Command*>(mb); if (command == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 5463f77f0c1..2be4f312eeb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -26,8 +26,7 @@ TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event, { TAO_EC_QOS_Info event_info; // @@ yuck... - filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&, - event), + filter->push_scheduled_event (const_cast<RtecEventComm::EventSet&>(event), event_info ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp index 5fce1a7cab8..97c3b4d1018 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp @@ -164,7 +164,7 @@ TAO_EC_Kokyu_Filter_Builder::build ( "can be established\n")); #endif TAO_EC_Kokyu_Filter* kokyu_filter = - ACE_dynamic_cast(TAO_EC_Kokyu_Filter*, filter); + dynamic_cast<TAO_EC_Kokyu_Filter*>(filter); //add the dependency between the root in the filter hierarchy and //the final consumer @@ -316,8 +316,7 @@ TAO_EC_Kokyu_Filter_Builder::recursive_build ( // Convert the time to the proper units.... RtecScheduler::Period_t period = - ACE_static_cast (RtecScheduler::Period_t, - e.header.creation_time); + static_cast<RtecScheduler::Period_t>(e.header.creation_time); #if 1 //by VS original code replaced with this RtecScheduler::RT_Info* consumer_rt_info_ptr; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp index dd857c059e8..13a83cfaa8a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp @@ -61,7 +61,7 @@ TAO_EC_Kokyu_Scheduling::schedule_event (const RtecEventComm::EventSet &event, { const RtecEventComm::Event& e = event[j]; RtecEventComm::Event* buffer = - ACE_const_cast(RtecEventComm::Event*, &e); + const_cast<RtecEventComm::Event*>(&e); RtecEventComm::EventSet single_event (1, 1, buffer, 0); TAO_EC_QOS_Info qos_info; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index 7b59fce7388..341b72bca78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -19,13 +19,13 @@ TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void) TAO_EC_Filter::ChildrenIterator TAO_EC_Negation_Filter::begin (void) const { - return ACE_const_cast(TAO_EC_Filter**,&this->child_); + return const_cast<TAO_EC_Filter**>(&this->child_); } TAO_EC_Filter::ChildrenIterator TAO_EC_Negation_Filter::end (void) const { - return ACE_const_cast(TAO_EC_Filter**,&this->child_) + 1; + return const_cast<TAO_EC_Filter**>(&this->child_) + 1; } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index d99b8ae69ea..3d97f0b6893 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -28,7 +28,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, { const RtecEventComm::Event& e = event[j]; RtecEventComm::Event* buffer = - ACE_const_cast(RtecEventComm::Event*, &e); + const_cast<RtecEventComm::Event*>(&e); RtecEventComm::EventSet single_event (1, 1, buffer, 0); TAO_EC_QOS_Info event_info; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 3149420a6f1..d8758ccd1f7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -147,7 +147,7 @@ TAO_EC_Basic_ObserverStrategy::create_observer_list ( RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR()); ACE_CHECK_RETURN (0); - int size = ACE_static_cast (int, this->observers_.current_size ()); + int size = static_cast<int>(this->observers_.current_size ()); RtecEventChannelAdmin::Observer_var *tmp; ACE_NEW_RETURN (tmp, RtecEventChannelAdmin::Observer_var[size], @@ -288,8 +288,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( dep.length (ACE_static_cast (CORBA::ULong, headers.current_size () + 1)); dep[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR; - dep[0].event.header.source = ACE_static_cast (CORBA::ULong, - headers.current_size ()); + dep[0].event.header.source = static_cast<CORBA::ULong>(headers.current_size ()); dep[0].event.header.creation_time = ORBSVCS_Time::zero (); dep[0].rt_info = 0; @@ -312,8 +311,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; - qos.publications.length (ACE_static_cast (CORBA::ULong, - headers.current_size ())); + qos.publications.length (static_cast<CORBA::ULong>(headers.current_size ())); CORBA::ULong count = 0; for (HeadersIterator i = headers.begin (); i != headers.end (); ++i) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index d57458dac62..54521467b64 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -62,7 +62,7 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event { const RtecEventComm::Event& e = event[j]; RtecEventComm::Event* buffer = - ACE_const_cast(RtecEventComm::Event*, &e); + const_cast<RtecEventComm::Event*>(&e); RtecEventComm::EventSet single_event (1, 1, buffer, 0); TAO_EC_QOS_Info qos_info; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index ea22992bf90..b8df32ca1c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -273,7 +273,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, RtecEventComm::PushConsumer_var consumer = RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ()); - this->pre_dispatch_hook (ACE_const_cast (RtecEventComm::EventSet&, event) + this->pre_dispatch_hook (const_cast<RtecEventComm::EventSet&>(event) ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp index 7006adac822..6b4ea295950 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp @@ -36,7 +36,7 @@ TAO_EC_Reactive_Timeout_Generator::schedule_timer ( const ACE_Time_Value& interval) { return this->reactor_->schedule_timer (&this->event_handler_, - ACE_static_cast(void*,filter), + static_cast<void*>(filter), delta, interval); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 4373aef1b62..151a9e802b2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -28,7 +28,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, // tv.sec (), tv.usec ())); TAO_EC_Timeout_Filter *filter = - ACE_static_cast(TAO_EC_Timeout_Filter*, ACE_const_cast(void*,vp)); + ACE_static_cast(TAO_EC_Timeout_Filter*, const_cast<void*>(vp)); if (filter == 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index b9e1a4f6890..909efa94054 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -273,7 +273,7 @@ public: { return ::new char[sizeof (Shutdown_Consumer)]; } void operator delete (void *buf) - { ::delete [] ACE_static_cast(char*,buf); } + { ::delete [] static_cast<char*>(buf); } #endif /* 0 */ // The module that we report to. @@ -302,7 +302,7 @@ public: { return ::new char[sizeof (Shutdown_Channel)]; } void operator delete (void *buf) - { ::delete [] ACE_static_cast(char*,buf); } + { ::delete [] static_cast<char*>(buf); } #endif ACE_EventChannel *channel_; @@ -410,7 +410,7 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event // in another thread!). Other ORBs may do different things and // this may not work! RtecEventComm::EventSet& copy = - ACE_const_cast (RtecEventComm::EventSet&, event); + const_cast<RtecEventComm::EventSet&>(event); this->time_stamp (copy); this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); @@ -967,7 +967,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval); return this->timer_module ()->schedule_timer (preemption_priority, - ACE_const_cast(ACE_Command_Base*,act), + const_cast<ACE_Command_Base*>(act), tv_delta, tv_interval); } diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp index 6416bfa411e..58d7aad00fb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp @@ -78,7 +78,7 @@ TAO_EC_ST_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t, const ACE_Time_Value& interval) { return this->reactor_->schedule_timer (&this->timeout_handler_, - ACE_static_cast(void*,act), + static_cast<void*>(act), delta, interval); } @@ -99,7 +99,7 @@ TAO_EC_ST_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t, } else act = ACE_reinterpret_cast (ACE_Command_Base *, - ACE_const_cast (void *, vp)); + const_cast<void *>(vp)); return result; } @@ -214,7 +214,7 @@ TAO_EC_RPT_Timer_Module::schedule_timer (RtecScheduler::Preemption_Priority_t pr { ACE_Reactor& reactor = this->GetReactorTask (priority)->get_reactor (); return reactor.schedule_timer (&this->timeout_handler_, - ACE_static_cast(void*,act), + static_cast<void*>(act), delta, interval); } @@ -236,7 +236,7 @@ TAO_EC_RPT_Timer_Module::cancel_timer (RtecScheduler::Preemption_Priority_t prio } else act = ACE_reinterpret_cast (ACE_Command_Base *, - ACE_const_cast (void *, vp)); + const_cast<void *>(vp)); return result; } @@ -262,7 +262,7 @@ TAO_EC_Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *vp) { ACE_Command_Base *act = ACE_static_cast(ACE_Command_Base*, - ACE_const_cast(void*,vp)); + const_cast<void*>(vp)); if (act == 0) ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Priority_Timer::handle_timeout: " diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp index 719ae0c489d..3d8838ef299 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp @@ -205,16 +205,14 @@ namespace TAO // Grab the object group version // @@ NOTE: This involves an allocation and a dellocation. This is // really bad. - TAO_InputCDR cdr (ACE_reinterpret_cast (const char*, - tp->component_data.get_buffer () - ), + TAO_InputCDR cdr (reinterpret_cast<const char*>(tp->component_data.get_buffer ()), tp->component_data.length ()); CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return; - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); FT::TagFTGroupTaggedComponent gtc; @@ -235,7 +233,7 @@ namespace TAO //ACE_THROW (CORBA::MARSHAL ()); CORBA::ULong length = - ACE_static_cast (CORBA::ULong, ocdr.total_length ()); + static_cast<CORBA::ULong>(ocdr.total_length ()); sc.context_data.length (length); CORBA::Octet *buf = sc.context_data.get_buffer (); @@ -324,7 +322,7 @@ namespace TAO // Make a *copy* of the CDR stream... CORBA::ULong length = - ACE_static_cast (CORBA::ULong, ocdr.total_length ()); + static_cast<CORBA::ULong>(ocdr.total_length ()); sc.context_data.length (length); CORBA::Octet *buf = sc.context_data.get_buffer (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index 0596352dba7..e8b7ec2c2d8 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -231,8 +231,7 @@ TAO_FT_IOGR_Property::set_primary ( cdr << ACE_OutputCDR::from_boolean (val); // Get the length of the CDR stream - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - cdr.total_length ()); + CORBA::ULong length = static_cast<CORBA::ULong>(cdr.total_length ()); // Set the length tagged_components.component_data.length (length); @@ -289,8 +288,7 @@ TAO_FT_IOGR_Property::encode_properties ( cdr << this->ft_group_tagged_component_->object_group_ref_version; // Get the length of the CDR stream - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - cdr.total_length ()); + CORBA::ULong length = static_cast<CORBA::ULong>(cdr.total_length ()); // Set the length tagged_components.component_data.length (length); @@ -377,10 +375,7 @@ TAO_FT_IOGR_Property::get_tagged_component ( // Look for the primary if (pfile_tagged.get_component (tc) == 1) { - TAO_InputCDR cdr (ACE_reinterpret_cast ( - const char*, - tc.component_data.get_buffer () - ), + TAO_InputCDR cdr (reinterpret_cast<const char*>(tc.component_data.get_buffer ()), tc.component_data.length ()); CORBA::Boolean byte_order; @@ -388,7 +383,7 @@ TAO_FT_IOGR_Property::get_tagged_component ( ACE_THROW_RETURN (CORBA::MARSHAL (), 0); - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); if ((cdr >> fgtc) == 1) return 1; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp index b9dfb0b5c85..cb04764a6fb 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp @@ -64,8 +64,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary ( { // Grab the forwarded list TAO_MProfile *prof_list = - ACE_const_cast (TAO_MProfile *, - r->stub ()->forward_profiles ()); + const_cast<TAO_MProfile *>(r->stub ()->forward_profiles ()); TAO_MProfile &basep = r->stub ()->base_profiles (); @@ -118,8 +117,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary ( { // Grab the forwarded list TAO_MProfile *prof_list = - ACE_const_cast (TAO_MProfile *, - r->stub ()->forward_profiles ()); + const_cast<TAO_MProfile *>(r->stub ()->forward_profiles ()); TAO_MProfile &basep = r->stub ()->base_profiles (); diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp index f0725986280..fd4d9462073 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp @@ -131,9 +131,7 @@ namespace TAO ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_InputCDR cdr (ACE_reinterpret_cast (const char*, - svc.context_data.get_buffer () - ), + TAO_InputCDR cdr (reinterpret_cast<const char*>(svc.context_data.get_buffer ()), svc.context_data.length ()); CORBA::Boolean byte_order; @@ -141,7 +139,7 @@ namespace TAO if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return; - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); FT::FTGroupVersionServiceContext fgvsc; diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index a370e8b9755..dbd0f8ba391 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -85,12 +85,10 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p, (that_comp.get_component (that_tc) == 1)) { - TAO_InputCDR this_cdr (ACE_reinterpret_cast (const char*, - this_tc.component_data.get_buffer ()), + TAO_InputCDR this_cdr (reinterpret_cast<const char*>(this_tc.component_data.get_buffer ()), this_tc.component_data.length ()); - TAO_InputCDR that_cdr (ACE_reinterpret_cast (const char*, - that_tc.component_data.get_buffer ()), + TAO_InputCDR that_cdr (reinterpret_cast<const char*>(that_tc.component_data.get_buffer ()), that_tc.component_data.length ()); CORBA::Boolean this_byte_order; @@ -103,8 +101,8 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p, return 0; } - this_cdr.reset_byte_order (ACE_static_cast (int, this_byte_order)); - that_cdr.reset_byte_order (ACE_static_cast (int, that_byte_order)); + this_cdr.reset_byte_order (static_cast<int>(this_byte_order)); + that_cdr.reset_byte_order (static_cast<int>(that_byte_order)); FT::TagFTGroupTaggedComponent this_group_component; @@ -149,8 +147,7 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p, return 0; // extract the group component - TAO_InputCDR cdr (ACE_reinterpret_cast (const char*, - tc.component_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<const char*>(tc.component_data.get_buffer ()), tc.component_data.length ()); CORBA::Boolean byte_order; @@ -159,7 +156,7 @@ TAO_FT_Service_Callbacks::hash_ft (TAO_Profile *p, return 0; } - cdr.reset_byte_order (ACE_static_cast(int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); FT::TagFTGroupTaggedComponent group_component; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp index 36fce09feb7..decffddd679 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp @@ -123,8 +123,7 @@ FTRT_ClientORB_Interceptor::receive_reply ( const char * buf = - ACE_reinterpret_cast (const char *, - service_context->context_data.get_buffer ()); + reinterpret_cast<const char *>(service_context->context_data.get_buffer ()); TAO_InputCDR cdr (buf, service_context->context_data.length ()); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index 5c9c7f79053..9a676edd992 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -541,7 +541,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAd PortableServer::POA_var poa = consumer_poa(); const PortableServer::Servant servant = poa->id_to_servant( - ACE_reinterpret_cast(const PortableServer::ObjectId& ,id) + reinterpret_cast<const PortableServer::ObjectId&>(id) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr obj = @@ -550,7 +550,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_supplier(const FtRtecEventChannelAd servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0") ); - return ACE_static_cast(TAO_FTEC_ProxyPushSupplier*, obj); + return static_cast<TAO_FTEC_ProxyPushSupplier*>(obj); } ACE_CATCHALL { } @@ -565,7 +565,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd PortableServer::POA_var poa= supplier_poa(); const PortableServer::Servant servant = poa->id_to_servant( - ACE_reinterpret_cast(const PortableServer::ObjectId& ,id) + reinterpret_cast<const PortableServer::ObjectId&>(id) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -575,7 +575,7 @@ TAO_FTEC_Event_Channel_Impl::find_proxy_push_consumer(const FtRtecEventChannelAd servant->_downcast ("IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0") ); - return ACE_static_cast(TAO_FTEC_ProxyPushConsumer*, obj); + return static_cast<TAO_FTEC_ProxyPushConsumer*>(obj); } ACE_CATCHALL { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp index f680af82ac5..335ca029120 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.cpp @@ -22,7 +22,7 @@ void FT_ProxyAdmin_Base::activate(const FtRtecEventComm::ObjectId& oid ACE_ENV_ARG_DECL) { poa_->activate_object_with_id( - ACE_reinterpret_cast(const PortableServer::ObjectId&, oid), + reinterpret_cast<const PortableServer::ObjectId&>(oid), servant_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index 9b809530f47..c066db2476a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -127,7 +127,7 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( typedef typename Proxy::Skeleton Skeleton; const PortableServer::Servant servant = poa_->id_to_servant( - ACE_reinterpret_cast(const PortableServer::ObjectId& ,proxy_state.object_id) + reinterpret_cast<const PortableServer::ObjectId&>(proxy_state.object_id) ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -135,7 +135,7 @@ void FT_ProxyAdmin<EC_PROXY_ADMIN, Proxy, ProxyInterface, State>::set_state( servant->_downcast(proxy_ior->_interface_repository_id())); ACE_CHECK; - ACE_static_cast(Proxy* , skeleton)->set_state(proxy_state + static_cast<Proxy*>(skeleton)->set_state(proxy_state ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp index 6ef6b3f84a7..91a64b11bfc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp @@ -137,9 +137,7 @@ void ForwardCtrlServerInterceptor::receive_request_service_contexts ( FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_context ACE_ENV_ARG_DECL) { - Safe_InputCDR cdr (ACE_reinterpret_cast (const char*, - service_context->context_data.get_buffer () - ), + Safe_InputCDR cdr (reinterpret_cast<const char*>(service_context->context_data.get_buffer ()), service_context->context_data.length ()); CORBA::Boolean byte_order; @@ -147,7 +145,7 @@ FT::ObjectGroupRefVersion get_ft_group_version(IOP::ServiceContext_var service_c if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28, CORBA::COMPLETED_NO), 0); - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); FT::FTGroupVersionServiceContext fgvsc; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 22a4e8e4c56..d533dd2cdbc 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -84,8 +84,7 @@ retrieve_ft_request_context( ACE_CHECK; const char * buf = - ACE_reinterpret_cast (const char *, - service_context->context_data.get_buffer ()); + reinterpret_cast<const char *>(service_context->context_data.get_buffer ()); Safe_InputCDR cdr (buf, service_context->context_data.length ()); @@ -95,7 +94,7 @@ retrieve_ft_request_context( if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_THROW (CORBA::BAD_PARAM ()); - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); if ((cdr >> ft_request_service_context) == 0) @@ -122,8 +121,7 @@ get_transaction_depth_context( ACE_ENDTRY; const char * buf = - ACE_reinterpret_cast (const char *, - service_context->context_data.get_buffer ()); + reinterpret_cast<const char *>(service_context->context_data.get_buffer ()); Safe_InputCDR cdr (buf, service_context->context_data.length ()); @@ -132,7 +130,7 @@ get_transaction_depth_context( if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1); - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); FTRT::TransactionDepth result; if ((cdr >> result) == 0) @@ -153,8 +151,7 @@ get_sequence_number_context( ACE_CHECK_RETURN(0); const char * buf = - ACE_reinterpret_cast (const char *, - service_context->context_data.get_buffer ()); + reinterpret_cast<const char *>(service_context->context_data.get_buffer ()); Safe_InputCDR cdr (buf, service_context->context_data.length ()); @@ -163,7 +160,7 @@ get_sequence_number_context( if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); if ((cdr >> result) == 0) ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp index ca8ae3c68e2..f4cc0ffa7eb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp @@ -190,15 +190,14 @@ IOGR_Maker::copy_ft_group_component(CORBA::Object_ptr ior) // @@ NOTE: This involves an allocation and a dellocation. This is // really bad. Safe_InputCDR cdr ( - ACE_reinterpret_cast (const char*, - tagged_components.component_data.get_buffer ()), + reinterpret_cast<const char*>(tagged_components.component_data.get_buffer ()), tagged_components.component_data.length ()); CORBA::Boolean byte_order; if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) return false; - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); return (cdr >> ft_tag_component_) != 0; } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp index 113b448cbd4..1ea3bb13cbb 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp @@ -54,8 +54,7 @@ SCTP_Connector::connect (ACE_SOCK_SEQPACK_Association &new_association, return -1; int result = ACE_OS::connect (new_association.get_handle (), - ACE_reinterpret_cast (sockaddr *, - remote_sap.get_addr ()), + reinterpret_cast<sockaddr *>(remote_sap.get_addr ()), remote_sap.get_size ()); return this->shared_connect_finish (new_association, diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index 09c90426f0f..daf8d6b7e78 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -19,7 +19,7 @@ activate_object_with_id (T * &result, const FtRtecEventComm::ObjectId &oid ACE_ENV_ARG_DECL_WITH_DEFAULTS) { - const PortableServer::ObjectId& id = ACE_reinterpret_cast(const PortableServer::ObjectId& ,oid); + const PortableServer::ObjectId& id = reinterpret_cast<const PortableServer::ObjectId&>(oid); poa->activate_object_with_id(id, servant ACE_ENV_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 8191b1709d6..542bbda9773 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -283,10 +283,8 @@ TAO::HTIOP::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; @@ -296,7 +294,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core, // @ Mostly the address is just a host:port but in case it is // host:port#token, remove the #token before this is processed // - priyanka - address = ACE_OS::strtok (ACE_const_cast (char *, address), "#"); + address = ACE_OS::strtok (const_cast<char *>(address), "#"); // In the common scenario, Acceptor is in the server that is // outside the firewall. It means the address that is sent to @@ -326,7 +324,7 @@ TAO::HTIOP::Acceptor::open (TAO_ORB_Core *orb_core, // Now reset the port and set the host. if (addr.ACE_INET_Addr::set (addr.get_port_number (), - ACE_static_cast (ACE_UINT32, INADDR_ANY), + static_cast<ACE_UINT32>(INADDR_ANY), 1) != 0) return -1; else @@ -424,10 +422,8 @@ TAO::HTIOP::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) @@ -468,7 +464,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core, ACE::HTBP::Addr addr; if (addr.ACE_INET_Addr::set (ACE_static_cast(u_short, 0), - ACE_static_cast(ACE_UINT32, INADDR_ANY), + static_cast<ACE_UINT32>(INADDR_ANY), 1) != 0) return -1; @@ -678,7 +674,7 @@ TAO::HTIOP::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); @@ -752,7 +748,7 @@ TAO::HTIOP::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 */ @@ -842,7 +838,7 @@ TAO::HTIOP::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) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp index 8f22da485d4..7d6b9cc530f 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp @@ -133,8 +133,7 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_open ( if (protocol_family == PF_INET6) { sockaddr_in6 local_inet6_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet6_addr), + ACE_OS::memset (reinterpret_cast<void *>(&local_inet6_addr), 0, sizeof local_inet6_addr); @@ -145,15 +144,13 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_open ( local_inet6_addr.sin6_addr = in6addr_any; } else - local_inet6_addr = *ACE_reinterpret_cast (sockaddr_in6 *, - local_addr.get_addr ()); + local_inet6_addr = *reinterpret_cast<sockaddr_in6 *>(local_addr.get_addr ()); // We probably don't need a bind_port written here. // There are currently no supported OS's that define // ACE_LACKS_WILDCARD_BIND. if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet6_addr), + reinterpret_cast<sockaddr *>(&local_inet6_addr), sizeof local_inet6_addr) == -1) error = 1; } @@ -162,8 +159,7 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_open ( if (protocol_family == PF_INET) { sockaddr_in local_inet_addr; - ACE_OS::memset (ACE_reinterpret_cast (void *, - &local_inet_addr), + ACE_OS::memset (reinterpret_cast<void *>(&local_inet_addr), 0, sizeof local_inet_addr); @@ -172,16 +168,14 @@ TAO::HTIOP::Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_open ( local_inet_addr.sin_port = 0; } else - local_inet_addr = *ACE_reinterpret_cast (sockaddr_in *, - local_addr.get_addr ()); + local_inet_addr = *reinterpret_cast<sockaddr_in *>(local_addr.get_addr ()); if (local_inet_addr.sin_port == 0) { if (ACE::bind_port (this->get_handle ()) == -1) error = 1; } else if (ACE_OS::bind (this->get_handle (), - ACE_reinterpret_cast (sockaddr *, - &local_inet_addr), + reinterpret_cast<sockaddr *>(&local_inet_addr), sizeof local_inet_addr) == -1) error = 1; } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp index 8eb3fb5cd67..48dc5a1d90d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp @@ -192,7 +192,7 @@ CORBA::Boolean TAO::HTIOP::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::HTIOP::Endpoint *endpoint = ACE_dynamic_cast (TAO::HTIOP::Endpoint *, endpt); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 7a7b5ffe167..eb299762625 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -303,7 +303,7 @@ TAO::HTIOP::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::HTIOP::Profile::encode_endpoints () 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,7 +428,7 @@ TAO::HTIOP::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. @@ -437,7 +436,7 @@ TAO::HTIOP::Profile::decode_endpoints (void) if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_ERROR_RETURN ((LM_ERROR,"boolean byte_order extraction failed\n"), -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. HTIOPEndpointSequence endpoints; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 498b351951d..245bbc35fde 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -284,7 +284,7 @@ TAO::HTIOP::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)); ::HTIOP::ListenPointList listen_list; if ((cdr >> listen_list) == 0) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp index 9e18492a64b..00e5e821599 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp @@ -108,7 +108,7 @@ TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "length", length); - return ACE_static_cast (CORBA::ULong, length); + return static_cast<CORBA::ULong>(length); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp index f8e25e5c3c9..a3953fbb3b2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp @@ -180,7 +180,7 @@ TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "mode", mode); - return ACE_static_cast (CORBA::AttributeMode, mode); + return static_cast<CORBA::AttributeMode>(mode); } void @@ -283,7 +283,7 @@ TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(path_queue.size ()); CORBA::ExceptionDefSeq *get_ed_seq = 0; ACE_NEW_THROW_EX (get_ed_seq, @@ -360,7 +360,7 @@ TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(path_queue.size ()); CORBA::ExceptionDefSeq *put_ed_seq = 0; ACE_NEW_THROW_EX (put_ed_seq, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp index cd49e0ae4e2..16cc5a7406c 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp @@ -30,8 +30,7 @@ TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::UsesDescriptionSeq>::get_is_multiple "is_multiple", is_multiple); desc_seq[index].is_multiple = - ACE_static_cast (CORBA::Boolean, - is_multiple); + static_cast<CORBA::Boolean>(is_multiple); } // Specialization. diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp index ca40188b501..0562d097470 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp @@ -202,7 +202,7 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL) length ); - char *data = ACE_static_cast (char *, ref); + char *data = static_cast<char *>(ref); ACE_Auto_Basic_Array_Ptr<char> safety (data); ACE_Message_Block mb (data, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp index 623e9ed06a1..585480843f1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp @@ -1142,7 +1142,7 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container "def_kind", kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); TAO_Contained_i *impl = this->repo_->select_contained (def_kind); impl->section_key (defn_key); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index b5c816176f7..49f7c5484f7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -154,7 +154,7 @@ TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL) "def_kind", kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); TAO_Contained_i *impl = this->repo_->select_contained (def_kind); impl->section_key (defn_key); @@ -278,7 +278,7 @@ TAO_Container_i::lookup_i (const char *search_name "def_kind", kind); - def_kind = ACE_static_cast (CORBA::DefinitionKind, kind); + def_kind = static_cast<CORBA::DefinitionKind>(kind); if (def_kind == CORBA::dk_Interface || def_kind == CORBA::dk_Value) @@ -477,7 +477,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); if (limit_type == CORBA::dk_all || limit_type == def_kind) @@ -525,7 +525,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type, } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(kind_queue.size ()); retval->length (size); for (CORBA::ULong j = 0; j < size; ++j) @@ -593,7 +593,7 @@ TAO_Container_i::lookup_name_i (const char *search_name, exclude_inherited ACE_ENV_ARG_PARAMETER); - CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(kind_queue.size ()); CORBA::ContainedSeq *holder; ACE_NEW_THROW_EX (holder, @@ -669,7 +669,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type, } else { - ret_len = length < ACE_static_cast (CORBA::ULong, max_returned_objs) + ret_len = length < static_cast<CORBA::ULong>(max_returned_objs) ? length : max_returned_objs; } @@ -1951,7 +1951,7 @@ TAO_Container_i::lookup_name_recursive ( kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); ACE_TString id; this->repo_->config ()->get_string_value (defn_key, @@ -2260,49 +2260,49 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key, { CORBA::Char x; cdr.read_char (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_wchar: { CORBA::WChar x; cdr.read_wchar (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_boolean: { CORBA::Boolean x; cdr.read_boolean (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_short: { CORBA::Short x; cdr.read_short (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_ushort: { CORBA::UShort x; cdr.read_ushort (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_long: { CORBA::Long x; cdr.read_long (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_ulong: { CORBA::ULong x; cdr.read_ulong (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } #if !defined (ACE_LACKS_LONGLONG_T) @@ -2311,7 +2311,7 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key, CORBA::LongLong x; cdr.read_longlong (x); // We could lose data here. - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } #endif /* ACE_LACKS_LONGLONG_T */ @@ -2320,14 +2320,14 @@ TAO_Container_i::store_label (ACE_Configuration_Section_Key key, CORBA::ULongLong x; cdr.read_ulonglong (x); // We could lose data here. - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } case CORBA::tk_enum: { CORBA::ULong x; cdr.read_ulong (x); - result = ACE_static_cast (u_int, x); + result = static_cast<u_int>(x); break; } default: @@ -2606,7 +2606,7 @@ TAO_Container_i::create_value_common ( TAO_IFR_Service_Utils::tmp_key_, "def_kind", kind); - def_kind = ACE_static_cast (CORBA::DefinitionKind, kind); + def_kind = static_cast<CORBA::DefinitionKind>(kind); if (def_kind == CORBA::dk_Interface) { diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp index 932031b6ca0..08ad8939df9 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp @@ -218,13 +218,13 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); kind_queue.enqueue_tail (def_kind); } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(kind_queue.size ()); CORBA::StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp index 547f64f983b..a8af266f294 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp @@ -248,13 +248,11 @@ TAO_ExtValueDef_i::describe_ext_value_i ( this->repo_->config ()->get_integer_value (this->section_key_, "is_abstract", val); - fv_desc->is_abstract = ACE_static_cast (CORBA::Boolean, - val); + fv_desc->is_abstract = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_integer_value (this->section_key_, "is_custom", val); - fv_desc->is_custom = ACE_static_cast (CORBA::Boolean, - val); + fv_desc->is_custom = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_string_value (this->section_key_, "container_id", holder); @@ -323,8 +321,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( this->repo_->config ()->get_integer_value (op_key, "mode", val); - fv_desc->operations[i].mode = ACE_static_cast (CORBA::OperationMode, - val); + fv_desc->operations[i].mode = static_cast<CORBA::OperationMode>(val); CORBA::TCKind kind = fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -401,8 +398,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( "mode", val); fv_desc->operations[i].parameters[j].mode = - ACE_static_cast (CORBA::ParameterMode, - val); + static_cast<CORBA::ParameterMode>(val); } } @@ -509,8 +505,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( "mode", val); fv_desc->attributes[i].mode = - ACE_static_cast (CORBA::AttributeMode, - val); + static_cast<CORBA::AttributeMode>(val); this->repo_->config ()->get_string_value (attr_key, "type_path", holder); @@ -595,8 +590,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( "access", val); fv_desc->members[i].access = - ACE_static_cast (CORBA::Visibility, - val); + static_cast<CORBA::Visibility>(val); // Use type path for 'type' and 'type_def', @@ -734,8 +728,7 @@ TAO_ExtValueDef_i::describe_ext_value_i ( this->repo_->config ()->get_integer_value (this->section_key_, "is_truncatable", val); - fv_desc->is_truncatable = ACE_static_cast (CORBA::Boolean, - val); + fv_desc->is_truncatable = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp index cf932d2a422..bfc3835aee2 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp @@ -910,8 +910,7 @@ TAO_HomeDef_i::fill_param_desc (ACE_Configuration_Section_Key &key, this->repo_->config ()->get_integer_value (param_key, "mode", val); - pd.mode = ACE_static_cast (CORBA::ParameterMode, - val); + pd.mode = static_cast<CORBA::ParameterMode>(val); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 8624e03d790..63fef42f507 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -1165,8 +1165,7 @@ TAO_IFR_Service_Utils::fill_valuemember_seq ( repo->config ()->get_integer_value (member_key, "access", access); - vm_seq[i].access = ACE_static_cast (CORBA::Visibility, - access); + vm_seq[i].access = static_cast<CORBA::Visibility>(access); } } @@ -1210,8 +1209,7 @@ TAO_IFR_Service_Utils::path_to_def_kind (ACE_TString &path, repo->config ()->get_integer_value (TAO_IFR_Service_Utils::tmp_key_, "def_kind", kind); - return ACE_static_cast (CORBA::DefinitionKind, - kind); + return static_cast<CORBA::DefinitionKind>(kind); } CORBA::DefinitionKind diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp index 6ec54be4d32..858401f5de6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp @@ -45,8 +45,7 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_POA_Current_Impl *pc_impl = - ACE_static_cast (TAO_POA_Current_Impl *, - TAO_TSS_RESOURCES::instance ()->poa_current_impl_); + static_cast<TAO_POA_Current_Impl *>(TAO_TSS_RESOURCES::instance ()->poa_current_impl_); PortableServer::ObjectId object_id; int status = TAO_POA::parse_ir_object_key (pc_impl->object_key (), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp index a3fc79484e2..78f5d055727 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp @@ -116,7 +116,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(key_queue.size ()); fifd->operations.length (size); for (i = 0; i < size; ++i) @@ -167,8 +167,7 @@ TAO_InterfaceAttrExtension_i::describe_ext_interface_i ( } } - size = ACE_static_cast (CORBA::ULong, - key_queue.size ()); + size = static_cast<CORBA::ULong>(key_queue.size ()); fifd->attributes.length (size); for (i = 0; i < size; ++i) diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp index 7e313b4f5e8..48b6c6dfc4f 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp @@ -213,7 +213,7 @@ TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL) this->base_interfaces_recursive (kind_queue, path_queue); - CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(kind_queue.size ()); CORBA::InterfaceDefSeq *seq = 0; ACE_NEW_THROW_EX (seq, @@ -489,7 +489,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(key_queue.size ()); fifd->operations.length (size); for (i = 0; i < size; ++i) @@ -540,7 +540,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL) } } - size = ACE_static_cast (CORBA::ULong, key_queue.size ()); + size = static_cast<CORBA::ULong>(key_queue.size ()); fifd->attributes.length (size); for (i = 0; i < size; ++i) @@ -1105,7 +1105,7 @@ TAO_InterfaceDef_i::base_interfaces_recursive ( "def_kind", kind); - def_kind = ACE_static_cast (CORBA::DefinitionKind, kind); + def_kind = static_cast<CORBA::DefinitionKind>(kind); kind_queue.enqueue_tail (def_kind); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp index c493695ce55..ddad4078e4a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp @@ -207,7 +207,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(key_queue.size ()); CORBA::ParDescriptionSeq *pd_seq = 0; ACE_NEW_THROW_EX (pd_seq, @@ -241,7 +241,7 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL) "mode", mode); - retval[i].mode = ACE_static_cast (CORBA::ParameterMode, mode); + retval[i].mode = static_cast<CORBA::ParameterMode>(mode); ACE_TString type_path; this->repo_->config ()->get_string_value (key, @@ -356,7 +356,7 @@ TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "mode", mode); - return ACE_static_cast (CORBA::OperationMode, mode); + return static_cast<CORBA::OperationMode>(mode); } void @@ -431,7 +431,7 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, context_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(context_queue.size ()); CORBA::ContextIdSeq *ci_seq = 0; ACE_NEW_THROW_EX (ci_seq, @@ -541,7 +541,7 @@ TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL ) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(path_queue.size ()); CORBA::ExceptionDefSeq *ed_seq = 0; ACE_NEW_THROW_EX (ed_seq, @@ -680,7 +680,7 @@ TAO_OperationDef_i::make_description ( } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, path_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(path_queue.size ()); od.exceptions.length (size); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp index 542d0f31a68..7b04b4348c7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp @@ -63,7 +63,7 @@ TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "pkind", pkind); - switch (ACE_static_cast (CORBA::PrimitiveKind, pkind)) + switch (static_cast<CORBA::PrimitiveKind>(pkind)) { case CORBA::pk_null: return CORBA::TypeCode::_duplicate (CORBA::_tc_null); @@ -135,6 +135,6 @@ TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "pkind", pkind); - return ACE_static_cast (CORBA::PrimitiveKind, pkind); + return static_cast<CORBA::PrimitiveKind>(pkind); } diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp index c57bd56ef5e..986b5cc86c4 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp @@ -95,7 +95,7 @@ TAO_Repository_i::lookup_id_i (const char *search_id kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); CORBA::Object_var obj = TAO_IFR_Service_Utils::create_objref (def_kind, @@ -666,8 +666,7 @@ TAO_Repository_i::create_sections (void) for (u_int i = 0; i < num_pkinds; ++i) { ACE_Configuration_Section_Key key; - CORBA::PrimitiveKind pkind = ACE_static_cast (CORBA::PrimitiveKind, - i); + CORBA::PrimitiveKind pkind = static_cast<CORBA::PrimitiveKind>(i); this->config_->open_section (this->pkinds_key_, this->pkind_to_string (pkind), @@ -909,7 +908,7 @@ TAO_Repository_i::select_container (CORBA::DefinitionKind def_kind) const case CORBA::dk_LocalInterface: return this->ExtLocalInterfaceDef_servant_->_tied_object (); case CORBA::dk_Repository: - return ACE_const_cast (TAO_Repository_i *, this); + return const_cast<TAO_Repository_i *>(this); case CORBA::dk_Struct: return this->StructDef_servant_->_tied_object (); case CORBA::dk_Union: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp index 46ee26abfb8..130c9882983 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp @@ -110,7 +110,7 @@ TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "bound", bound); - return ACE_static_cast (CORBA::ULong, bound); + return static_cast<CORBA::ULong>(bound); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp index 9920714050a..2d1003038d0 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp @@ -97,7 +97,7 @@ TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "bound", retval); - return ACE_static_cast (CORBA::ULong, retval); + return static_cast<CORBA::ULong>(retval); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp index 147ca3cc548..c0362f74cd3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp @@ -180,13 +180,13 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) kind); CORBA::DefinitionKind def_kind = - ACE_static_cast (CORBA::DefinitionKind, kind); + static_cast<CORBA::DefinitionKind>(kind); kind_queue.enqueue_tail (def_kind); } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, kind_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(kind_queue.size ()); CORBA::StructMemberSeq *members = 0; ACE_NEW_THROW_EX (members, diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp index 5886ea613f0..7e60ae571de 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp @@ -270,7 +270,7 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL) } } - CORBA::ULong size = ACE_static_cast (CORBA::ULong, key_queue.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(key_queue.size ()); CORBA::UnionMemberSeq *members = 0; ACE_NEW_THROW_EX (members, @@ -427,41 +427,38 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key, switch (kind) { case CORBA::tk_char: - member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char, - value)); + member.label <<= CORBA::Any::from_char (static_cast<CORBA::Char>(value)); break; case CORBA::tk_wchar: - member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar, - value)); + member.label <<= CORBA::Any::from_wchar (static_cast<CORBA::WChar>(value)); break; case CORBA::tk_boolean: - member.label <<= CORBA::Any::from_boolean (ACE_static_cast (CORBA::Boolean, - value)); + member.label <<= CORBA::Any::from_boolean (static_cast<CORBA::Boolean>(value)); break; case CORBA::tk_short: - member.label <<= ACE_static_cast (CORBA::Short, value); + member.label <<= static_cast<CORBA::Short>(value); break; case CORBA::tk_ushort: - member.label <<= ACE_static_cast (CORBA::UShort, value); + member.label <<= static_cast<CORBA::UShort>(value); break; case CORBA::tk_long: - member.label <<= ACE_static_cast (CORBA::Long, value); + member.label <<= static_cast<CORBA::Long>(value); break; case CORBA::tk_ulong: - member.label <<= ACE_static_cast (CORBA::ULong, value); + member.label <<= static_cast<CORBA::ULong>(value); break; #if !defined (ACE_LACKS_LONGLONG_T) case CORBA::tk_longlong: - member.label <<= ACE_static_cast (CORBA::LongLong, value); + member.label <<= static_cast<CORBA::LongLong>(value); break; #endif /* ACE_LACKS_LONGLONG_T */ case CORBA::tk_ulonglong: - member.label <<= ACE_static_cast (CORBA::ULongLong, value); + member.label <<= static_cast<CORBA::ULongLong>(value); break; case CORBA::tk_enum: { TAO_OutputCDR cdr; - cdr.write_ulong (ACE_static_cast (CORBA::ULong, value)); + cdr.write_ulong (static_cast<CORBA::ULong>(value)); TAO::Unknown_IDL_Type *impl = 0; ACE_NEW (impl, TAO::Unknown_IDL_Type (tc.in (), diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp index 62c52d80788..b20de22a5f7 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp @@ -175,8 +175,7 @@ TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->repo_->config ()->get_integer_value (this->section_key_, "is_multiple", val); - return ACE_static_cast (CORBA::Boolean, - val); + return static_cast<CORBA::Boolean>(val); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp index 719a56c6e52..a9c67a09dac 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp @@ -260,7 +260,7 @@ TAO_ValueDef_i::supported_interfaces_i ( "def_kind", kind ); - def_kind = ACE_static_cast (CORBA::DefinitionKind, kind); + def_kind = static_cast<CORBA::DefinitionKind>(kind); if (def_kind == CORBA::dk_Interface) { @@ -685,8 +685,7 @@ TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->repo_->config ()->get_integer_value (this->section_key_, "is_abstract", is_it); - return ACE_static_cast (CORBA::Boolean, - is_it); + return static_cast<CORBA::Boolean>(is_it); } void @@ -711,8 +710,7 @@ TAO_ValueDef_i::is_abstract_i (CORBA::Boolean is_abstract this->repo_->config ()->set_integer_value ( this->section_key_, "is_abstract", - ACE_static_cast (CORBA::ULong, - is_abstract)); + static_cast<CORBA::ULong>(is_abstract)); } CORBA::Boolean @@ -735,8 +733,7 @@ TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->repo_->config ()->get_integer_value (this->section_key_, "is_custom", is_it); - return ACE_static_cast (CORBA::Boolean, - is_it); + return static_cast<CORBA::Boolean>(is_it); } void @@ -761,8 +758,7 @@ TAO_ValueDef_i::is_custom_i (CORBA::Boolean is_custom this->repo_->config ()->set_integer_value ( this->section_key_, "is_custom", - ACE_static_cast (CORBA::ULong, - is_custom)); + static_cast<CORBA::ULong>(is_custom)); } CORBA::Boolean @@ -785,8 +781,7 @@ TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->repo_->config ()->get_integer_value (this->section_key_, "is_truncatable", is_it); - return ACE_static_cast (CORBA::Boolean, - is_it); + return static_cast<CORBA::Boolean>(is_it); } void @@ -811,8 +806,7 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean is_truncatable this->repo_->config ()->set_integer_value ( this->section_key_, "is_truncatable", - ACE_static_cast (CORBA::ULong, - is_truncatable)); + static_cast<CORBA::ULong>(is_truncatable)); } CORBA::Boolean @@ -945,11 +939,11 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->config ()->get_integer_value (this->section_key_, "is_abstract", val); - fv_desc->is_abstract = ACE_static_cast (CORBA::Boolean, val); + fv_desc->is_abstract = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_integer_value (this->section_key_, "is_custom", val); - fv_desc->is_custom = ACE_static_cast (CORBA::Boolean, val); + fv_desc->is_custom = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_string_value (this->section_key_, "container_id", holder); @@ -1018,8 +1012,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->config ()->get_integer_value (op_key, "mode", val); - fv_desc->operations[i].mode = ACE_static_cast (CORBA::OperationMode, - val); + fv_desc->operations[i].mode = static_cast<CORBA::OperationMode>(val); CORBA::TCKind kind = fv_desc->operations[i].result->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -1096,8 +1089,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) "mode", val); fv_desc->operations[i].parameters[j].mode = - ACE_static_cast (CORBA::ParameterMode, - val); + static_cast<CORBA::ParameterMode>(val); } } @@ -1206,8 +1198,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) "mode", val); fv_desc->attributes[i].mode = - ACE_static_cast (CORBA::AttributeMode, - val); + static_cast<CORBA::AttributeMode>(val); this->repo_->config ()->get_string_value (attr_key, "type_path", holder); @@ -1278,8 +1269,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) "access", val); fv_desc->members[i].access = - ACE_static_cast (CORBA::Visibility, - val); + static_cast<CORBA::Visibility>(val); // Use type path for 'type' and 'type_def', @@ -1399,8 +1389,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->config ()->get_integer_value (this->section_key_, "is_truncatable", val); - fv_desc->is_truncatable = ACE_static_cast (CORBA::Boolean, - val); + fv_desc->is_truncatable = static_cast<CORBA::Boolean>(val); this->repo_->config ()->get_string_value (this->section_key_, "base_value", holder); @@ -1822,13 +1811,11 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc CORBA::ULong tmp = this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - desc.is_abstract = ACE_static_cast (CORBA::Boolean, - tmp); + desc.is_abstract = static_cast<CORBA::Boolean>(tmp); tmp = this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - desc.is_custom = ACE_static_cast (CORBA::Boolean, - tmp); + desc.is_custom = static_cast<CORBA::Boolean>(tmp); ACE_TString holder; this->repo_->config ()->get_string_value (this->section_key_, @@ -1855,8 +1842,7 @@ TAO_ValueDef_i::fill_value_description (CORBA::ValueDescription &desc tmp = this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - desc.is_truncatable = ACE_static_cast (CORBA::Boolean, - tmp); + desc.is_truncatable = static_cast<CORBA::Boolean>(tmp); this->repo_->config ()->get_string_value (this->section_key_, "base_value", diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp index 75193483c16..d778025fcec 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp @@ -76,8 +76,7 @@ TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL) this->repo_->config ()->get_integer_value (this->section_key_, "access", val); - vm.access = ACE_static_cast (CORBA::Visibility, - val); + vm.access = static_cast<CORBA::Visibility>(val); CORBA::Contained::Description *retval = 0; ACE_NEW_RETURN (retval, @@ -190,8 +189,7 @@ TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) this->repo_->config ()->get_integer_value (this->section_key_, "access", val); - return ACE_static_cast (CORBA::Visibility, - val); + return static_cast<CORBA::Visibility>(val); } void diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index ffcf5c1800b..c66577da9d6 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -97,7 +97,7 @@ TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) "bound", retval); - return ACE_static_cast (CORBA::ULong, retval); + return static_cast<CORBA::ULong>(retval); } void diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp index c0744809ff2..c95113c1aef 100644 --- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp +++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp @@ -83,8 +83,7 @@ TAO_IOR_Multicast::init (const char *ior, else { actual_mcast_addr = - CORBA::string_alloc (ACE_static_cast(CORBA::ULong, - ACE_OS::strlen (mcast_addr))); + CORBA::string_alloc (static_cast<CORBA::ULong>(ACE_OS::strlen (mcast_addr))); actual_mcast_addr = mcast_addr; } @@ -244,7 +243,7 @@ TAO_IOR_Multicast::handle_input (ACE_HANDLE) iovp[0].iov_len = sizeof (CORBA::Short); // The ior. - iovp[1].iov_base = ACE_const_cast (char*, this->ior_.c_str ()); + iovp[1].iov_base = const_cast<char*>(this->ior_.c_str ()); iovp[1].iov_len = ACE_static_cast(u_long, this->ior_.length () + 1); ssize_t result = stream.sendv_n (iovp, cnt); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 8f7d6243ad0..65dbe000aeb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -28,7 +28,7 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor (const char * l { // Couldn't determine hostname. Use the current time // instead. - CORBA::ULong t = ACE_static_cast (CORBA::ULong, ACE_OS::time ()); + CORBA::ULong t = static_cast<CORBA::ULong>(ACE_OS::time ()); // A 64 byte buffer is more than enough to contain the // string representation of a 32 bit unsigned integer. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index e81bb831d64..663a50e6f33 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -77,7 +77,7 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc { // Couldn't determine hostname. Use the current time // instead. - CORBA::ULong t = ACE_static_cast (CORBA::ULong, ACE_OS::time ()); + CORBA::ULong t = static_cast<CORBA::ULong>(ACE_OS::time ()); // A 64 byte buffer is more than enough to contain the // string representation of a 32 bit unsigned integer. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 32d63b54f0f..d52a4ce3f93 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -925,8 +925,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor, // using the same POA. const ACE_Time_Value tv = ACE_OS::gettimeofday (); const CORBA::Long time = - ACE_static_cast (CORBA::Long, - tv.msec ()); // Time in milliseconds. + static_cast<CORBA::Long>(tv.msec ()); // Time in milliseconds. char poa_name[] = "TAO_LB_LoadManager_POA - 0xZZZZZZZZ"; char * astr = diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index c1e1bf9d684..6cb526de268 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -16,7 +16,7 @@ static pthread_once_t tao_lb_once_control = PTHREAD_ONCE_INIT; extern "C" void tao_lb_random_init_routine (void) { - ACE_OS::srand (ACE_static_cast (unsigned int, ACE_OS::time ())); + ACE_OS::srand (static_cast<unsigned int>(ACE_OS::time ())); } @@ -145,7 +145,7 @@ TAO_LB_Random::_tao_next_member ( // random as the higher order bits. // Prevent integer arithmetic overflow. - const CORBA::Float flen = ACE_static_cast (CORBA::Float, len); + const CORBA::Float flen = static_cast<CORBA::Float>(len); const CORBA::ULong i = ACE_static_cast (CORBA::ULong, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index a4536839dbd..4fa50fdfd21 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -62,8 +62,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts ( // standard interpretive marshaling via a CDR encapsulation // Codec for efficiency reasons. const char * buf = - ACE_reinterpret_cast (const char *, - service_context->context_data.get_buffer ()); + reinterpret_cast<const char *>(service_context->context_data.get_buffer ()); TAO_InputCDR cdr (buf, service_context->context_data.length ()); @@ -71,7 +70,7 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts ( if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0) ACE_THROW (CORBA::BAD_PARAM ()); - cdr.reset_byte_order (ACE_static_cast (int, byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); CORBA::Object_var object_group; if (cdr >> object_group.out ()) diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp index 202e68e3b88..46067b42acd 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp @@ -24,7 +24,7 @@ TAO_LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL) DsLogAdmin::LogList* list; // Figure out the length of the list. - CORBA::ULong len = ACE_static_cast (CORBA::ULong, hash_map_.current_size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(hash_map_.current_size ()); // Allocate the list of <len> length. ACE_NEW_THROW_EX (list, @@ -90,7 +90,7 @@ TAO_LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL) DsLogAdmin::LogIdList* list; // Figure out the length of the list. - CORBA::ULong len = ACE_static_cast (CORBA::ULong, hash_map_.current_size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(hash_map_.current_size ()); // Allocate the list of <len> length. ACE_NEW_THROW_EX (list, diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp index 85bfad9aadb..6e119b68436 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp @@ -601,7 +601,7 @@ TAO_Log_i::query_i (const char *constraint, // Create an iterator TAO_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter (store); - CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(store.current_size ()); // How many entries? @@ -756,7 +756,7 @@ TAO_Log_i::match_i (const char *constraint, // Create an iterator TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store); - CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(store.current_size ()); // How many entries? // Iterate over and populate the list. @@ -1250,7 +1250,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) static char out[256] = ""; double temp1 = - ACE_static_cast (double, ACE_UINT64_DBLCAST_ADAPTER (p_time)); + static_cast<double>(ACE_UINT64_DBLCAST_ADAPTER (p_time)); ACE_OS::sprintf (out, "time > %.0f", temp1); @@ -1266,7 +1266,7 @@ TAO_Log_i::remove_old_records (ACE_ENV_SINGLE_ARG_DECL) // Create an iterator TAO_LogRecordStore::LOG_RECORD_STORE_ITER iter (store); - CORBA::ULong len = ACE_static_cast (CORBA::ULong, store.current_size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(store.current_size ()); // How many entries? // Iterate over and populate the list. diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp index 88e58478c13..db54b247653 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp @@ -59,8 +59,8 @@ TAO_NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL) CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); DsNotifyLogAdmin::NotifyLog_var log = - notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos), - ACE_static_cast(const CosNotification::AdminProperties, *admin), id); + notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties>(*qos), + static_cast<const CosNotification::AdminProperties>(*admin), id); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); @@ -82,8 +82,8 @@ TAO_NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL) CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER); DsNotifyLogAdmin::NotifyLog_var log = - notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos), - ACE_static_cast(const CosNotification::AdminProperties, *admin)); + notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, static_cast<const CosNotification::QoSProperties>(*qos), + static_cast<const CosNotification::AdminProperties>(*admin)); this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ()); diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp index 1b20d291bc5..94f9dc1d363 100644 --- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp +++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp @@ -824,28 +824,16 @@ TAO_Metrics_Logger::process_timeprobe_data (const Metrics::TimeprobeParameter_Se CORBA::Any any; util_data_.hrt_op_utilization = - ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time)) - / ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (interval)); + static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (hrt_op_time)) + / static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (interval)); util_data_.srt_op_utilization = - ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (srt_op_time)) - / ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (interval)); + static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (srt_op_time)) + / static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (interval)); util_data_.queue_utilization = - ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (queue_time)) - / ACE_static_cast ( - CORBA::Double, - ACE_UINT64_DBLCAST_ADAPTER (interval)); + static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (queue_time)) + / static_cast<CORBA::Double>(ACE_UINT64_DBLCAST_ADAPTER (interval)); ACE_TRY_NEW_ENV { diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp index 515c98c5b9b..180d0ca7a7b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp @@ -71,9 +71,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name CORBA::ULong name_len = name.length (); CosNaming::Name comp_name (name.maximum (), name_len - 1, - ACE_const_cast - (CosNaming::NameComponent*, - name.get_buffer ())); + const_cast<CosNaming::NameComponent*>(name.get_buffer ())); ACE_TRY { // Resolve the name. @@ -461,8 +459,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n CosNaming::Name rest_of_name (n.maximum () - 1, n.length () - 1, - ACE_const_cast (CosNaming::NameComponent*, - n.get_buffer ()) + const_cast<CosNaming::NameComponent*>(n.get_buffer ()) + 1); // If there are any exceptions, they will propagate up. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp index 19e68791e30..a05f1dfaa3f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp @@ -417,7 +417,7 @@ TAO_Naming_Server::init_with_orb (int argc, { ACE_OS::fprintf (pidf, "%ld\n", - ACE_static_cast (long, ACE_OS::getpid ())); + static_cast<long>(ACE_OS::getpid ())); ACE_OS::fclose (pidf); } } @@ -585,7 +585,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, ACE_OS::getenv ("NameServicePort"); if (port_number != 0) - port = ACE_static_cast (u_short, ACE_OS::atoi (port_number)); + port = static_cast<u_short>(ACE_OS::atoi (port_number)); } // Port wasn't specified on the command-line or in environment - diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp index 82705ace208..ded104eb40c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp @@ -75,7 +75,7 @@ TAO_Persistent_Context_Index::bind (const char *poa_id, else { // Populate memory with data. - counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr); + counter = reinterpret_cast<ACE_UINT32 *>(ptr); *counter = 0; char * poa_id_ptr = ptr + counter_len; ACE_OS::strcpy (poa_id_ptr, poa_id); @@ -125,8 +125,7 @@ TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void) { delete allocator_; ACE_OS::free (ACE_reinterpret_cast (void *, - ACE_const_cast (ACE_TCHAR *, - index_file_))); + const_cast<ACE_TCHAR *>(index_file_))); } ACE_Allocator* diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp index 2d6aff6f15f..b2fe1700d6e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp @@ -478,7 +478,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many, if (this->context_->current_size () > how_many) n = how_many; else - n = ACE_static_cast (CORBA::ULong, this->context_->current_size ()); + n = static_cast<CORBA::ULong>(this->context_->current_size ()); // Use hash iterator to populate a BindingList with bindings. bl->length (n); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 309172db7e9..09d2ab7e5da 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -259,8 +259,7 @@ void TAO_Storable_Naming_Context::Write(TAO_Storable_Base& wrtr) ACE_TRACE("Write"); TAO_NS_Persistence_Header header; - header.size (ACE_static_cast(unsigned int, - storable_context_->current_size())); + header.size (static_cast<unsigned int>(storable_context_->current_size())); header.destroyed (destroyed_); wrtr << header; @@ -1017,8 +1016,7 @@ TAO_Storable_Naming_Context::resolve (const CosNaming::Name& n CosNaming::Name rest_of_name (n.maximum () - 1, n.length () - 1, - ACE_const_cast (CosNaming::NameComponent*, - n.get_buffer ()) + 1); + const_cast<CosNaming::NameComponent*>(n.get_buffer ()) + 1); // If there are any exceptions, they will propagate up. return context->resolve (rest_of_name @@ -1374,7 +1372,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, if (this->context_->current_size () > how_many) n = how_many; else - n = ACE_static_cast (CORBA::ULong, this->context_->current_size ()); + n = static_cast<CORBA::ULong>(this->context_->current_size ()); // Use the hash map iterator to populate <bl> with bindings. bl->length (n); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp index 88e6db290ab..1c3f72f3194 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp @@ -280,7 +280,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many, if (this->context_->current_size () > how_many) n = how_many; else - n = ACE_static_cast (CORBA::ULong, this->context_->current_size ()); + n = static_cast<CORBA::ULong>(this->context_->current_size ()); // Use the hash map iterator to populate <bl> with bindings. bl->length (n); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index acad575aa0e..d27768422fc 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -175,7 +175,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload subscription %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); // since we initialized our subscribed types to everything // in the constructor. we have to clear it out first. @@ -186,7 +186,7 @@ TAO_Notify_Admin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload filter_admin %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = & this->filter_admin_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp index aa474ed02e7..e1b730427c3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp @@ -81,7 +81,7 @@ TAO_Notify_PushConsumer::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY @@ -96,7 +96,7 @@ void TAO_Notify_PushConsumer::reconnect_from_consumer (TAO_Notify_Consumer* old_consumer ACE_ENV_ARG_DECL) { - TAO_Notify_PushConsumer* tmp = ACE_dynamic_cast(TAO_Notify_PushConsumer*, old_consumer); + TAO_Notify_PushConsumer* tmp = dynamic_cast<TAO_Notify_PushConsumer*>(old_consumer); ACE_ASSERT(tmp != 0); this->init(tmp->push_consumer_.in() ACE_ENV_ARG_PARAMETER); ACE_CHECK; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp index fe629d6759a..79b4c16f80e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp @@ -47,7 +47,7 @@ TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp index a2de6771ef9..8a68f415e7a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp @@ -67,7 +67,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties ( this->blocking_time_ = # if defined (ACE_CONFIG_WIN32_H) - ACE_Time_Value (ACE_static_cast (long, blocking_timeout.value ())); + ACE_Time_Value (static_cast<long>(blocking_timeout.value ())); # else ACE_Time_Value (blocking_timeout.value () / 1); # endif /* ACE_CONFIG_WIN32_H */ @@ -194,7 +194,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me if (this->msg_queue_.dequeue (mb) == -1) return -1; - method_request = ACE_dynamic_cast (TAO_Notify_Method_Request_Queueable*, mb); + method_request = dynamic_cast<TAO_Notify_Method_Request_Queueable*>(mb); if (method_request == 0) return -1; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 60aa249cdcc..e5a3fa2f170 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -101,7 +101,7 @@ TAO_Notify_Consumer::enqueue_request ( if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d: enqueue_request (%d) @%@.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence (), request )); @@ -117,7 +117,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req { if (DEBUG_LEVEL > 3)ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d: enqueuing another event. %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); TAO_Notify_Event_var event_var; @@ -136,7 +136,7 @@ TAO_Notify_Consumer::enqueue_if_necessary (TAO_Notify_Method_Request_Event * req { if (DEBUG_LEVEL > 3) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Suspended Consumer %d enqueing event. %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); TAO_Notify_Event_var event_var; @@ -177,7 +177,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ { if (DEBUG_LEVEL > 1) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d enqueing event %d due to failed dispatch.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence ())); this->enqueue_request (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -188,7 +188,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during direct dispatch. Discarding event:%d.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); request->complete (); @@ -198,7 +198,7 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_ { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed during direct dispatch :%d. Discarding event.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); request->complete (); @@ -231,7 +231,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request ACE_TRY_CHECK; if (DEBUG_LEVEL > 8) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d dispatched single event %d.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); } @@ -239,7 +239,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) OBJECT_NOT_EXIST %s\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), ex._info ().c_str () )); result = DISPATCH_FAIL; @@ -248,7 +248,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Transient (minor=%d) %s\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), ex.minor (), ex._info ().c_str () )); @@ -287,7 +287,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) SystemException %s\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), ex._info ().c_str () )); result = DISPATCH_DISCARD; @@ -296,7 +296,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request { ACE_ERROR ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::push (request) Caught unexpected exception pushing event to consumer.\n"), - ACE_static_cast (int, this->proxy ()->id ()) + static_cast<int>(this->proxy ()->id ()) )); result = DISPATCH_DISCARD; } @@ -336,7 +336,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch OBJECT_NOT_EXIST %s\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), not_exist._info ().c_str () )); return DISPATCH_FAIL; @@ -345,7 +345,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Notify_Consumer %d::dispatch_batch SystemException %s\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), ex._info ().c_str () )); // @@todo what to return here? @@ -355,7 +355,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) { ACE_ERROR ( (LM_ERROR, ACE_TEXT ("(%P|%t) Consumer %d: Caught unexpected exception pushing EventBatch to consumer.\n"), - ACE_static_cast (int, this->proxy ()->id ()) + static_cast<int>(this->proxy ()->id ()) )); return DISPATCH_FAIL; } @@ -368,7 +368,7 @@ TAO_Notify_Consumer::dispatch_pending (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { if (DEBUG_LEVEL > 5) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d dispatching pending events. Queue size: %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), this->pending_events_->size () )); @@ -413,7 +413,7 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); ace_mon.acquire (); @@ -425,7 +425,7 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Error during dispatch. Discarding event:%d.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); request->complete (); @@ -437,7 +437,7 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Failed. Discarding event %d.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); request->complete (); @@ -501,7 +501,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) if (DEBUG_LEVEL > 5) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("Consumer %d: scheduling pacing/retry for %dms.\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), tv.msec ())); this->timer_id_ = this->timer_->schedule_timer ( @@ -512,7 +512,7 @@ TAO_Notify_Consumer::schedule_timer (bool is_error) { ACE_ERROR ( (LM_ERROR, ACE_TEXT ("TAO_Notify_Consumer %d::schedule_timer () Error scheduling timer.\n"), - ACE_static_cast (int, this->proxy ()->id ()) + static_cast<int>(this->proxy ()->id ()) )); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 89279421cc7..1ce75e3c3be 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -105,7 +105,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -114,7 +114,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -123,7 +123,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -133,7 +133,7 @@ TAO_Notify_ConsumerAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp index 28deb45ebf3..2e515098612 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp @@ -268,8 +268,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) CORBA::INTERNAL ()); ACE_CHECK_RETURN (0); - CORBA::ULong current_size = ACE_static_cast (CORBA::ULong, - this->constraint_expr_list_.current_size ()); + CORBA::ULong current_size = static_cast<CORBA::ULong>(this->constraint_expr_list_.current_size ()); // Create the list that goes out. CosNotifyFilter::ConstraintInfoSeq *infoseq_ptr; @@ -294,8 +293,7 @@ TAO_Notify_ETCL_Filter::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL) // copy of the string. It wouldn't unless we coax it to use // the correct assignment operator. infoseq[index].constraint_expression = - ACE_static_cast (const CosNotifyFilter::ConstraintExp, - entry->int_id_->constr_expr); + static_cast<const CosNotifyFilter::ConstraintExp>(entry->int_id_->constr_expr); infoseq[index].constraint_id = entry->ext_id_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index afabca9b5f4..e853be0561d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -565,7 +565,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); // call special builder method to reload @@ -591,7 +591,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder(); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 6d1e1efaf48..1f9917cc4a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -371,7 +371,7 @@ TAO_Notify_EventChannelFactory::load_child (const ACE_CString& type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannelFactory reload channel %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); TAO_Notify_Builder* bld = TAO_Notify_PROPERTIES::instance()->builder(); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index e5cff03e5a3..3185392bc97 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -38,7 +38,7 @@ TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq void TAO_Notify_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq) const { - event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ())); + event_type_seq.length (static_cast<CORBA::ULong>(this->size ())); inherited::CONST_ITERATOR iter (*this); @@ -60,7 +60,7 @@ TAO_Notify_EventTypeSeq::populate_no_special (CosNotification::EventTypeSeq& eve event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size () - 1)); } else - event_type_seq.length (ACE_static_cast (CORBA::ULong, this->size ())); + event_type_seq.length (static_cast<CORBA::ULong>(this->size ())); inherited::CONST_ITERATOR iter (*this); diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index 138b9e17ba6..aabeb60800a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -104,7 +104,7 @@ TAO_Notify_FilterAdmin::get_all_filters (ACE_ENV_SINGLE_ARG_DECL) CosNotifyFilter::FilterIDSeq_var list (list_ptr); - list->length (ACE_static_cast (CORBA::ULong, len)); + list->length (static_cast<CORBA::ULong>(len)); FILTER_LIST::ITERATOR iter (this->filter_list_); FILTER_LIST::ENTRY *entry; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl index c3f8250333d..9b59e277028 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.inl @@ -32,8 +32,7 @@ TAO_Notify_Method_Request_Queueable::init (const TAO_Notify_Event * event) ACE_Time_Value current = ACE_OS::gettimeofday () + # if defined (ACE_CONFIG_WIN32_H) ACE_Time_Value ( - ACE_static_cast (long, - timeout.value ())); + static_cast<long>(timeout.value ())); # else ACE_Time_Value (timeout.value () / 1); # endif /* ACE_CONFIG_WIN32_H */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp index f11c37d5ae4..7d40a625bdd 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp @@ -126,7 +126,7 @@ TAO_Notify_Method_Request_Dispatch::unmarshal ( { id_path.push_back (id); char idbuf[20]; - ACE_OS::snprintf (idbuf, sizeof(idbuf)-1, "/%d", ACE_static_cast (int, id)); + ACE_OS::snprintf (idbuf, sizeof(idbuf)-1, "/%d", static_cast<int>(id)); textpath += idbuf; } else diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp index 257b4148ab6..8313c3a0cce 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp @@ -47,7 +47,7 @@ namespace TAO_Notify : name(p.name()) { char buf[64]; - long temp = ACE_static_cast (long, p.value ()); + long temp = static_cast<long>(p.value ()); ACE_OS::sprintf (buf, "%ld", temp); value = buf; } @@ -149,7 +149,7 @@ namespace TAO_Notify const char * v; if (find(p.name (), v)) { - p.assign (ACE_static_cast(TimeBase::TimeT, string_to_uint64(v))); + p.assign (static_cast<TimeBase::TimeT>(string_to_uint64(v))); } } @@ -174,7 +174,7 @@ namespace TAO_Notify const char * val; if (find(n, val)) { - v = ACE_static_cast(CORBA::Long, ACE_OS::atoi(val)); + v = static_cast<CORBA::Long>(ACE_OS::atoi(val)); return true; } return false; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 53f0d3c10ea..ed0b165a885 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -164,7 +164,7 @@ Persistent_File_Allocator::allocate() } if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate: %d\n"), - ACE_static_cast (int, block_number) + static_cast<int>(block_number) )); result = this->allocate_at(block_number); return result; @@ -177,7 +177,7 @@ Persistent_File_Allocator::allocate_at(size_t block_number) this->used(block_number); if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::allocate at : %d\n"), - ACE_static_cast (int, block_number) + static_cast<int>(block_number) )); ACE_NEW_RETURN(result, Persistent_Storage_Block( block_number, @@ -204,7 +204,7 @@ Persistent_File_Allocator::used(size_t block_number) ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_); if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %d\n"), - ACE_static_cast (int, block_number) + static_cast<int>(block_number) )); ACE_ASSERT (!this->free_blocks_.is_set (block_number)); this->free_blocks_.set_bit(block_number, true); @@ -215,7 +215,7 @@ Persistent_File_Allocator::free(size_t block_number) { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Persistent_File_Allocator::free: %d\n"), - ACE_static_cast (int, block_number) + static_cast<int>(block_number) )); ACE_ASSERT (this->free_blocks_.is_set (block_number)); this->free_block(block_number); @@ -272,7 +272,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Copy PSB %d\n") - , ACE_static_cast (int, psb->block_number ()) + , static_cast<int>(psb->block_number ()) )); ACE_NEW_RETURN(ourpsb, Persistent_Storage_Block(*psb), false); ourpsb->set_allocator_owns(true); @@ -280,7 +280,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_, false); if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Queueing PSB to write block %d\n") - , ACE_static_cast (int, psb->block_number ()) + , static_cast<int>(psb->block_number ()) )); result = (0 == this->block_queue_.enqueue_tail(ourpsb)); this->wake_up_thread_.signal(); @@ -307,8 +307,7 @@ Persistent_File_Allocator::allocate_block(size_t& block_number) ACE_THR_FUNC_RETURN Persistent_File_Allocator::thr_func(void * arg) { - Persistent_File_Allocator* pfa = ACE_static_cast (Persistent_File_Allocator*, - arg); + Persistent_File_Allocator* pfa = static_cast<Persistent_File_Allocator*>(arg); pfa->run(); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp index 0e14bcbfbd0..6ac8b3deeda 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp @@ -31,7 +31,7 @@ Random_File::block_size() const size_t Random_File::size() const { - Random_File * mutable_this = ACE_const_cast (Random_File *, this); + Random_File * mutable_this = const_cast<Random_File *>(this); ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, mutable_this->lock_, 0); size_t original_pos = mutable_this->tell (); mutable_this->ACE_FILE::seek(0, SEEK_END); @@ -87,7 +87,7 @@ Random_File::write(const size_t block_number, void* buf, bool atomic) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false); if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Write block %d %c\n"), - ACE_static_cast (int, block_number), + static_cast<int>(block_number), (atomic ? '*' : ' ') )); bool result = this->seek(block_number); @@ -122,7 +122,7 @@ Random_File::read(const size_t block_number, void* buf) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false); if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Read block %d\n"), - ACE_static_cast (int, block_number) + static_cast<int>(block_number) )); bool result = this->seek(block_number); if (result) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp index b2f84836d47..0133d3de2b4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp @@ -45,7 +45,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: registering %d\n"), - ACE_static_cast (int, next_id) + static_cast<int>(next_id) )); } TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance(); @@ -72,7 +72,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: unregistering %d\n"), - ACE_static_cast (int, id) + static_cast<int>(id) )); } if ( 0 != reconnection_registry_.unbind (id)) @@ -113,7 +113,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: saving %d\n"), - ACE_static_cast (int, entry->ext_id_) + static_cast<int>(entry->ext_id_) )); } cattrs.push_back(NVP(RECONNECT_ID, entry->ext_id_)); @@ -154,7 +154,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnect registry: reloading %d\n"), - ACE_static_cast (int, id) + static_cast<int>(id) )); } } @@ -193,7 +193,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Sending reconnection to client %d\n"), - ACE_static_cast (int, entry->ext_id_) + static_cast<int>(entry->ext_id_) )); } ACE_CString & ior = entry->int_id_; @@ -210,7 +210,7 @@ namespace TAO_Notify { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Reconnection Registry: Can't resolve reconnection client's IOR %d\n"), - ACE_static_cast (int, entry->ext_id_) + static_cast<int>(entry->ext_id_) )); //throw this entry away but you've got an iterator so be careful diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp index 102e4090dc4..7f5f35aa7f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp @@ -81,22 +81,22 @@ Routing_Slip::create (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL) ACE_TEXT (" enter_complete \t%d\n") ACE_TEXT (" enter_deleting \t%d\n") ACE_TEXT (" enter_terminal \t%d\n") - , ACE_static_cast (int, count_enter_transient_) - , ACE_static_cast (int, count_continue_transient_) - , ACE_static_cast (int, count_enter_reloaded_) - , ACE_static_cast (int, count_enter_new_) - , ACE_static_cast (int, count_continue_new_) - , ACE_static_cast (int, count_enter_complete_while_new_) - , ACE_static_cast (int, count_enter_saving_) - , ACE_static_cast (int, count_enter_saved_) - , ACE_static_cast (int, count_enter_updating_) - , ACE_static_cast (int, count_enter_changed_while_saving_) - , ACE_static_cast (int, count_continue_changed_while_saving_) - , ACE_static_cast (int, count_enter_changed_) - , ACE_static_cast (int, count_continue_changed_) - , ACE_static_cast (int, count_enter_complete_) - , ACE_static_cast (int, count_enter_deleting_) - , ACE_static_cast (int, count_enter_terminal_) + , static_cast<int>(count_enter_transient_) + , static_cast<int>(count_continue_transient_) + , static_cast<int>(count_enter_reloaded_) + , static_cast<int>(count_enter_new_) + , static_cast<int>(count_continue_new_) + , static_cast<int>(count_enter_complete_while_new_) + , static_cast<int>(count_enter_saving_) + , static_cast<int>(count_enter_saved_) + , static_cast<int>(count_enter_updating_) + , static_cast<int>(count_enter_changed_while_saving_) + , static_cast<int>(count_continue_changed_while_saving_) + , static_cast<int>(count_enter_changed_) + , static_cast<int>(count_continue_changed_) + , static_cast<int>(count_enter_complete_) + , static_cast<int>(count_enter_deleting_) + , static_cast<int>(count_enter_terminal_) )); } return result; @@ -241,9 +241,9 @@ Routing_Slip::route (TAO_Notify_ProxyConsumer* pc, bool reliable_channel ACE_ENV if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: lookup, completed %d of %d\n"), this->sequence_, - ACE_static_cast (int, request_id), - ACE_static_cast (int, this->complete_requests_), - ACE_static_cast (int, this->delivery_requests_.size ()) + static_cast<int>(request_id), + static_cast<int>(this->complete_requests_), + static_cast<int>(this->delivery_requests_.size ()) )); Delivery_Request_Ptr request (new Delivery_Request (this->this_ptr_, request_id)); @@ -292,10 +292,10 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: Forward %s; completed %d of %d\n"), this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), filter ? ACE_TEXT ("Filter") : ACE_TEXT ("No Filter"), - ACE_static_cast (int, this->complete_requests_), - ACE_static_cast (int, this->delivery_requests_.size ()) + static_cast<int>(this->complete_requests_), + static_cast<int>(this->delivery_requests_.size ()) )); Delivery_Request_Ptr request (new Delivery_Request (this->this_ptr_, request_id)); @@ -310,7 +310,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %d to " "proxy supplier %d\n", this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), ps->id())); ps->worker_task()->execute (method); } @@ -321,7 +321,7 @@ Routing_Slip::forward (TAO_Notify_ProxySupplier* ps, bool filter) "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %d to " "proxy supplier %d; already shut down\n", this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), ps->id())); } } @@ -344,10 +344,10 @@ Routing_Slip::dispatch ( if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: add Delivery_Request #%d: Dispatch %s; completed %d of %d\n"), this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), filter ? ACE_TEXT ("Filter") : ACE_TEXT ("No Filter"), - ACE_static_cast (int, this->complete_requests_), - ACE_static_cast (int, this->delivery_requests_.size ()) + static_cast<int>(this->complete_requests_), + static_cast<int>(this->delivery_requests_.size ()) )); Delivery_Request_Ptr request (new Delivery_Request (this->this_ptr_, request_id)); @@ -361,7 +361,7 @@ Routing_Slip::dispatch ( "(%P|%t) Routing Slip #%d: dispatching Delivery_Request %d to " "proxy supplier %d\n", this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), ps->id())); ps->worker_task()->execute (method ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -373,7 +373,7 @@ Routing_Slip::dispatch ( "(%P|%t) Routing Slip #%d: not dispatching Delivery_Request %d to " "proxy supplier %d; already shut down\n", this->sequence_, - ACE_static_cast (int, request_id), + static_cast<int>(request_id), ps->id())); } } @@ -393,9 +393,9 @@ Routing_Slip::delivery_request_complete (size_t request_id) if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Routing Slip #%d: delivery_request_complete #%d: completed %d of %d\n"), this->sequence_, - ACE_static_cast (int, request_id), - ACE_static_cast (int, this->complete_requests_), - ACE_static_cast (int, this->delivery_requests_.size ()) + static_cast<int>(request_id), + static_cast<int>(this->complete_requests_), + static_cast<int>(this->delivery_requests_.size ()) )); State state = this->state_; switch (state) @@ -439,7 +439,7 @@ Routing_Slip::delivery_request_complete (size_t request_id) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected delivery_request_complete in state %d\n"), - ACE_static_cast (int, this->state_) + static_cast<int>(this->state_) )); break; } @@ -495,7 +495,7 @@ Routing_Slip::at_front_of_persist_queue () ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Routing Slip %d: Unexpected at_front_of_persist_queue in state %d\n"), this->sequence_, - ACE_static_cast (int, this->state_) + static_cast<int>(this->state_) )); break; } @@ -556,7 +556,7 @@ Routing_Slip::persist_complete () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Notification Service Routing Slip: Unexpected transition in state %d\n"), - ACE_static_cast (int, this->state_) + static_cast<int>(this->state_) )); break; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 1e7853bd409..5bd9c77132f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -271,7 +271,7 @@ Routing_Slip_Persistence_Manager::remove() Routing_Slip_Persistence_Manager::Block_Header::Block_Header(Header_Type type) : serial_number (0) , next_overflow(0) - , header_type (ACE_static_cast (Block_Type, type)) + , header_type (static_cast<Block_Type>(type)) , data_size(0) { } @@ -665,7 +665,7 @@ Routing_Slip_Persistence_Manager::reload_chain( mbptr = mbnew; // Deallocate the PSB's data and reallocate it to our wr_ptr()... psb->reassign_data(ACE_static_cast(unsigned char*, - ACE_static_cast(void*, mbptr->wr_ptr())), true); + static_cast<void*>(mbptr->wr_ptr())), true); // ...read into the PSB (whose data is inside of the AMB)... this->allocator_->read(psb); allocated_blocks.push(psb->block_number()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp index 9d3083956be..09efa18a4a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp @@ -74,7 +74,7 @@ TAO_Notify_Batch_Buffering_Strategy::dequeue_i (int max_deq_count, CosNotificati --this->global_queue_length_; - TAO_Notify_Method_Request_Event_Queueable* mre = ACE_dynamic_cast (TAO_Notify_Method_Request_Event_Queueable*, mb); + TAO_Notify_Method_Request_Event_Queueable* mre = dynamic_cast<TAO_Notify_Method_Request_Event_Queueable*>(mb); mre->event ()->convert (event_batch[deq_count]); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index dc162c3d9ec..82473370c8d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -161,7 +161,7 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), + static_cast<int>(this->proxy ()->id ()), request->sequence () )); ace_mon.acquire (); @@ -226,7 +226,7 @@ TAO_Notify_SequencePushConsumer::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp index edcf7bee687..9c19742c46c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp @@ -39,7 +39,7 @@ TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 785ff8c2cf1..4e3862bff6a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -78,7 +78,7 @@ TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string(this->push_consumer_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp index 61ded91e7e8..23a663ba207 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp @@ -39,7 +39,7 @@ TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const { CORBA::String_var ior = orb->object_to_string(this->push_supplier_.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - iorstr = ACE_static_cast (const char *, ior.in ()); + iorstr = static_cast<const char *>(ior.in ()); result = true; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp index 0476be236b0..a52351e2376 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp @@ -99,7 +99,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::ANY_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -108,7 +108,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::STRUCTURED_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); @@ -117,7 +117,7 @@ TAO_Notify_SupplierAdmin::load_child (const ACE_CString &type, { if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Admin reload proxy %d\n") - , ACE_static_cast (int, id) + , static_cast<int>(id) )); result = this->load_proxy(id, CosNotifyChannelAdmin::SEQUENCE_EVENT, attrs ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp index 57fe4854f74..8c247c6570c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp @@ -32,7 +32,7 @@ namespace TAO_Notify delete saver; saver = 0; } - return ACE_static_cast (Topology_Saver *, saver); + return static_cast<Topology_Saver *>(saver); } // virtual @@ -47,7 +47,7 @@ namespace TAO_Notify delete loader; loader = 0; } - return ACE_static_cast (Topology_Loader *, loader); + return static_cast<Topology_Loader *>(loader); } // virtual diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index 9c7ac3849e6..ba9fde138ba 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -348,7 +348,7 @@ void TAO::PG_FactoryRegistry::register_factory ( ACE_ERROR(( LM_ERROR, "%s: Attempt to register duplicate location %s for role: %s\n" , this->identity_.c_str(), - ACE_static_cast(const char *, info.the_location[0].id), + static_cast<const char *>(info.the_location[0].id), role)); ACE_THROW (PortableGroup::MemberAlreadyPresent() ); } @@ -367,7 +367,7 @@ void TAO::PG_FactoryRegistry::register_factory ( this->identity_.c_str(), ACE_static_cast(int,length + 1), role, - ACE_static_cast(const char *, factory_info.the_location[0].id) + static_cast<const char *>(factory_info.the_location[0].id) )); METHOD_RETURN(TAO::PG_FactoryRegistry::register_factory); @@ -399,7 +399,7 @@ void TAO::PG_FactoryRegistry::unregister_factory ( "%s: Unregistering factory %s@%s\n", this->identity_.c_str(), role, - ACE_static_cast(const char *, location[0].id) + static_cast<const char *>(location[0].id) )); if (length > 1) { @@ -548,9 +548,9 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location ( ACE_ERROR((LM_INFO, "%s: Unregister_factory_by_location: Removing: [%d] %s@%s\n", this->identity_.c_str(), - ACE_static_cast (int, nInfo), + static_cast<int>(nInfo), role.c_str(), - ACE_static_cast (const char *, location[0].id) + static_cast<const char *>(location[0].id) )); found = 1; if (length > 1) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp index b1cf9eb3ec1..5299e0ca6ca 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp @@ -393,7 +393,7 @@ TAO_PG_GenericFactory::populate_object_group ( const PortableGroup::FactoryInfo &factory_info = factory_infos[j]; - if (j < ACE_static_cast (CORBA::ULong, initial_number_members)) + if (j < static_cast<CORBA::ULong>(initial_number_members)) { PortableGroup::GenericFactory_ptr factory = factory_info.the_factory.in (); @@ -534,8 +534,7 @@ TAO_PG_GenericFactory::process_criteria ( // members or the desired number of initial members cannot // possibly be created. - if (factory_infos_count < ACE_static_cast (CORBA::ULong, - initial_number_members)) + if (factory_infos_count < static_cast<CORBA::ULong>(initial_number_members)) { unmet_criteria[uc].nam = name; unmet_criteria[uc++].val = value2; @@ -563,8 +562,7 @@ TAO_PG_GenericFactory::process_criteria ( if (membership_style == PortableGroup::MEMB_INF_CTRL) { if (minimum_number_members < initial_number_members - || ACE_static_cast (CORBA::ULong, - minimum_number_members) > factory_infos_count) + || static_cast<CORBA::ULong>(minimum_number_members) > factory_infos_count) { unmet_criteria[uc].nam = name; unmet_criteria[uc++].val = value3; @@ -637,12 +635,11 @@ TAO_PG_GenericFactory::check_minimum_number_members ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (count >= ACE_static_cast (CORBA::ULong, minimum_number_members)) + if (count >= static_cast<CORBA::ULong>(minimum_number_members)) return; const CORBA::ULong gap = - ACE_static_cast (CORBA::ULong, - minimum_number_members) - count; + static_cast<CORBA::ULong>(minimum_number_members) - count; CORBA::ULong creation_count = 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 3a95a39877f..01c0714b326 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -344,7 +344,7 @@ TAO_PG_ObjectGroupManager::locations_of_members ( TAO_PG_MemberInfo_Set & member_infos = group_entry->member_infos; - locations->length (ACE_static_cast (CORBA::ULong, member_infos.size ())); + locations->length (static_cast<CORBA::ULong>(member_infos.size ())); CORBA::ULong loc = 0; TAO_PG_MemberInfo_Set::iterator end = member_infos.end (); @@ -376,7 +376,7 @@ TAO_PG_ObjectGroupManager::groups_at_location ( TAO_PG_ObjectGroup_Array * groups; if (this->location_map_.find (the_location, groups) == 0) { - CORBA::ULong len = ACE_static_cast (CORBA::ULong, groups->size ()); + CORBA::ULong len = static_cast<CORBA::ULong>(groups->size ()); ogs->length (len); @@ -655,7 +655,7 @@ TAO_PG_ObjectGroupManager::member_count ( ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - return ACE_static_cast (CORBA::ULong, group_entry->member_infos.size ()); + return static_cast<CORBA::ULong>(group_entry->member_infos.size ()); } void diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index cd3af12150b..b51eb99c91e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -451,8 +451,7 @@ TAO::PG_Object_Group::increment_version (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%T %n (%P|%t) - Setting IOGR version to %u\n"), - ACE_static_cast (unsigned, - this->tagged_component_.object_group_ref_version) + static_cast<unsigned>(this->tagged_component_.object_group_ref_version) )); } @@ -503,8 +502,7 @@ TAO::PG_Object_Group::distribute_iogr (ACE_ENV_SINGLE_ARG_DECL) "IOGR to %s member: %s@%s.\n", (info->is_primary_ ? "Primary" : "Backup"), this->role_.c_str (), - ACE_static_cast (const char *, - info->location_[0].id) + static_cast<const char *>(info->location_[0].id) )); } // dump_ior ("group", "iogr", this->tagged_component_.object_group_ref_version, iogr); @@ -827,10 +825,8 @@ TAO::PG_Object_Group::create_members (size_t count ACE_ENV_ARG_DECL) ACE_TEXT ("PG (%P|%t) Replica Factory ") ACE_TEXT ("@ %s refused create_object ") ACE_TEXT ("request for type %s\n"), - ACE_static_cast (const char *, - factory_info.the_location[0].id), - ACE_static_cast (const char *, - this->type_id_.in ()) + static_cast<const char *>(factory_info.the_location[0].id), + static_cast<const char *>(this->type_id_.in ()) )); } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index 1411062912e..233709b8387 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -50,7 +50,7 @@ PortableServer::ObjectId * TAO::PG_Object_Group_Manipulator::convert_ogid_to_oid char oid_str[11]; ACE_OS::snprintf (oid_str, sizeof(oid_str), "%lu", - ACE_static_cast (ACE_UINT32,ogid)); + static_cast<ACE_UINT32>(ogid)); oid_str[sizeof(oid_str) - 1] = '\0'; return PortableServer::string_to_ObjectId (oid_str); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp index 50f350c3e12..b96f55ce982 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp @@ -73,13 +73,13 @@ TAO::PG_Property_Set::decode (const PortableGroup::Properties & property_set // @@ TODO: fix this const CosNaming::NameComponent & nc = nsName[0]; - this->set_property (ACE_static_cast (const char *, nc.id), + this->set_property (static_cast<const char *>(nc.id), property.val ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 - ACE_CString name = ACE_static_cast (const char *, nc.id); + ACE_CString name = static_cast<const char *>(nc.id); const PortableGroup::Value * value_copy; ACE_NEW_THROW_EX (value_copy, @@ -134,7 +134,7 @@ void TAO::PG_Property_Set::remove (const PortableGroup::Properties & property_se // note assumption one level name with no kind // @@ TODO: fix this const CosNaming::NameComponent & nc = nsName[0]; - ACE_CString name = ACE_static_cast (const char *, nc.id); + ACE_CString name = static_cast<const char *>(nc.id); const PortableGroup::Value * deleted_value; if ( 0 == this->values_.unbind (name, deleted_value)) @@ -219,7 +219,7 @@ void TAO::PG_Property_Set::merge_properties (ValueMap & merged_values) const this->defaults_->merge_properties (merged_values); } // note AFICT ACE_Hash_Map does not support const iterators, hence the const cast. - ValueMap & mutable_values = ACE_const_cast (ValueMap &, this->values_); + ValueMap & mutable_values = const_cast<ValueMap &>(this->values_); for (ValueMapIterator it = mutable_values.begin (); it != mutable_values.end (); ++it) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp index 412f0d6747c..10205457e26 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp @@ -37,8 +37,7 @@ namespace TAO return retval; // Get the length of the CDR stream - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - cdr.total_length ()); + CORBA::ULong length = static_cast<CORBA::ULong>(cdr.total_length ()); // Set the length tagged_components.component_data.length (length); @@ -107,9 +106,7 @@ namespace TAO // Look for the primary if (pfile_tagged.get_component (tc) == 1) { - TAO_InputCDR cdr (ACE_reinterpret_cast ( - const char*, - tc.component_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<const char*>(tc.component_data.get_buffer ()), tc.component_data.length ()); CORBA::Boolean byte_order; @@ -119,7 +116,7 @@ namespace TAO if (!cdr.good_bit ()) return 0; - cdr.reset_byte_order (ACE_static_cast (int,byte_order)); + cdr.reset_byte_order (static_cast<int>(byte_order)); cdr >> tg; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp index 82beb1b6072..4a16291de70 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp @@ -100,14 +100,14 @@ TAO_POA_Hooks::find_group_component_in_profile (const TAO_Profile* profile, 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)); if ((in_cdr >> group) == 0) return -1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp index dfce327b82a..965456556af 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp @@ -99,7 +99,7 @@ TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile, // Removed the constness of profile. We're not changing // anything, but need to call a nonconst function. - TAO_Profile* nc_profile = ACE_const_cast (TAO_Profile *, profile); + TAO_Profile* nc_profile = const_cast<TAO_Profile *>(profile); nc_profile->endpoint ()->addr_to_string (buffer, MAX_ADDR_LENGTH); if (acceptor->open (&orb_core, @@ -178,7 +178,7 @@ TAO_PortableGroup_Acceptor_Registry::find (const TAO_Profile* profile, // Since the endpoint routine is nonconst, need to // cast away the constness even though we're not // changing anything. - TAO_Profile *nc_profile = ACE_const_cast (TAO_Profile *,profile); + TAO_Profile *nc_profile = const_cast<TAO_Profile *>(profile); if (entry->endpoint->is_equivalent (nc_profile->endpoint ())) return 1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index d77ace4801f..d47674a04d7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -121,7 +121,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ // reset it so that the request demarshals correctly. TAO_InputCDR &tao_in = request.incoming (); ACE_Message_Block *msgblk = - ACE_const_cast (ACE_Message_Block *, tao_in.start ()); + const_cast<ACE_Message_Block *>(tao_in.start ()); char *read_ptr = msgblk->rd_ptr (); // Iterate through the list of ObjectKeys. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp index aa6f60f8de9..a00899c560c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp @@ -105,10 +105,8 @@ TAO_UIPMC_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; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp index 9079b84e62e..0a6ed6a5786 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp @@ -108,8 +108,7 @@ TAO_UIPMC_Connector::set_validate_endpoint (TAO_Endpoint *endpoint) return -1; TAO_UIPMC_Endpoint *uipmc_endpoint = - ACE_dynamic_cast (TAO_UIPMC_Endpoint *, - endpoint ); + dynamic_cast<TAO_UIPMC_Endpoint *>(endpoint ); if (uipmc_endpoint == 0) return -1; @@ -143,8 +142,7 @@ TAO_UIPMC_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_Time_Value *) { TAO_UIPMC_Endpoint *uipmc_endpoint = - ACE_dynamic_cast (TAO_UIPMC_Endpoint *, - desc.endpoint ()); + dynamic_cast<TAO_UIPMC_Endpoint *>(desc.endpoint ()); if (uipmc_endpoint == 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp index 6f17ee9c687..ae19e01043a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp @@ -113,11 +113,9 @@ TAO_UIPMC_Endpoint::duplicate (void) CORBA::Boolean TAO_UIPMC_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_UIPMC_Endpoint *endpoint = ACE_dynamic_cast (TAO_UIPMC_Endpoint *, - endpt); + TAO_UIPMC_Endpoint *endpoint = dynamic_cast<TAO_UIPMC_Endpoint *>(endpt); if (endpoint == 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp index bf301d061fe..bcc7fd908dd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp @@ -29,7 +29,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, if (current_iov_len <= max_length) { // Return the full data portion. - block.iov_len = ACE_static_cast (u_long, current_iov_len); + block.iov_len = static_cast<u_long>(current_iov_len); block.iov_base = this->iov_[this->iov_index_].iov_base; // Go to the next block. @@ -41,14 +41,14 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, { // Let the caller use the first part of this // message block. - block.iov_len = ACE_static_cast (u_long, max_length); + block.iov_len = static_cast<u_long>(max_length); block.iov_base = this->iov_[this->iov_index_].iov_base; // Break up the block. this->iov_len_left_ = current_iov_len - max_length; this->iov_ptr_ = ACE_reinterpret_cast (char *, - ACE_reinterpret_cast (char *, block.iov_base) + reinterpret_cast<char *>(block.iov_base) + max_length); this->state_ = INTRA_BLOCK; @@ -61,7 +61,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, if (this->iov_len_left_ <= max_length) { // Return everything that's left in the block. - block.iov_len = ACE_static_cast (u_long, this->iov_len_left_); + block.iov_len = static_cast<u_long>(this->iov_len_left_); block.iov_base = this->iov_ptr_; // Go to the next block. @@ -75,7 +75,7 @@ UIPMC_Message_Block_Data_Iterator::next_block (size_t max_length, else { // Split a little more off the block. - block.iov_len = ACE_static_cast (u_long, this->iov_len_left_); + block.iov_len = static_cast<u_long>(this->iov_len_left_); block.iov_base = this->iov_ptr_; this->iov_len_left_ -= max_length; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 1a1a00a680a..3a5dce97668 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -355,7 +355,7 @@ CORBA::Boolean TAO_UIPMC_Profile::do_is_equivalent (const TAO_Profile *other_profile) { const TAO_UIPMC_Profile *op = - ACE_dynamic_cast (const TAO_UIPMC_Profile *, other_profile); + dynamic_cast<const TAO_UIPMC_Profile *>(other_profile); if (op == 0) return 0; @@ -411,7 +411,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 1 /* colon separator */ + 5 /* port number */); - char * buf = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, buflen)); + char * buf = CORBA::string_alloc (static_cast<CORBA::ULong>(buflen)); ACE_OS::sprintf (buf, "corbaloc:%s://1.0@%s:%d", @@ -443,7 +443,7 @@ TAO_UIPMC_Profile::create_tagged_profile (void) this->create_profile_body (encap); CORBA::ULong length = - ACE_static_cast(CORBA::ULong,encap.total_length ()); + static_cast<CORBA::ULong>(encap.total_length ()); #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) // Place the message block in to the Sequence of Octets that we @@ -500,14 +500,14 @@ TAO_UIPMC_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_UIPMCEndpointSequence endpoints; @@ -589,8 +589,7 @@ TAO_UIPMC_Profile::update_cached_group_component (void) IOP::TaggedComponent tagged_component; tagged_component.tag = IOP::TAG_GROUP; - 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 (); @@ -674,8 +673,7 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, //#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) // TAO_InputCDR cdr (profile.profile_data.mb ()); //#else - TAO_InputCDR cdr (ACE_reinterpret_cast(const char*, - profile.profile_data.get_buffer ()), + TAO_InputCDR cdr (reinterpret_cast<const char*>(profile.profile_data.get_buffer ()), profile.profile_data.length ()); //#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ @@ -683,7 +681,7 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, CORBA::Boolean byte_order; 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)); // Read and verify major, minor versions, ignoring UIPMC profiles // whose versions we don't understand. @@ -732,13 +730,13 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, 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. 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)); if ((in_cdr >> group) == 0) return -1; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index 29f73f0da8a..b4fbc4769aa 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -260,9 +260,9 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt, miop_hdr.write_ulong (num_fragments); // UniqueId - ptrdiff_t unique_id = ACE_reinterpret_cast (ptrdiff_t, iov); + ptrdiff_t unique_id = reinterpret_cast<ptrdiff_t>(iov); this->write_unique_id (miop_hdr, - ACE_static_cast (unsigned long, unique_id)); + static_cast<unsigned long>(unique_id)); // Send the buffers. current_fragment = &fragments[0]; @@ -387,15 +387,15 @@ TAO_UIPMC_Transport::recv (char *buf, #if !defined (ACE_DISABLE_SWAP_ON_READ) if (byte_order == ACE_CDR_BYTE_ORDER) { - id_length = *ACE_reinterpret_cast (ACE_CDR::ULong*, &buf[MIOP_ID_LENGTH_OFFSET]); + id_length = *reinterpret_cast<ACE_CDR::ULong*>(&buf[MIOP_ID_LENGTH_OFFSET]); } else { ACE_CDR::swap_4 (&buf[MIOP_ID_LENGTH_OFFSET], - ACE_reinterpret_cast (char*, &id_length)); + reinterpret_cast<char*>(&id_length)); } #else - id_length = *ACE_reinterpret_cast (ACE_CDR::ULong*, &buf[MIOP_ID_LENGTH_OFFSET]); + id_length = *reinterpret_cast<ACE_CDR::ULong*>(&buf[MIOP_ID_LENGTH_OFFSET]); #endif /* ACE_DISABLE_SWAP_ON_READ */ // Make sure that the length field is legal. diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp index c8345528754..d487144db8b 100644 --- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp @@ -696,7 +696,7 @@ CORBA::ULong TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return ACE_static_cast (CORBA::ULong, this->hash_table_.current_size ()); + return static_cast<CORBA::ULong>(this->hash_table_.current_size ()); } // Returns all of the property names currently defined in the @@ -1738,8 +1738,7 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many, if (this->iterator_.next (entry_ptr) == 0 || how_many == 0) return 0; - CORBA::ULong size = ACE_static_cast (CORBA::ULong, - this->iterator_.map ().current_size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(this->iterator_.map ().current_size ()); CORBA::ULong len = 0; if (how_many <= size) @@ -1834,8 +1833,7 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many, if (this->iterator_.next (entry_ptr) == 0 || how_many == 0) return 0; - CORBA::ULong size = ACE_static_cast (CORBA::ULong, - this->iterator_.map ().current_size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(this->iterator_.map ().current_size ()); CORBA::ULong len; if (how_many <= size) diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i index 976c7639084..e90d0fbb99f 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i @@ -30,5 +30,5 @@ ACE_INLINE u_long TAO::CosSchedulingInvocation_Hash_key::operator () ( const COS_SCHEDULING_INVOCATION_KEY &key) const { - return ACE_static_cast(u_long, key); + return static_cast<u_long>(key); } diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp index 30be4e2a8a5..c0dc1f088d7 100644 --- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp @@ -127,10 +127,10 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle, || rt_info_[handle - 1].cached_execution_time != cached_time || rt_info_[handle - 1].period != period || rt_info_[handle - 1].criticality != criticality - || rt_info_[handle - 1].importance != ACE_static_cast (CORBA::Long, importance) + || rt_info_[handle - 1].importance != static_cast<CORBA::Long>(importance) || rt_info_[handle - 1].quantum != quantum || rt_info_[handle - 1].info_type != info_type - || rt_info_[handle - 1].threads != ACE_static_cast (CORBA::Long, threads)) + || rt_info_[handle - 1].threads != static_cast<CORBA::Long>(threads)) ACE_ERROR ((LM_ERROR, "invalid data for RT_Info: %s\n", (const char*)rt_info_[handle - 1].entry_point)); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp index b45536ee0cc..706d2fbc2ba 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp @@ -13,8 +13,7 @@ ACE_RCSID(Sched, Config_Scheduler, "$Id$") ACE_Config_Scheduler::ACE_Config_Scheduler (void) #if defined (TAO_USES_STRATEGY_SCHEDULER) - : scheduler_strategy_ (ACE_static_cast (RtecScheduler::Preemption_Priority_t, - TAO_MIN_CRITICAL_PRIORITY)) + : scheduler_strategy_ (static_cast<RtecScheduler::Preemption_Priority_t>(TAO_MIN_CRITICAL_PRIORITY)) , impl (new ACE_Strategy_Scheduler (scheduler_strategy_)) #else : impl (new Scheduler_Generic) @@ -268,7 +267,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, const char *anomaly_severity_msg = "NONE"; CORBA::ULong anomaly_index = 0; CORBA::ULong anomaly_set_size = - ACE_static_cast (CORBA::ULong, anomaly_set.size ()); + static_cast<CORBA::ULong>(anomaly_set.size ()); if (anomalies.ptr () == 0) { anomalies = @@ -385,7 +384,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, } infos->length (impl->tasks ()); for (RtecScheduler::handle_t handle = 1; - handle <= ACE_static_cast (RtecScheduler::handle_t, impl->tasks ()); + handle <= static_cast<RtecScheduler::handle_t>(impl->tasks ()); ++handle) { RtecScheduler::RT_Info* rt_info = 0; @@ -414,8 +413,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority, configs->length (impl->minimum_priority_queue () + 1); for (RtecScheduler::Preemption_Priority_t priority = 0; priority <= - ACE_static_cast (RtecScheduler::Preemption_Priority_t, - impl->minimum_priority_queue ()); + static_cast<RtecScheduler::Preemption_Priority_t>(impl->minimum_priority_queue ()); ++priority) { RtecScheduler::Config_Info* config_info = 0; diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index 86c3113f068..4ea8c847d54 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -711,7 +711,7 @@ ACE_DynScheduler::schedule ( else { // save the total number of registered RT_Infos - tasks (ACE_static_cast (u_int, rt_info_entries_.size ())); + tasks (static_cast<u_int>(rt_info_entries_.size ())); } // set up the task entry data structures @@ -1279,7 +1279,7 @@ ACE_DynScheduler::calculate_utilization_params (void) ACE_static_cast (double, ACE_UINT64_DBLCAST_ADAPTER (ordered_dispatch_entries_ [i]-> task_entry ().rt_info ()->worst_case_execution_time)) / - ACE_static_cast (double, ordered_dispatch_entries_ [i]-> + static_cast<double>(ordered_dispatch_entries_ [i]-> task_entry ().effective_period ()); } } @@ -1317,7 +1317,7 @@ ACE_DynScheduler::status_t ACE_DynScheduler::setup_task_entries (void) { // store number of tasks, based on registrations - tasks (ACE_static_cast (u_int, rt_info_entries_.size ())); + tasks (static_cast<u_int>(rt_info_entries_.size ())); // bail out if there are no tasks registered if (tasks () <= 0) @@ -1725,7 +1725,7 @@ ACE_DynScheduler::schedule_threads (ACE_Unbounded_Set<RtecScheduler::Scheduling_ ACE_DynScheduler::status_t ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduling_Anomaly *> &anomaly_set) { - dispatch_entry_count_ = ACE_static_cast (u_int, dispatch_entries_->size ()); + dispatch_entry_count_ = static_cast<u_int>(dispatch_entries_->size ()); ACE_NEW_RETURN (ordered_dispatch_entries_, Dispatch_Entry * [dispatch_entry_count_], @@ -1870,10 +1870,10 @@ ACE_DynScheduler::create_timeline () // have to change when TimeBase.idl is finalized. const TimeBase::TimeT arrival = ordered_dispatch_entries_[i]->arrival () + - ACE_static_cast (ACE_UINT32, current_frame_offset); + static_cast<ACE_UINT32>(current_frame_offset); const TimeBase::TimeT deadline= ordered_dispatch_entries_[i]->deadline () + - ACE_static_cast (ACE_UINT32, current_frame_offset); + static_cast<ACE_UINT32>(current_frame_offset); ACE_NEW_RETURN ( new_dispatch_entry, @@ -2331,12 +2331,8 @@ ACE_DynScheduler::output_viewer_timeline (FILE *file) file, "%-11s %9f %9f %8u %8u %11u %11u\n", current_entry->dispatch_entry ().task_entry ().rt_info ()-> entry_point.in (), - ACE_static_cast ( - double, - ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) / - ACE_static_cast ( - double, - ACE_UINT64_DBLCAST_ADAPTER(current_completion)), + static_cast<double>(ACE_UINT64_DBLCAST_ADAPTER(current_accumulated_execution)) / + static_cast<double>(ACE_UINT64_DBLCAST_ADAPTER(current_completion)), 0.0, ACE_U64_TO_U32 (current_entry->arrival ()), ACE_U64_TO_U32 (current_entry->deadline ()), diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp index ffcbe5908fc..8a6ae0189db 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp @@ -209,7 +209,7 @@ TAO_RT_Info_Tuple::~TAO_RT_Info_Tuple () void TAO_RT_Info_Tuple::operator = (const RtecScheduler::RT_Info &info) { - ACE_static_cast (TAO_RT_Info_Ex, *this) = info; + static_cast<TAO_RT_Info_Ex>(*this) = info; } @@ -955,7 +955,7 @@ TAO_Reconfig_Sched_Strategy_Base::comp_tuple_finish_times (const void *first, co // make Sun C++ 4.2 happy. TAO_RT_Info_Tuple **first_tuple = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, first)); + const_cast<void *>(first)); //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void* void * first_entry = ACE_LONGLONG_TO_PTR (void *, @@ -963,7 +963,7 @@ TAO_Reconfig_Sched_Strategy_Base::comp_tuple_finish_times (const void *first, co TAO_RT_Info_Tuple **second_tuple = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, second)); + const_cast<void *>(second)); //volatile_token is a TAO_Reconfig_Scheduler_Entry*, but we need to treat it as a void* void * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1109,10 +1109,10 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const // make Sun C++ 4.2 happy. TAO_Reconfig_Scheduler_Entry **first = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry **second = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); // Check the converted pointers. if (first == 0 || *first == 0) @@ -1164,7 +1164,7 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, // make Sun C++ 4.2 happy. TAO_RT_Info_Tuple **first = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry * first_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1172,7 +1172,7 @@ TAO_MUF_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, TAO_RT_Info_Tuple **second = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); TAO_Reconfig_Scheduler_Entry * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1313,10 +1313,10 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const // make Sun C++ 4.2 happy. TAO_Reconfig_Scheduler_Entry **first = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry **second = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); // Check the converted pointers. if (first == 0 || *first == 0) @@ -1371,7 +1371,7 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, // make Sun C++ 4.2 happy. TAO_RT_Info_Tuple **first = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry * first_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1379,7 +1379,7 @@ TAO_RMS_FAIR_Reconfig_Sched_Strategy::total_admission_comp (const void *s, TAO_RT_Info_Tuple **second = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); TAO_Reconfig_Scheduler_Entry * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1543,10 +1543,10 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_priority_comp (const void *s, const v // make Sun C++ 4.2 happy. TAO_Reconfig_Scheduler_Entry **first = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry **second = ACE_reinterpret_cast (TAO_Reconfig_Scheduler_Entry **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); // Check the converted pointers. if (first == 0 || *first == 0) @@ -1601,7 +1601,7 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_admission_comp (const void *s, // make Sun C++ 4.2 happy. TAO_RT_Info_Tuple **first = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, s)); + const_cast<void *>(s)); TAO_Reconfig_Scheduler_Entry * first_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, @@ -1609,7 +1609,7 @@ TAO_RMS_MLF_Reconfig_Sched_Strategy::total_admission_comp (const void *s, TAO_RT_Info_Tuple **second = ACE_reinterpret_cast (TAO_RT_Info_Tuple **, - ACE_const_cast (void *, t)); + const_cast<void *>(t)); TAO_Reconfig_Scheduler_Entry * second_entry = ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *, diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp index 1b7dca516b3..d4b767e78f4 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp @@ -946,25 +946,21 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple & // Compute the current tuple's utilization. CORBA::Double delta_utilization = - (ACE_static_cast (CORBA::Double, - t.threads) + (static_cast<CORBA::Double>(t.threads) * ACE_static_cast (CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (entry-> aggregate_exec_time ()))) - / ACE_static_cast (CORBA::Double, - t.period); + / static_cast<CORBA::Double>(t.period); // Subtract the previous tuple's utilization (if any) for the entry. if (entry->current_admitted_tuple ()) { delta_utilization -= - (ACE_static_cast (CORBA::Double, - entry->current_admitted_tuple ()->threads) + (static_cast<CORBA::Double>(entry->current_admitted_tuple ()->threads) * ACE_static_cast (CORBA::Double, ACE_UINT64_DBLCAST_ADAPTER (entry-> aggregate_exec_time ()))) - / ACE_static_cast (CORBA::Double, - entry->current_admitted_tuple ()->period); + / static_cast<CORBA::Double>(entry->current_admitted_tuple ()->period); } if (RECONFIG_SCHED_STRATEGY::is_critical (t)) diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index dab2f3de771..b323dc764c5 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -1572,7 +1572,7 @@ get_config_info_set (RtecScheduler::Config_Info_Set_out configs ++config_iter) { config_info = (*config_iter).int_id_; - configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info; + configs[static_cast<CORBA::ULong>(config_info->preemption_priority)] = *config_info; } return; @@ -1692,7 +1692,7 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs ++config_iter) { config_info = (*config_iter).int_id_; - configs[ACE_static_cast (CORBA::ULong, config_info->preemption_priority)] = *config_info; + configs[static_cast<CORBA::ULong>(config_info->preemption_priority)] = *config_info; } } @@ -1814,8 +1814,7 @@ create_i (const char *entry_point, // Connect the entry to the RT_Info. new_rt_info->volatile_token = ACE_static_cast (CORBA::ULongLong, - ACE_reinterpret_cast (ptrdiff_t, - new_sched_entry)); + reinterpret_cast<ptrdiff_t>(new_sched_entry)); // With everything safely registered in the map and tree, just // update the next handle and info counter and return the new info. @@ -2510,11 +2509,10 @@ detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL) // Sort the pointers to entries in order of descending forward // finish times, which produces a reverse topological ordering, // with callers ahead of called nodes. - ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_), + ACE_OS::qsort (reinterpret_cast<void *>(entry_ptr_array_), this->rt_info_count_, sizeof (TAO_Reconfig_Scheduler_Entry *), - ACE_reinterpret_cast (COMP_FUNC, - RECONFIG_SCHED_STRATEGY::comp_entry_finish_times)); + reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::comp_entry_finish_times)); // Traverse entries in reverse topological order, // looking for strongly connected components (cycles). @@ -2573,11 +2571,10 @@ perform_admission_i (ACE_ENV_SINGLE_ARG_DECL) // Sort the pointers to original tuples in ascending admission // order, according to the scheduling strategy's admission policy. - ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_), + ACE_OS::qsort (reinterpret_cast<void *>(tuple_ptr_array_), this->rt_info_tuple_count_, sizeof (TAO_RT_Info_Tuple *), - ACE_reinterpret_cast (COMP_FUNC, - RECONFIG_SCHED_STRATEGY::total_admission_comp)); + reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::total_admission_comp)); // Traverse tuples in admission order, updating the associate tuple // for each thread delineator. @@ -2657,11 +2654,10 @@ propagate_criticalities_i (ACE_ENV_SINGLE_ARG_DECL) // Sort the pointers to original tuples in ascending admission // order, according to the scheduling strategy's admission policy. - ACE_OS::qsort (ACE_reinterpret_cast (void *, tuple_ptr_array_), + ACE_OS::qsort (reinterpret_cast<void *>(tuple_ptr_array_), this->rt_info_tuple_count_, sizeof (TAO_RT_Info_Tuple *), - ACE_reinterpret_cast (COMP_FUNC, - RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times )); + reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::comp_tuple_finish_times )); // Traverse entries in topological (ascending forward DFS // finish time) order, propagating aggregate execution @@ -2762,11 +2758,10 @@ assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL) // Sort the pointers to entries in descending order // of static priority and static subpriority, according // to our given scheduling strategy. - ACE_OS::qsort (ACE_reinterpret_cast (void *, entry_ptr_array_), + ACE_OS::qsort (reinterpret_cast<void *>(entry_ptr_array_), this->rt_info_count_, sizeof (TAO_Reconfig_Scheduler_Entry *), - ACE_reinterpret_cast (COMP_FUNC, - RECONFIG_SCHED_STRATEGY::total_priority_comp)); + reinterpret_cast<COMP_FUNC>(RECONFIG_SCHED_STRATEGY::total_priority_comp)); #ifdef SCHEDULER_LOGGING ACE_DEBUG ((LM_DEBUG, "Scheduler::qsorted array is\n")); diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp index b6cfd9c042e..5a44a27eb68 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp @@ -228,7 +228,7 @@ Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> status_t status = ACE_Scheduler::SUCCEEDED; // store number of tasks, based on registrations - tasks (ACE_static_cast (u_int, task_entries_.size ())); + tasks (static_cast<u_int>(task_entries_.size ())); if (output_level () > 0) { diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp index 6192a59802a..39164b0afb7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp @@ -839,8 +839,8 @@ int ACE_MUF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) { return ACE_MUF_Scheduler_Strategy::instance ()-> - sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1), - ** ACE_static_cast (Dispatch_Entry **, arg2)); + sort_comp (** static_cast<Dispatch_Entry **>(arg1), + ** static_cast<Dispatch_Entry **>(arg2)); } @@ -975,8 +975,8 @@ int ACE_RMS_Scheduler_Strategy::sort_function (void *arg1, void *arg2) { return ACE_RMS_Scheduler_Strategy::instance ()-> - sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1), - ** ACE_static_cast (Dispatch_Entry **, arg2)); + sort_comp (** static_cast<Dispatch_Entry **>(arg1), + ** static_cast<Dispatch_Entry **>(arg2)); } @@ -1119,8 +1119,8 @@ int ACE_MLF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) { return ACE_MLF_Scheduler_Strategy::instance ()-> - sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1), - ** ACE_static_cast (Dispatch_Entry **, arg2)); + sort_comp (** static_cast<Dispatch_Entry **>(arg1), + ** static_cast<Dispatch_Entry **>(arg2)); } @@ -1246,8 +1246,8 @@ int ACE_EDF_Scheduler_Strategy::sort_function (void *arg1, void *arg2) { return ACE_EDF_Scheduler_Strategy::instance ()-> - sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1), - ** ACE_static_cast (Dispatch_Entry **, arg2)); + sort_comp (** static_cast<Dispatch_Entry **>(arg1), + ** static_cast<Dispatch_Entry **>(arg2)); } // = Provides the dispatching queue type for the given dispatch entry. @@ -1371,8 +1371,8 @@ int ACE_Criticality_Scheduler_Strategy::sort_function (void *arg1, void *arg2) { return ACE_Criticality_Scheduler_Strategy::instance ()-> - sort_comp (** ACE_static_cast (Dispatch_Entry **, arg1), - ** ACE_static_cast (Dispatch_Entry **, arg2)); + sort_comp (** static_cast<Dispatch_Entry **>(arg1), + ** static_cast<Dispatch_Entry **>(arg2)); } diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp index be402ec48d6..1604975f718 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp @@ -140,8 +140,7 @@ TAO_Time_Service_Clerk::get_time (void) const ACE_Time_Value timeofday = ACE_OS::gettimeofday (); - return (CORBA::ULongLong) (ACE_static_cast (CORBA::ULongLong, - timeofday.sec ()) * + return (CORBA::ULongLong) (static_cast<CORBA::ULongLong>(timeofday.sec ()) * ACE_static_cast (ACE_UINT32, 10000000) + ACE_static_cast (CORBA::ULongLong, diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp index 9ef74fcc11b..3f4ba9b3fcf 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp @@ -58,8 +58,7 @@ TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL) // Return the local time of the system as a UTO. ACE_NEW_THROW_EX (uto, TAO_UTO ((TAO_Time_Base_Offset + - ACE_static_cast (CORBA::ULongLong, - timeofday.sec ())) * + static_cast<CORBA::ULongLong>(timeofday.sec ())) * ACE_static_cast (ACE_UINT32, 10000000) + ACE_static_cast (CORBA::ULongLong, diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index ae7a167fc70..120b58eacb9 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -119,7 +119,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, ACE_OS::tzset (); long arg = ACE_OS::timezone () / 60; - CORBA::Short goodarg = ACE_static_cast (CORBA::Short, arg); + CORBA::Short goodarg = static_cast<CORBA::Short>(arg); clerk_->time_displacement_factor (goodarg); // Set the inaccuracy. @@ -133,8 +133,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // Record the current time in a timestamp to know when global // updation of time was done. clerk_->update_timestamp_ = - ACE_static_cast (CORBA::ULongLong, - timeofday.sec ()) * + static_cast<CORBA::ULongLong>(timeofday.sec ()) * ACE_static_cast (ACE_UINT32, 10000000) + ACE_static_cast (CORBA::ULongLong, diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i index 280f9fa6121..8dee2f9abd1 100644 --- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i +++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i @@ -40,8 +40,8 @@ ORBSVCS_Time::Time_Value_to_TimeT (TimeBase::TimeT& lhs, const ACE_Time_Value& rhs) { ACE_hrtime_t t = - ACE_static_cast (ACE_hrtime_t, rhs.sec ()) * ACE_U_ONE_SECOND_IN_NSECS + - ACE_static_cast (ACE_hrtime_t, rhs.usec ()) * 1000u; + static_cast<ACE_hrtime_t>(rhs.sec ()) * ACE_U_ONE_SECOND_IN_NSECS + + static_cast<ACE_hrtime_t>(rhs.usec ()) * 1000u; ORBSVCS_Time::hrtime_to_TimeT (lhs, t); } diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp index 39dad9545ed..cf0ee7f749b 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp @@ -167,7 +167,7 @@ order_offer (TAO_Constraint_Evaluator& evaluator, if (expr_type == TAO_FIRST || (expr_type == TAO_WITH - && ! ACE_static_cast (CORBA::Boolean, pref_info.value_))) + && ! static_cast<CORBA::Boolean>(pref_info.value_))) this->offers_.enqueue_tail (pref_info); else this->offers_.enqueue_head (pref_info); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 26f50946f68..2046dc94a48 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -533,13 +533,13 @@ sequence_does_contain (CORBA::Any* sequence, case CORBA::tk_short: { CORBA::Long value = element; - return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::Short, value)); + return_value = ::TAO_find (*sequence, static_cast<CORBA::Short>(value)); } break; case CORBA::tk_ushort: { CORBA::ULong value = element; - return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::UShort, value)); + return_value = ::TAO_find (*sequence, static_cast<CORBA::UShort>(value)); } break; case CORBA::tk_long: @@ -557,7 +557,7 @@ sequence_does_contain (CORBA::Any* sequence, case CORBA::tk_float: { CORBA::Double value = element; - return_value = ::TAO_find (*sequence, ACE_static_cast (CORBA::Float, value)); + return_value = ::TAO_find (*sequence, static_cast<CORBA::Float>(value)); } break; case CORBA::tk_double: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp index b5bce8c79a9..fcc3dba55fe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp @@ -305,7 +305,7 @@ generate_offer_id (const char *service_type_name, CORBA::ULong id) // hold portions of id string. CosTrading::OfferId offer_id = - CORBA::string_alloc (ACE_static_cast (CORBA::ULong, total_size)); + CORBA::string_alloc (static_cast<CORBA::ULong>(total_size)); char* return_value = 0; ACE_OS::sprintf (offer_id, "%016u%s", id, service_type_name); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index a08cc671b42..98616cc46a1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -54,7 +54,7 @@ TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { - return ACE_static_cast (CORBA::ULong, this->offers_.size ()); + return static_cast<CORBA::ULong>(this->offers_.size ()); } CORBA::Boolean @@ -65,8 +65,7 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, { offers = new CosTrading::OfferSeq; - CORBA::ULong sequence_size = ACE_static_cast (CORBA::ULong, - this->offers_.size ()); + CORBA::ULong sequence_size = static_cast<CORBA::ULong>(this->offers_.size ()); CORBA::ULong offers_in_sequence = (n < sequence_size) ? n : sequence_size; offers->length (offers_in_sequence); @@ -238,7 +237,7 @@ TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { - return ACE_static_cast (CORBA::ULong, this->ids_.size ()); + return static_cast<CORBA::ULong>(this->ids_.size ()); } void @@ -267,8 +266,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, ACE_THROW_SPEC ((CORBA::SystemException)) { // Calculate the number of Ids to be returned in this. - CORBA::ULong items_left = ACE_static_cast (CORBA::ULong, - this->ids_.size()); + CORBA::ULong items_left = static_cast<CORBA::ULong>(this->ids_.size()); int difference = items_left - n; CORBA::ULong returnable_items = (difference >= 0) ? n : items_left; CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp index 7c3f5af8b47..cb7e6a850b3 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp @@ -43,7 +43,7 @@ max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::UnknownMaxLeft)) { - return ACE_static_cast (CORBA::ULong, this->offer_ids_.size ()); + return static_cast<CORBA::ULong>(this->offer_ids_.size ()); } template <class MAP_LOCK_TYPE> CORBA::Boolean @@ -57,7 +57,7 @@ next_n (CORBA::ULong n, CORBA::ULong max_possible_offers_in_sequence = (n < this->offer_ids_.size ()) ? n : - ACE_static_cast (CORBA::ULong, this->offer_ids_.size ()); + static_cast<CORBA::ULong>(this->offer_ids_.size ()); ACE_NEW_THROW_EX (offers, CosTrading::OfferSeq, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp index d91740eb668..dbf0e06c817 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp @@ -200,8 +200,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes ACE_CHECK_RETURN (0); CORBA::ULong i = 0; - CORBA::ULong length = ACE_static_cast (CORBA::ULong, - this->type_map_.current_size ()); + CORBA::ULong length = static_cast<CORBA::ULong>(this->type_map_.current_size ()); CosTrading::ServiceTypeName *types = CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq::allocbuf (length); @@ -406,8 +405,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct // Count the total number of properties. CORBA::ULong num_props = 0; - CORBA::ULong num_types = ACE_static_cast (CORBA::ULong, - service_type_queue.size ()); + CORBA::ULong num_types = static_cast<CORBA::ULong>(service_type_queue.size ()); TAO_String_Queue::ITERATOR iterator (service_type_queue); @@ -419,8 +417,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct Service_Type_Map::ENTRY *type_entry = 0; iterator.next (next_type_name); - TAO_String_Hash_Key hash_key (ACE_const_cast (const char *, - *next_type_name)); + TAO_String_Hash_Key hash_key (const_cast<const char *>(*next_type_name)); this->type_map_.find (hash_key, type_entry); @@ -451,8 +448,7 @@ fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct Service_Type_Map::ENTRY *type_entry = 0; iterator.next (next_type_name); - TAO_String_Hash_Key hash_key (ACE_const_cast (const char *, - *next_type_name)); + TAO_String_Hash_Key hash_key (const_cast<const char *>(*next_type_name)); this->type_map_.find (hash_key, type_entry); @@ -492,8 +488,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ const char *type_name = type_struct.super_types[i]; - target.enqueue_tail (ACE_const_cast (char *, - type_name)); + target.enqueue_tail (const_cast<char *>(type_name)); this->collect_inheritance_hierarchy (next_type_struct, target); @@ -684,8 +679,7 @@ update_type_map (const char *name, /* CORBA::ULong pslength = props.length (); CosTradingRepos::ServiceTypeRepository::PropStructSeq* pstructs = - ACE_const_cast (CosTradingRepos::ServiceTypeRepository::PropStructSeq*, - &props); + const_cast<CosTradingRepos::ServiceTypeRepository::PropStructSeq*>(&props); CosTradingRepos::ServiceTypeRepository::PropStruct* psbuf = pstructs->get_buffer (1); type->type_struct_.props.replace (pslength, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp index abe0985540c..a707b341600 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp @@ -670,26 +670,24 @@ TAO_Trader_Factory::manufacture_trader (void) #endif /* ACE_HAS_THREADS */ TAO_TRADER* return_value = 0; - int components = ACE_static_cast (int, TAO_Trader_Base::LOOKUP); + int components = static_cast<int>(TAO_Trader_Base::LOOKUP); if (this->conformance_ >= TAO_TRADER_SIMPLE) - components |= ACE_static_cast (int, TAO_Trader_Base::REGISTER); + components |= static_cast<int>(TAO_Trader_Base::REGISTER); if (this->conformance_ >= TAO_TRADER_STANDALONE) - components |= ACE_static_cast (int, TAO_Trader_Base::ADMIN); + components |= static_cast<int>(TAO_Trader_Base::ADMIN); if (this->conformance_ >= TAO_TRADER_LINKED) - components |= ACE_static_cast (int, TAO_Trader_Base::LINK); + components |= static_cast<int>(TAO_Trader_Base::LINK); if (this->threadsafe_) ACE_NEW_RETURN (return_value, - MT_TRADER (ACE_static_cast (TAO_Trader_Base::Trader_Components, - components)), + MT_TRADER (static_cast<TAO_Trader_Base::Trader_Components>(components)), 0); else ACE_NEW_RETURN (return_value, - TRADER (ACE_static_cast (TAO_Trader_Base::Trader_Components, - components)), + TRADER (static_cast<TAO_Trader_Base::Trader_Components>(components)), 0); TAO_Import_Attributes_i &import_attributes = diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index e2ce0a10940..b3b7fe85936 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -384,7 +384,7 @@ fill_receptacles (const char* /* type */, ACE_CHECK_RETURN (0); CORBA::ULong i = 0; - CORBA::ULong size = ACE_static_cast (CORBA::ULong, pref_inter.num_offers ()); + CORBA::ULong size = static_cast<CORBA::ULong>(pref_inter.num_offers ()); CORBA::ULong offers_in_sequence = (how_many < size) ? how_many : size; CORBA::ULong offers_in_iterator = size - offers_in_sequence; @@ -957,11 +957,11 @@ _cxx_export (CORBA::Object_ptr reference, // No copying, no memory leaks. Violates the "in" parameter semantics // when this object is colocated with the client, however. // CosTrading::PropertySeq* hack_seq = - // ACE_const_cast (CosTrading::PropertySeq*, &properties); + // const_cast<CosTrading::PropertySeq*>(&properties); // CosTrading::Property* pbuf = hack_seq->get_buffer (1); // CosTrading::PropertySeq* hack_seq = - // ACE_const_cast (CosTrading::PropertySeq*, &properties); + // const_cast<CosTrading::PropertySeq*>(&properties); // CosTrading::Property* pbuf = hack_seq->get_buffer (0); // offer->properties.replace (plength, plength, pbuf, 0); // offer->properties._allocate_buffer (plength); @@ -1059,7 +1059,7 @@ modify (const char *id, TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database (); CosTrading::Offer* offer = offer_database. - lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type ACE_ENV_ARG_PARAMETER); + lookup_offer (const_cast<CosTrading::OfferId>(id), type ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (offer != 0) @@ -1325,7 +1325,7 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader) else { size_t time_value = ACE_OS::time (); - ACE_OS::srand (ACE_static_cast (u_int, time_value)); + ACE_OS::srand (static_cast<u_int>(time_value)); this->stem_id_[0] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () % 256); this->stem_id_[1] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () % 256); @@ -1795,7 +1795,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NO size_t size = this->links_.current_size (); CORBA::ULong i = 0; CosTrading::LinkName* link_seq = - CosTrading::LinkNameSeq::allocbuf (ACE_static_cast (CORBA::ULong, size)); + CosTrading::LinkNameSeq::allocbuf (static_cast<CORBA::ULong>(size)); // Copy the link names into the buffer. for (ACE_TYPENAME Links::iterator links_iter (this->links_); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp index e32d8f31182..d4b11716ec0 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp @@ -156,7 +156,7 @@ TAO_Policy_Creator::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type) if (this->poltable_[i] == 0) { occupying_policy = - ACE_static_cast (TAO_Policies::POLICY_TYPE, i); + static_cast<TAO_Policies::POLICY_TYPE>(i); break; } } @@ -1070,7 +1070,7 @@ TAO_Offer_Modifier (const char* type_name, for (i = 0; i < props_length; i++) { TAO_String_Hash_Key prop_name = - ACE_static_cast (const char*, prop_seq[i].name); + static_cast<const char*>(prop_seq[i].name); this->props_.bind (prop_name, &prop_seq[i]); } } @@ -1102,7 +1102,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes for (i = 0; i < length; i++) { - const char* dname = ACE_static_cast (const char*, deletes[i]); + const char* dname = static_cast<const char*>(deletes[i]); if (! TAO_Trader_Base::is_valid_property_name (dname)) ACE_THROW (CosTrading::IllegalPropertyName (dname)); else @@ -1121,7 +1121,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes for (i = 0; i < length; i++) { TAO_String_Hash_Key prop_name = - ACE_static_cast (const char *, deletes[i]); + static_cast<const char *>(deletes[i]); this->props_.unbind (prop_name); } } @@ -1207,7 +1207,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies) TAO_String_Hash_Key prop_name = modifies[i].name.in (); CosTrading::Property* prop = - ACE_const_cast (CosTrading::Property*, &modifies[i]); + const_cast<CosTrading::Property*>(&modifies[i]); if (this->props_.bind (prop_name, prop, entry) == 1) // We need to rebind here. entry->int_id_ = prop; @@ -1215,8 +1215,7 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies) CORBA::ULong num_modified = 0, original_length = this->offer_->properties.length (), - total_length = ACE_static_cast (CORBA::ULong, - this->props_.current_size ()); + total_length = static_cast<CORBA::ULong>(this->props_.current_size ()); // Scrap the existing property sequence and begin a new one CosTrading::PropertySeq prop_seq (total_length); @@ -1407,8 +1406,7 @@ CosTrading::PolicyNameSeq* TAO_Offer_Filter::limits_applied (void) { int i = 0; - CORBA::ULong size = ACE_static_cast (CORBA::ULong, - this->limits_.size ()); + CORBA::ULong size = static_cast<CORBA::ULong>(this->limits_.size ()); CosTrading::PolicyName* temp = CosTrading::PolicyNameSeq::allocbuf (size); @@ -1477,7 +1475,7 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source, Prop_Queue prop_queue; CosTrading::PropertySeq& s_props = source->properties; CosTrading::PropertySeq& d_props = destination.properties; - CORBA::ULong length = ACE_static_cast (CORBA::ULong, s_props.length ()), + CORBA::ULong length = static_cast<CORBA::ULong>(s_props.length ()), elem = 0; destination.reference = CORBA::Object::_duplicate (source->reference.in ()); @@ -1500,7 +1498,7 @@ TAO_Property_Filter::filter_offer (CosTrading::Offer* source, // Shove the matched properties into the destination property // sequence. - length = ACE_static_cast (CORBA::ULong, prop_queue.size ()); + length = static_cast<CORBA::ULong>(prop_queue.size ()); d_props.length (length); for (Prop_Queue::ITERATOR prop_iter (prop_queue); ! prop_iter.done (); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 140a025fbe7..02574bac955 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -56,7 +56,7 @@ TAO_Trading_Loader::TAO_Trading_Loader (void) ACE_OS::sprintf (trader_name, "%s_%ld", host_name, - ACE_static_cast (long, ACE_OS::getpid ())); + static_cast<long>(ACE_OS::getpid ())); for (char *dot = 0; (dot = ACE_OS::strchr (trader_name, '.')) != 0; @@ -144,8 +144,7 @@ TAO_Trading_Loader::fini (void) ACE_DEBUG ((LM_DEBUG, "*** Removing link to %s.\n", - ACE_static_cast (const char *, - link_name_seq[i]))); + static_cast<const char *>(link_name_seq[i]))); our_link->remove_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -333,14 +332,12 @@ TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL) i--) { // Avoid linking to ourselves. - if (ACE_OS::strcmp (ACE_static_cast (const char *, - link_name_seq[i]), + if (ACE_OS::strcmp (static_cast<const char *>(link_name_seq[i]), this->name_.in ()) != 0) { ACE_DEBUG ((LM_DEBUG, "*** Getting info for link %s.\n", - ACE_static_cast (const char *, - link_name_seq[i]))); + static_cast<const char *>(link_name_seq[i]))); CosTrading::Link::LinkInfo_var link_info = link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER); |