diff options
| author | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-16 15:53:36 +0000 |
|---|---|---|
| committer | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-16 15:53:36 +0000 |
| commit | 0cd3f13797b5308b9d4a04e8ad09805d45452da2 (patch) | |
| tree | 6dd38f637dc09ec732b207bbed3a1f012e36cfbb | |
| parent | af722013c8be7183ed9fdf37c37007782f17c58a (diff) | |
| download | ATCD-0cd3f13797b5308b9d4a04e8ad09805d45452da2.tar.gz | |
ChangeLog Tag: Thu Mar 16 15:48:50 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu>
50 files changed, 269 insertions, 230 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 006346243c6..9d05d019682 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,62 @@ +Thu Mar 16 15:48:50 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> + + * TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp + * TAO/TAO_IDL/util/utl_global.cpp + * TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp + * TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp + * TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp + * TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp + * TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp + * TAO/orbsvcs/Notify_Service/Notify_Service.cpp + * TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp + * TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp + * TAO/orbsvcs/orbsvcs/AV/RTP.cpp + * TAO/orbsvcs/orbsvcs/AV/sfp.cpp + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp + * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp + * TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp + * TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp + * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp + * TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp + * TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp + * TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp + * TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp + * TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp + * TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp + * TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp + * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp + * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp + * TAO/tao/GIOP_Message_Base.cpp + * TAO/tao/GIOP_Message_Generator_Parser_10.cpp + * TAO/tao/GIOP_Message_Generator_Parser_12.cpp + * TAO/tao/GIOP_Message_Lite.cpp + * TAO/tao/IIOP_Acceptor.cpp + * TAO/tao/IIOP_Connection_Handler.cpp + * TAO/tao/ORB_Core.cpp + * TAO/tao/TAO_Internal.cpp + * TAO/tao/AnyTypeCode/Union_TypeCode.cpp + * TAO/tao/AnyTypeCode/append.cpp + * TAO/tao/AnyTypeCode/skip.cpp + * TAO/tao/PortableServer/POAManager.cpp + * TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp + * TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp + * TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp + * TAO/tao/RTCORBA/RT_ORB_Loader.cpp + * TAO/tao/Strategies/DIOP_Acceptor.cpp + * TAO/tao/Strategies/SHMIOP_Factory.cpp + * TAO/tao/Strategies/advanced_resource.cpp + * TAO/utils/catior/catior.cpp + Updated these files to solve the warnings when setting up "VC level + 4 warnings" on Windows. These warnings include "unreachable code", + "assignment within conditional expression", "conversion from some + type to another type, possible loss of data", "local variable may be + used without having been initialized" and so on. + Thanks to Lukas Gruetzmacher <gruetzmacher at ais-dresden dot de> + for motivating the fix to these "VC level 4 warnings". + Thu Mar 16 14:10:53 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> * docs/Compiler.html: diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp index 60a7ea8026c..c89015e7bcd 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp @@ -952,8 +952,6 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node) "visit_array - "), -1); } - - ACE_NOTREACHED (return 0); } int diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 9e551d7d532..4fa1996aa22 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -1424,8 +1424,7 @@ IDL_GlobalData::check_gperf (void) #if defined (ACE_WIN32) // No wait or anything in Win32. return 0; -#endif /* ACE_WIN32 */ - +#else // Wait for gperf to complete. ACE_exitcode wait_status = 0; if (process.wait (&wait_status) == -1) @@ -1463,6 +1462,7 @@ IDL_GlobalData::check_gperf (void) return -1; } } +#endif /* ACE_WIN32 */ } void diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp index 35a72e48214..b4febf2f835 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp @@ -178,7 +178,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process ( char ior[5000] = {'0'}; int n = 0; int byteRead=0; - while ((n = stream.recv(ior+byteRead, 5000-byteRead))) { + while (0 != (n = stream.recv(ior+byteRead, 5000-byteRead))) { byteRead += n; } diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp index 1b2a4b5d228..9f222a54739 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp @@ -77,7 +77,6 @@ ImR_Activator_Loader::fini (void) return -1; } ACE_ENDTRY; - return -1; } CORBA::Object_ptr @@ -105,7 +104,6 @@ ImR_Activator_Loader::run (void) return -1; } ACE_ENDTRY; - return 0; } ACE_FACTORY_DEFINE (Activator, ImR_Activator_Loader) diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp index 7234e583b30..3057a8d6622 100644 --- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp @@ -61,5 +61,4 @@ ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound)) CORBA::COMPLETED_NO)); } ACE_ENDTRY; - return 0; } diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 4c0564f0886..7884c6c36c7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -365,7 +365,7 @@ ImR_Locator_i::setup_multicast (ACE_Reactor* reactor, const char* ior) const char* port_number = ACE_OS::getenv ("ImplRepoServicePort"); if (port_number != 0) - port = ACE_OS::atoi (port_number); + port = static_cast<CORBA::UShort> (ACE_OS::atoi (port_number)); } if (port == 0) port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp index 42b58195655..be8dd5e0e1f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp @@ -99,7 +99,6 @@ ImR_Locator_Loader::run(void) return -1; } ACE_ENDTRY; - return 0; } diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp index 182a27231ac..e9e7fde3c1a 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp @@ -313,7 +313,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) const ACE_TCHAR* current_arg = 0; while (arg_shifter.is_anything_left ()) { - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory")))) + if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory")))) { this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg)); arg_shifter.consume_arg (); @@ -339,7 +339,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) { this->ior_output_file_ = ACE_OS::fopen (current_arg, ACE_TEXT("w")); if (this->ior_output_file_ == 0) @@ -348,7 +348,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) current_arg), -1); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName")))) { this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg)); arg_shifter.consume_arg (); @@ -360,14 +360,14 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[]) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor")))) { ACE_DEBUG((LM_DEBUG, "-Notify_TPReactor option is deprecated, use -ORBRunThreads option\n")); this->nthreads_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads")))) { this->nthreads_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp index 496288ac71e..18ebfe4e49d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp @@ -381,7 +381,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address, } } - short control_port = ACE_OS::atoi(port_tokenizer[0]) + 1; + short control_port = static_cast<short> (ACE_OS::atoi(port_tokenizer[0])) + 1; char control_port_str[6]; sprintf (control_port_str, "%d", control_port); diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 60c82eed689..8ef82e30bb3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -36,7 +36,7 @@ RTCP_Packet::~RTCP_Packet(void) void RTCP_Packet::get_packet_data(char **buffer, ACE_UINT16 &length) { - length = this->packet_size(); + length = static_cast<ACE_UINT16> (this->packet_size()); // buiidPacket is defined for each child of RTCP_Packet // buildPacket creates a snapshot of the RTCP packet in the buffer pktData @@ -105,7 +105,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list, this->reason_length_ = 0; // Set the packet length - this->chd_.length_ = this->chd_.count_ + (this->reason_length_+1)/4; + this->chd_.length_ = static_cast<ACE_UINT16> (this->chd_.count_ + (this->reason_length_+1)/4); if ((this->reason_length_+1)%4) this->chd_.length_++; @@ -171,7 +171,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void) unsigned int RTCP_BYE_Packet::packet_size(void) { - ACE_UINT16 size = (1+chd_.count_) * 4; + ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4); if (this->reason_length_ > 0) { @@ -217,9 +217,9 @@ RTCP_BYE_Packet::build_packet(void) char[this->packet_size()]); index = 0; - this->packet_data_[index] = (this->chd_.ver_ << 6) | - (this->chd_.pad_ << 5) | - this->chd_.count_; + this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | + (this->chd_.pad_ << 5) | + this->chd_.count_); index++; this->packet_data_[index] = this->chd_.pt_; index++; @@ -284,7 +284,7 @@ RTCP_RR_Packet::RTCP_RR_Packet(ACE_UINT32 ssrc, RR_Block *blocks) block_ptr = block_ptr->next_; } - this->chd_.length_ = 1+6*this->chd_.count_; // + profile specific extensions ?? + this->chd_.length_ = static_cast<ACE_UINT16> (1+6*(this->chd_.count_)); // + profile specific extensions ?? this->packet_data_ = 0; } @@ -366,7 +366,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void) unsigned int RTCP_RR_Packet::packet_size(void) { - ACE_UINT16 size = (2+this->chd_.count_*6) * 4; + ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4); return size; } @@ -385,9 +385,9 @@ RTCP_RR_Packet::build_packet(void) char [this->packet_size ()]); index = 0; - this->packet_data_[index] = (this->chd_.ver_ << 6) | - (this->chd_.pad_ << 5) | - this->chd_.count_; + this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | + (this->chd_.pad_ << 5) | + this->chd_.count_); index++; this->packet_data_[index] = chd_.pt_; index++; @@ -808,7 +808,7 @@ RTCP_SDES_Packet::packet_size(void) cp = cp->next_; } - chd_.length_ = size/4 - 1; + chd_.length_ = static_cast<ACE_UINT16> (size/4 - 1); return size; } @@ -829,7 +829,9 @@ RTCP_SDES_Packet::build_packet(void) char[this->packet_size()]); index = 0; - this->packet_data_[index] = (chd_.ver_ << 6) | (chd_.pad_ << 5) | chd_.count_; + this->packet_data_[index] = static_cast<char> ((chd_.ver_ << 6) | + (chd_.pad_ << 5) | + chd_.count_); index++; this->packet_data_[index] = chd_.pt_; index++; @@ -1015,7 +1017,7 @@ RTCP_SR_Packet::RTCP_SR_Packet(ACE_UINT32 ssrc, block_ptr = block_ptr->next_; } - this->chd_.length_ = 6 + 6*chd_.count_; //+profile specific extensions ?? + this->chd_.length_ = static_cast<ACE_UINT16> (6 + 6*(chd_.count_)); //+profile specific extensions ?? this->packet_data_ = 0; } @@ -1106,7 +1108,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void) unsigned int RTCP_SR_Packet::packet_size (void) { - ACE_UINT16 size = (2+chd_.count_*6) * 4; // + profile specific extensions ? + ACE_UINT16 size = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ? size += 20; // the first line is the same as RR; 20 more bytes for SR return size; @@ -1125,7 +1127,9 @@ void RTCP_SR_Packet::build_packet(void) ACE_NEW (this->packet_data_, char[this->packet_size()]); - this->packet_data_[index] = (this->chd_.ver_ << 6) | (this->chd_.pad_ << 5) | this->chd_.count_; + this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) | + (this->chd_.pad_ << 5) | + this->chd_.count_); index++; this->packet_data_[index] = this->chd_.pt_; index++; diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp index af251192955..7118a24c14c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp @@ -72,8 +72,8 @@ RTP_Packet::RTP_Packet(char* buffer, int length) else this->extension_bytes_ = 0; - this->packet_size_ = length; - this->payload_size_ = length-index; + this->packet_size_ = static_cast<ACE_UINT16> (length); + this->payload_size_ = static_cast<ACE_UINT16> (length-index); // This is necessary only for payload types that have 16 bit values to correct // the network byte ordering. @@ -139,7 +139,7 @@ RTP_Packet::RTP_Packet(unsigned char padding, this->packet_[index] = ((marker & 0x1) << 7 ) | ((payload_type & 0x7f)); index++; - *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(seq_num); + *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(static_cast<u_short> (seq_num)); index+=2; *((ACE_UINT32*)&this->packet_[index]) = (ACE_UINT32)htonl(timestamp); index+=4; @@ -258,7 +258,7 @@ RTP_Packet::get_frame_info (TAO_AV_frame_info *frame_info) frame_info->timestamp = this->ts(); frame_info->ssrc = this->ssrc(); frame_info->sequence_num = this->sn(); - frame_info->format = this->pt(); + frame_info->format = static_cast<CORBA::Octet> (this->pt()); } int @@ -294,7 +294,7 @@ void RTP_Packet::get_csrc_list (ACE_UINT32 **csrc_list, ACE_UINT16 &length) { *csrc_list = this->host_byte_order_csrc_list_; - length = this->cc (); + length = static_cast<ACE_UINT16> (this->cc ()); } void @@ -398,11 +398,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - this->format_, // payload type + static_cast<unsigned char> (this->format_), // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - csrc_count, // csrc count + static_cast<unsigned char> (csrc_count), // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -454,11 +454,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - this->format_, // payload type + static_cast<unsigned char> (this->format_), // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - csrc_count, // csrc count + static_cast<unsigned char> (csrc_count), // csrc count csrc_list, // csrc list frame->rd_ptr (), // data (ACE_UINT16)frame->length ()),// data size @@ -508,7 +508,7 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, if (frame_info->format != this->format_) ACE_DEBUG ((LM_DEBUG, "TAO_AV_RTP_Object::send_frame - error: format type mismatch")); - this->sequence_num_ = frame_info->sequence_num; + this->sequence_num_ = static_cast<ACE_UINT16> (frame_info->sequence_num); if (frame_info->ssrc != 0) this->ssrc_ = frame_info->ssrc; @@ -521,11 +521,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding frame_info->boundary_marker, // marker - this->format_, // payload type + static_cast<unsigned char> (this->format_), // payload type frame_info->sequence_num, // sequence num frame_info->timestamp, // time stamp this->ssrc_, // ssrc - csrc_count, // csrc count + static_cast<unsigned char> (csrc_count), // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -579,11 +579,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov, ACE_NEW_RETURN (rtp_packet, RTP_Packet (0, // padding 0, // marker - this->format_, // payload type + static_cast<unsigned char> (this->format_), // payload type this->sequence_num_, // sequence num ts, // time stamp this->ssrc_, // ssrc - csrc_count, // csrc count + static_cast<unsigned char> (csrc_count), // csrc count csrc_list, // csrc list (char *)iov[0].iov_base, // data data_size), // data size @@ -625,7 +625,7 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback, control_object_ (0), connection_gone_ (0) { - this->sequence_num_ = ACE_OS::rand (); + this->sequence_num_ = static_cast<ACE_UINT16> (ACE_OS::rand ()); this->timestamp_offset_ = ACE_OS::rand (); char buf [BUFSIZ]; diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 5a8e5318843..0046ce08f85 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -496,7 +496,7 @@ TAO_SFP_Base::start_frame (CORBA::Octet flags, frame_header.magic_number [2] = 'F'; frame_header.magic_number [3] = 'P'; frame_header.flags = flags; - frame_header.message_type = type; + frame_header.message_type = static_cast<CORBA::Octet> (type); frame_header.message_size = 0; if (!(msg << frame_header)) return 0; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index aff46a59bb1..a627d07245e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -434,8 +434,6 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb, return CORBA::Object::_nil (); } ACE_ENDTRY; - - return 0; } int diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp index f2eb11a7d0d..9bb41874175 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp @@ -439,8 +439,6 @@ TAO_CEC_TypedEventChannel::consumer_register_uses_interace (const char *uses_int } return result; } - // Should not get here! - return -1; } // A supplier is attempting to register its supported_interface. @@ -505,8 +503,6 @@ TAO_CEC_TypedEventChannel::supplier_register_supported_interface (const char *su } return result; } - // Should not get here! - return -1; } // Function creates a NVList and populates it from the parameter information. diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp index c28c22e6b32..7a8965f5c46 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.cpp @@ -108,7 +108,7 @@ AMI_Primary_Replication_Strategy::replicate_request( { ACE_Auto_Event event; Update_Manager* manager = 0; - bool success; + bool success = false; FTRT::TransactionDepth transaction_depth = Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 755926f2f30..a2e2b7a29cd 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -212,7 +212,7 @@ TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) } RtecEventChannelAdmin::Observer_Handle -TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr observer +TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, @@ -223,11 +223,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr obs /// throw an exception for the moment ACE_THROW_RETURN(RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(), 0); - return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); + //return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void -TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle handle +TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, @@ -238,7 +238,7 @@ TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle /// throw an exception for the moment ACE_THROW(RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER()); - ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); + //ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 6d1876bd9dd..8d8cddc96f8 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -755,7 +755,8 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile, profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - CORBA::Octet major, minor; + CORBA::Octet major; + CORBA::Octet minor = CORBA::Octet(); // Read the version. We just read it here. We don't*do any* // processing. diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index f9dba06ca70..c2a2dde9735 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -168,7 +168,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r, return 0; ACE_NEW_RETURN (proxy, - ACE_INET_Addr(proxy_port,proxy_host.c_str()), + ACE_INET_Addr(static_cast<u_short> (proxy_port),proxy_host.c_str()), 0); session_id.peer_ = htiop_endpoint->object_addr (); diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp index 6d98478e2e2..3d893a39732 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp @@ -425,7 +425,7 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL) ACE_OS::getenv ("InterfaceRepoServicePort"); if (port_number != 0) - port = 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/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp index 1bb726c263e..9d8fe567d40 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp @@ -288,8 +288,6 @@ TAO_Log_Constraint_Visitor::visit_union_pos ( } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - - return 0; } int @@ -384,8 +382,6 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - - return 0; } int @@ -523,8 +519,6 @@ TAO_Log_Constraint_Visitor::visit_component_array ( } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - - return 0; } int @@ -598,8 +592,6 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - - return 0; } int @@ -696,8 +688,6 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) } ACE_ENDTRY; ACE_CHECK_RETURN (-1); - - return 0; } int @@ -1293,8 +1283,6 @@ TAO_Log_Constraint_Visitor::union_does_contain ( } ACE_ENDTRY; ACE_CHECK_RETURN (0); - - return 0; } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp index efeb532fa99..2128c1852a4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp @@ -49,7 +49,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTDispatching option has been deprecated, use -DispatchingThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads")))) { consumer_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); @@ -60,7 +60,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTSourceEval option has been deprecated, use -SourceThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads")))) { supplier_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); @@ -71,7 +71,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTLookup option has been deprecated, use -SourceThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads")))) { supplier_threads += ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); @@ -84,7 +84,7 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) The -MTListenerEval option has been deprecated, use -DispatchingThreads \n"))); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads")))) { // Since this option is always added to consumer_threads, we'll // deprecate it in favor of that option. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 2926a97483e..f342c7e93f5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -340,8 +340,6 @@ TAO_Notify_Constraint_Visitor::visit_union_pos ( return -1; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } int @@ -434,8 +432,6 @@ TAO_Notify_Constraint_Visitor::visit_component_pos ( return -1; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } int @@ -581,8 +577,6 @@ TAO_Notify_Constraint_Visitor::visit_component_array (TAO_ETCL_Component_Array * return -1; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } int @@ -681,8 +675,6 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special) return -1; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } int @@ -833,8 +825,6 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def) return -1; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } int @@ -1414,8 +1404,6 @@ TAO_Notify_Constraint_Visitor::union_does_contain (const CORBA::Any *any, return 0; } ACE_ENDTRY; - - ACE_NOTREACHED (return 0); } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index 622acba3277..7cc9cca3e91 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -189,7 +189,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DE ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - return CosNotifyFilter::MappingFilter::_nil (); + //return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void @@ -210,7 +210,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DE ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - return CosNotifyFilter::MappingFilter::_nil (); + //return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index 5af000fc040..62915a67221 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -327,16 +327,16 @@ Routing_Slip_Persistence_Manager::Block_Header::put_header( data[pos++] = static_cast<unsigned char> ((serial_number >> 8) & 0xff); data[pos++] = static_cast<unsigned char> ((serial_number >> 0) & 0xff); // Store next_overflow - data[pos++] = next_overflow >> 24; - data[pos++] = (next_overflow >> 16) & 0xff; - data[pos++] = (next_overflow >> 8) & 0xff; - data[pos++] = next_overflow & 0xff; + data[pos++] = static_cast<unsigned char> (next_overflow >> 24); + data[pos++] = static_cast<unsigned char> ((next_overflow >> 16) & 0xff); + data[pos++] = static_cast<unsigned char> ((next_overflow >> 8) & 0xff); + data[pos++] = static_cast<unsigned char> (next_overflow & 0xff); // Store header_type - data[pos++] = (header_type >> 8) & 0xff; - data[pos++] = header_type & 0xff; + data[pos++] = static_cast<unsigned char> ((header_type >> 8) & 0xff); + data[pos++] = static_cast<unsigned char> (header_type & 0xff); // Store data_size - data[pos++] = (data_size >> 8) & 0xff; - data[pos++] = data_size & 0xff; + data[pos++] = static_cast<unsigned char> ((data_size >> 8) & 0xff); + data[pos++] = static_cast<unsigned char> (data_size & 0xff); return pos; } @@ -386,10 +386,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header( unsigned char* data = psb.data(); // Store next_routing_slip_block - data[pos++] = next_routing_slip_block >> 24; - data[pos++] = (next_routing_slip_block >> 16) & 0xff; - data[pos++] = (next_routing_slip_block >> 8) & 0xff; - data[pos++] = next_routing_slip_block & 0xff; + data[pos++] = static_cast<unsigned char> (next_routing_slip_block >> 24); + data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 16) & 0xff); + data[pos++] = static_cast<unsigned char> ((next_routing_slip_block >> 8) & 0xff); + data[pos++] = static_cast<unsigned char> (next_routing_slip_block & 0xff); // Store serial_number data[pos++] = static_cast<unsigned char> ((next_serial_number >> 56) & 0xff); data[pos++] = static_cast<unsigned char> ((next_serial_number >> 48) & 0xff); @@ -400,10 +400,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header( data[pos++] = static_cast<unsigned char> ((next_serial_number >> 8) & 0xff); data[pos++] = static_cast<unsigned char> ((next_serial_number >> 0) & 0xff); // Store event_block - data[pos++] = event_block >> 24; - data[pos++] = (event_block >> 16) & 0xff; - data[pos++] = (event_block >> 8) & 0xff; - data[pos++] = event_block & 0xff; + data[pos++] = static_cast<unsigned char> (event_block >> 24); + data[pos++] = static_cast<unsigned char> ((event_block >> 16) & 0xff); + data[pos++] = static_cast<unsigned char> ((event_block >> 8) & 0xff); + data[pos++] = static_cast<unsigned char> (event_block & 0xff); return pos; } @@ -579,7 +579,8 @@ Routing_Slip_Persistence_Manager::build_chain( mblk = mblk->cont(); remainder = this->fill_block(*first_block, pos, mblk, 0); } - first_header.data_size = data_size - remainder; + first_header.data_size = + static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder); first_header.next_overflow = 0; Block_Header* prevhdr = &first_header; @@ -596,7 +597,8 @@ Routing_Slip_Persistence_Manager::build_chain( prevhdr->next_overflow = curblk->block_number(); prevhdr->put_header(*prevblk); pos = hdr->put_header(*curblk); - hdr->data_size = remainder; + hdr->data_size = + static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); size_t offset_into_msg = mblk->length() - remainder; remainder = this->fill_block(*curblk, pos, mblk, offset_into_msg); @@ -607,7 +609,8 @@ Routing_Slip_Persistence_Manager::build_chain( remainder = this->fill_block(*curblk, pos, mblk, 0); } - hdr->data_size -= remainder; + hdr->data_size = hdr->data_size - + static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); if (prevblk != first_block) { // allocator obtains ownership, so write out and delete the header diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 8632d05edcf..829ca0cdef9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -578,7 +578,7 @@ TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while ((profile = profiles.get_profile (slot))) + while (0 != (profile = profiles.get_profile (slot))) { if (this->find_group_component_in_profile (profile, group) == 0) return 0; @@ -638,7 +638,7 @@ TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref, // Iterate through the tagged profiles, and // create acceptors for the multicast ones. slot = 0; - while ((profile = profiles.get_profile (slot))) + while (0 != (profile = profiles.get_profile (slot))) { if (profile->supports_multicast ()) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp index 24bf2ad28c7..0f1ddbbb73b 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp @@ -737,7 +737,8 @@ TAO_UIPMC_Profile::extract_group_component (const IOP::TaggedProfile &profile, // Read and verify major, minor versions, ignoring UIPMC profiles // whose versions we don't understand. - CORBA::Octet major, minor; + CORBA::Octet major; + CORBA::Octet minor = CORBA::Octet(); // Read the version. We just read it here. We don't*do any* // processing. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index bda2c66a8fa..024aab7d021 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -268,7 +268,7 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt, current_fragment->iovcnt > 1) { // Fill in the packet length header field. - *packet_length = current_fragment->length; + *packet_length = static_cast<CORBA::UShort> (current_fragment->length); // If this is the last fragment, set the stop message flag. if (num_fragments == 1) diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 60302dcbdbc..20202ad3e8e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -365,9 +365,9 @@ fill_receptacles (const char* /* type */, { // BEGIN SPEC // The returned offers are passed back in one of two ways (or a - // combination of both). ° The "offers" return result conveys a list + // combination of both). ?The "offers" return result conveys a list // of offers and the "offer_itr" is a reference to an interface at - // which offers can be obtained. ° The "how_many" parameter states + // which offers can be obtained. ?The "how_many" parameter states // how many offers are to be returned via the "offers" result, any // remaining offers are available via the iterator interface. If the // "how_many" exceeds the number of offers to be returned, then the @@ -1356,10 +1356,10 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_D // prefix. The sequence number is four octets long, the unique // prefix, also 4 bytes long. - this->stem_id_[8] = this->sequence_number_ & 0xff; - this->stem_id_[9] = (this->sequence_number_ >> 8) & 0xff; - this->stem_id_[10] = (this->sequence_number_ >> 16) & 0xff; - this->stem_id_[11] = (this->sequence_number_ >> 24) & 0xff; + this->stem_id_[8] = static_cast<CORBA::Octet> (this->sequence_number_ & 0xff); + this->stem_id_[9] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 8) & 0xff); + this->stem_id_[10] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 16) & 0xff); + this->stem_id_[11] = static_cast<CORBA::Octet> ((this->sequence_number_ >> 24) & 0xff); // Increment the sequence number and return a copy of the stem_id. this->sequence_number_++; @@ -1891,7 +1891,7 @@ export_proxy (CosTrading::Lookup_ptr, { ACE_THROW_RETURN (CORBA::UNKNOWN (), 0); - return 0; + //return 0; } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> @@ -1919,7 +1919,7 @@ describe_proxy (const char * { ACE_THROW_RETURN (CORBA::UNKNOWN (), 0); - return 0; + //return 0; } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 58d3432d24b..a4f3bfd4e5d 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -422,7 +422,7 @@ TAO_Trading_Loader::init_multicast_server (void) ACE_OS::getenv ("TradingServicePort"); if (port_number != 0) - port = ACE_OS::atoi (port_number); + port = static_cast<u_short> (ACE_OS::atoi (port_number)); else port = TAO_DEFAULT_TRADING_SERVER_REQUEST_PORT; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index 25aba5c6340..fbbcb7dae78 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -301,8 +301,6 @@ TAO::TypeCode::Union<StringType, // ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); - - ACE_NOTREACHED (return CORBA::TypeCode::_nil ()); } template <typename StringType, diff --git a/TAO/tao/AnyTypeCode/append.cpp b/TAO/tao/AnyTypeCode/append.cpp index 0c2f4ff4adf..36a8721fa7d 100644 --- a/TAO/tao/AnyTypeCode/append.cpp +++ b/TAO/tao/AnyTypeCode/append.cpp @@ -415,13 +415,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v; - CORBA::UShort ushort_v; - CORBA::Long long_v; - CORBA::ULong ulong_v; - CORBA::ULong enum_v; - CORBA::Char char_v; - CORBA::WChar wchar_v; + CORBA::Short short_v = CORBA::Short(); + CORBA::UShort ushort_v = CORBA::UShort(); + CORBA::Long long_v = CORBA::Long(); + CORBA::ULong ulong_v = CORBA::ULong(); + CORBA::ULong enum_v = CORBA::ULong(); + CORBA::Char char_v = CORBA::Char(); + CORBA::WChar wchar_v = CORBA::WChar(); CORBA::Boolean boolean_v = false; switch (kind) diff --git a/TAO/tao/AnyTypeCode/skip.cpp b/TAO/tao/AnyTypeCode/skip.cpp index 4fd48dfd789..dcad0cb9c3f 100644 --- a/TAO/tao/AnyTypeCode/skip.cpp +++ b/TAO/tao/AnyTypeCode/skip.cpp @@ -366,15 +366,15 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, ACE_CHECK_RETURN (TAO::TRAVERSE_STOP); // Save the discriminator value in a temporary variable... - CORBA::Short short_v; - CORBA::UShort ushort_v; - CORBA::Long long_v; - CORBA::ULong ulong_v; - CORBA::ULong enum_v; - CORBA::Char char_v; - CORBA::WChar wchar_v; + CORBA::Short short_v = CORBA::Short(); + CORBA::UShort ushort_v = CORBA::UShort(); + CORBA::Long long_v = CORBA::Long(); + CORBA::ULong ulong_v = CORBA::ULong(); + CORBA::ULong enum_v = CORBA::ULong(); + CORBA::Char char_v = CORBA::Char(); + CORBA::WChar wchar_v = CORBA::WChar(); CORBA::Boolean boolean_v = false; - + switch (kind) { case CORBA::tk_short: diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 9e95891f644..3168fb0ce7b 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1840,9 +1840,7 @@ TAO_GIOP_Message_Base::parse_request_id (const TAO_Queued_Data *qd, CORBA::ULong { return -1; } - } - - return -1; + } } /* @return -1 error, 0 ok, +1 outstanding fragments */ diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp index fe1bd07d280..351ed8e21be 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp @@ -341,7 +341,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header ( request.request_id (req_id); - CORBA::Octet response_flags; + CORBA::Octet response_flags = CORBA::Octet(); hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags != 0)); diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index e7b735e2faa..5fa498544dc 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -266,7 +266,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header ( request.request_id (req_id); - CORBA::Octet response_flags; + CORBA::Octet response_flags = CORBA::Octet(); hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags > 0)); diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 5fbca6302d3..273b3a347b8 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1347,7 +1347,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request) request.request_id (req_id); - CORBA::Octet response_flags; + CORBA::Octet response_flags = CORBA::Octet(); hdr_status = hdr_status && input.read_octet (response_flags); request.response_expected ((response_flags != 0)); diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 4a8898f27d6..af44c6ce8a4 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -989,7 +989,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ CORBA::Octet major; - CORBA::Octet minor; + CORBA::Octet minor = CORBA::Octet(); // Read the version. We just read it here. We don't*do any* // processing. diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 0d37b37f116..d74ee12594d 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -253,7 +253,7 @@ TAO_IIOP_Connection_Handler::close_connection (void) { struct linger lval; lval.l_onoff = 1; - lval.l_linger = linger; + lval.l_linger = (u_short)linger; if (this->peer ().set_option(SOL_SOCKET, SO_LINGER, diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index d5f0cfee092..ef6d268da98 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -390,7 +390,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) //////////////////////////////////////////////////////////////// // begin with the 'parameterless' flags // //////////////////////////////////////////////////////////////// - if ((current_arg = arg_shifter.get_the_parameter + if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDottedDecimalAddresses")))) { // Use dotted decimal addresses @@ -400,7 +400,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoServerSideNameLookups")))) { // Don't look up the host name for incoming connections @@ -409,7 +409,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNameServicePort")))) { // Specify the port number for the NameService. @@ -419,7 +419,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBMulticastDiscoveryEndpoint")))) { // Specify mcast address:port@network_interface for the @@ -432,7 +432,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNodelay")))) { // Use TCP_NODELAY or not. @@ -441,7 +441,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-ORBKeepalive")))) { // Use SO_KEEPALIVE or not. @@ -450,7 +450,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBTradingServicePort")))) { // Specify the port number for the TradingService. @@ -459,7 +459,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBImplRepoServicePort")))) { // Specify the multicast port number for the Implementation @@ -468,7 +468,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRcvSock")))) { // @@ All protocol implementation may not use sockets, so @@ -481,7 +481,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSndSock")))) { // @@ All protocol implementation may not use sockets, so @@ -493,7 +493,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBObjRefStyle")))) { // Specifies the style of printed objrefs: URL or IOR @@ -523,7 +523,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocationStrategy")))) { // Specify which collocation policy we want to use. @@ -535,7 +535,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCollocation")))) { // Specify whether we want to optimize against collocation @@ -567,7 +567,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPreferredInterfaces")))) { if (this->orb_params ()->preferred_interfaces ( @@ -581,7 +581,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEnforcePreferredInterfaces")))) { int enforce_pref_interfaces = ACE_OS::atoi (current_arg); @@ -616,7 +616,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } #endif /* ACE_HAS_IPV6 */ - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBCDRTradeoff")))) { cdr_tradeoff = ACE_OS::atoi (current_arg); @@ -627,7 +627,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) // A new <ObjectID>:<IOR> mapping has been specified. This will be // used by the resolve_initial_references (). - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInitRef")))) { const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '='); @@ -664,7 +664,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) } arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDefaultInitRef")))) { // Set the list of prefixes from -ORBDefaultInitRef. @@ -672,14 +672,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBStdProfileComponents")))) { std_profile_components = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBResources")))) { ACE_DEBUG ((LM_WARNING, @@ -688,7 +688,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLogFile")))) { // redirect all ACE_DEBUG and ACE_ERROR output to a file @@ -740,7 +740,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBVerboseLogging")))) { unsigned long verbose_logging = ACE_OS::atoi (current_arg); @@ -765,7 +765,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) (ACE_LOG_MSG->*flagop)(value); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseIMR")))) { // Use IR or not. @@ -773,14 +773,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBIMREndpointsInIOR")))) { this->imr_endpoints_in_ior_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBid")))) { // The ORBid is actually set in ORB_init(), and then passed @@ -799,7 +799,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBServerId")))) { // The this->server_id_ is to uniquely identify a server to @@ -809,14 +809,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBLingerTimeout")))) { linger = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBEndpoint")))) { // Each "endpoint" is of the form: @@ -845,7 +845,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBListenEndpoints")))) { // This option is similar to the -ORBEndPoint option. May be @@ -860,10 +860,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBLaneEndpoint"))) || - (current_arg = arg_shifter.get_the_parameter - (ACE_TEXT("-ORBLaneListenEndpoints")))) + else if ((0 != (current_arg = arg_shifter.get_the_parameter + (ACE_TEXT("-ORBLaneEndpoint")))) || + (0 != (current_arg = arg_shifter.get_the_parameter + (ACE_TEXT("-ORBLaneListenEndpoints"))))) { // This option is similar to the -ORBEndPoint option but // specifies endpoints for each lane. @@ -885,7 +885,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNoProprietaryActivation")))) { // This option can be used to set to not use any proprietary @@ -898,7 +898,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBUseSharedProfile")))) { this->orb_params ()->shared_profile @@ -906,14 +906,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBNegotiateCodesets")))) { negotiate_codesets = (ACE_OS::atoi (current_arg)); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSingleReadOptimization")))) { this->orb_params ()->single_read_optimization @@ -921,7 +921,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBDisableRTCollocation")))) { int disable_rt_collocation = ACE_OS::atoi (current_arg); @@ -932,7 +932,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_LIB_TEXT("-ORBUseLocalMemoryPool")))) { this->use_local_memory_pool_ = (0 != ACE_OS::atoi (current_arg)); diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index 7eba8059a4f..a4c999bbd1a 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -154,7 +154,8 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - PortableInterceptor::AdapterState adapter_state = state; + PortableInterceptor::AdapterState adapter_state = + static_cast<PortableInterceptor::AdapterState> (state); TAO_IORInterceptor_Adapter *ior_adapter = this->object_adapter_.orb_core ().ior_interceptor_adapter (); diff --git a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp index b965edd8d07..de53baf576f 100644 --- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp @@ -47,7 +47,7 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, current_native_priority = next_native_priority; } - native_priority = current_native_priority; + native_priority = static_cast<RTCORBA::NativePriority> (current_native_priority); return 1; #else diff --git a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp index cfc239023b6..f6889d5a7c5 100644 --- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.cpp @@ -60,11 +60,11 @@ TAO_Linear_Priority_Mapping::to_native ( / (RTCORBA::maxPriority - RTCORBA::minPriority)); // Now, find the value corresponding to this index. - native_priority = this->min_; + native_priority = static_cast<RTCORBA::NativePriority> (this->min_); for (int i = 2; i <= native_priority_index; ++i) { - native_priority = ACE_Sched_Params::next_priority (this->policy_, - native_priority); + native_priority = static_cast<RTCORBA::NativePriority> + (ACE_Sched_Params::next_priority (this->policy_, native_priority)); } return 1; @@ -114,10 +114,9 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, int delta = total - 1; if (delta != 0) { - corba_priority = - RTCORBA::minPriority - + ((RTCORBA::maxPriority - RTCORBA::minPriority) - * (native_priority_index - 1) / delta); + corba_priority = static_cast<RTCORBA::Priority> (RTCORBA::minPriority + + ((RTCORBA::maxPriority - RTCORBA::minPriority) + * (native_priority_index - 1) / delta)); } else { diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp index 6a2b51943e4..b53c0995b31 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp @@ -92,7 +92,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, if (corba_priority == base_corba_priority_) { // If this is the highest priority endpoint, then just give it the highest priority corba base priority - native_priority = base_native_priority_; + native_priority = static_cast<RTCORBA::NativePriority> (base_native_priority_); } else { @@ -100,11 +100,13 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, { if ( this->min_ < this->max_ ) { - native_priority = ( (corba_priority - base_corba_priority_) / priority_spacing_ ) + base_native_priority_; + native_priority = static_cast<RTCORBA::NativePriority> + (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_); } else { - native_priority = ( (base_corba_priority_ - corba_priority) / priority_spacing_ ) + base_native_priority_; + native_priority = static_cast<RTCORBA::NativePriority> + (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_); } } else @@ -129,9 +131,10 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, last_priority = this->base_native_priority_; for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++) { - native_priority = ACE_Sched_Params::previous_priority (this->policy_, - last_priority, - ACE_SCOPE_THREAD); + native_priority = static_cast<RTCORBA::NativePriority> + (ACE_Sched_Params::previous_priority (this->policy_, + last_priority, + ACE_SCOPE_THREAD)); } } } @@ -160,7 +163,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, if (native_priority == base_native_priority_) { // If this is the highest priority endpoint, then just give it the highest priority corba base priority - corba_priority = base_corba_priority_; + corba_priority = static_cast<RTCORBA::Priority> (base_corba_priority_); } else { @@ -168,11 +171,13 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, { if ( this->min_ < this->max_ ) { - corba_priority = ( (native_priority - base_native_priority_) * priority_spacing_ ) + base_corba_priority_; + corba_priority = static_cast<RTCORBA::Priority> + (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_); } else { - corba_priority = ( (base_native_priority_ - native_priority) * priority_spacing_ ) + base_corba_priority_; + corba_priority = static_cast<RTCORBA::Priority> + (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_); } } else @@ -225,7 +230,8 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, priority_ndx++; } - corba_priority = base_corba_priority_ - priority_ndx; + corba_priority = static_cast<RTCORBA::Priority> + (base_corba_priority_ - priority_ndx); } } diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp index 00f21ce77e0..381da1bd572 100644 --- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp +++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp @@ -52,7 +52,7 @@ TAO_RT_ORB_Loader::init (int argc, while (arg_shifter.is_anything_left ()) { const ACE_TCHAR *current_arg = 0; - if ((current_arg = arg_shifter.get_the_parameter + if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBPriorityMapping")))) { const ACE_TCHAR *name = current_arg; @@ -75,7 +75,7 @@ TAO_RT_ORB_Loader::init (int argc, name)); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBSchedPolicy")))) { const ACE_TCHAR *name = current_arg; @@ -104,7 +104,7 @@ TAO_RT_ORB_Loader::init (int argc, name)); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBScopePolicy")))) { const ACE_TCHAR *name = current_arg; @@ -121,7 +121,7 @@ TAO_RT_ORB_Loader::init (int argc, name)); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-RTORBNetworkPriorityMapping")))) { const ACE_TCHAR *name = current_arg; @@ -131,7 +131,7 @@ TAO_RT_ORB_Loader::init (int argc, TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR; arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-RTORBDynamicThreadIdleTimeout")))) { const ACE_TCHAR *name = current_arg; diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index e217355811a..2e527cea8ec 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -615,7 +615,8 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile, profile.profile_data.length ()); #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */ - CORBA::Octet major, minor; + CORBA::Octet major; + CORBA::Octet minor = CORBA::Octet(); // Read the version. We just read it here. We don't*do any* // processing. diff --git a/TAO/tao/Strategies/SHMIOP_Factory.cpp b/TAO/tao/Strategies/SHMIOP_Factory.cpp index 0b75ccda628..27cca45b226 100644 --- a/TAO/tao/Strategies/SHMIOP_Factory.cpp +++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp @@ -82,12 +82,12 @@ TAO_SHMIOP_Protocol_Factory::init (int argc, { const ACE_TCHAR *current_arg = 0; - if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) + if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize")))) { this->min_bytes_ = ACE_OS::atoi (current_arg); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix")))) { this->mmap_prefix_ = ACE::strnew (current_arg); arg_shifter.consume_arg (); diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index fb44555a925..18378302d4d 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -130,7 +130,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) -1); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorLock")))) { ACE_DEBUG ((LM_DEBUG, @@ -144,7 +144,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorType")))) { if (ACE_OS::strcasecmp (current_arg, @@ -186,7 +186,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBInputCDRAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -208,7 +208,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMHResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -228,7 +228,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBAMIResponseHandlerAllocator")))) { if (ACE_OS::strcasecmp (current_arg, @@ -248,7 +248,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBReactorThreadQueue")))) { if (ACE_OS::strcasecmp (current_arg, diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index bef50c3cf33..8cb753d3ea4 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -163,7 +163,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) ACE::debug (1); arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBDebugLevel")))) { TAO_debug_level = @@ -183,7 +183,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) arg_shifter.consume_arg (); } // Continue with flags that accept parameters. - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective")))) { len = svc_config_argv.length (); svc_config_argv.length (len + 2); // 2 arguments to add @@ -197,7 +197,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) arg_shifter.consume_arg (); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf")))) { // Specify the name of the svc.conf file to be used. @@ -231,7 +231,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv) arg_shifter.consume_arg(); } - else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey")))) + else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey")))) { len = svc_config_argv.length (); svc_config_argv.length (len + 2); // 2 arguments to add diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index fc1956042e3..4a53e5683d3 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -1252,7 +1252,7 @@ cat_octet_seq (const char *object_name, { char c = objKey[i]; int tmp = (unsigned char) c; // isprint doesn't work with negative vals.(except EOF) - if (ACE_OS::ace_isprint (tmp)) + if (ACE_OS::ace_isprint (static_cast<ACE_TCHAR> (tmp))) ACE_DEBUG ((LM_DEBUG, "%c", c)); else ACE_DEBUG ((LM_DEBUG, ".")); @@ -1465,7 +1465,8 @@ cat_profile_helper (TAO_InputCDR& stream, // // XXX this doesn't actually go back and skip the whole // encapsulation... - CORBA::Octet iiop_version_major, iiop_version_minor; + CORBA::Octet iiop_version_major; + CORBA::Octet iiop_version_minor = CORBA::Octet(); if (! (str.read_octet (iiop_version_major) && iiop_version_major == 1 && str.read_octet (iiop_version_minor) @@ -1556,7 +1557,8 @@ cat_uiop_profile (TAO_InputCDR& stream) // // XXX this doesn't actually go back and skip the whole // encapsulation... - CORBA::Octet uiop_version_major, uiop_version_minor; + CORBA::Octet uiop_version_major; + CORBA::Octet uiop_version_minor = CORBA::Octet(); // It appears that as of April 2002 UIOP version is 1.2 if (! (str.read_octet (uiop_version_major) && uiop_version_major == 1 @@ -1618,7 +1620,8 @@ cat_sciop_profile (TAO_InputCDR& stream) // // XXX this doesn't actually go back and skip the whole // encapsulation... - CORBA::Octet iiop_version_major, iiop_version_minor; + CORBA::Octet iiop_version_major; + CORBA::Octet iiop_version_minor = CORBA::Octet(); if (! (str.read_octet (iiop_version_major) && iiop_version_major == 1 && str.read_octet (iiop_version_minor) @@ -1718,7 +1721,8 @@ cat_nsk_profile_helper (TAO_InputCDR& stream, // // XXX this doesn't actually go back and skip the whole // encapsulation... - CORBA::Octet iiop_version_major, iiop_version_minor; + CORBA::Octet iiop_version_major; + CORBA::Octet iiop_version_minor = CORBA::Octet(); if (! (str.read_octet (iiop_version_major) && iiop_version_major == 1 && str.read_octet (iiop_version_minor) |