summaryrefslogtreecommitdiff
path: root/protocols/ace
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2003-05-05 18:35:26 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2003-05-05 18:35:26 +0000
commitec41312e1b5c1a08fc43364cb7a9d33ba0414602 (patch)
tree03d821195e73e59710ba47b6cbee40a183aa2683 /protocols/ace
parent3599efce7e2c1da0ee8f23d761a6b8c600518a21 (diff)
downloadATCD-ec41312e1b5c1a08fc43364cb7a9d33ba0414602.tar.gz
ChangeLogTag: Mon May 5 13:34:46 2003 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'protocols/ace')
-rw-r--r--protocols/ace/RMCast/RMCast_Fragment.cpp5
-rw-r--r--protocols/ace/RMCast/RMCast_IO_UDP.cpp4
-rw-r--r--protocols/ace/RMCast/RMCast_Partial_Message.cpp3
-rw-r--r--protocols/ace/RMCast/RMCast_Reassembly.cpp4
4 files changed, 10 insertions, 6 deletions
diff --git a/protocols/ace/RMCast/RMCast_Fragment.cpp b/protocols/ace/RMCast/RMCast_Fragment.cpp
index 7da6f4bf1a5..2285fcb0a49 100644
--- a/protocols/ace/RMCast/RMCast_Fragment.cpp
+++ b/protocols/ace/RMCast/RMCast_Fragment.cpp
@@ -36,7 +36,7 @@ ACE_RMCast_Fragment::data (ACE_RMCast::Data &received_data)
ACE_Message_Block *mb = data.payload;
// @@ We should keep the total size precomputed
- data.total_size = mb->total_length ();
+ data.total_size = ACE_static_cast (ACE_UINT32, mb->total_length ());
// We must leave room for the header
#if defined (ACE_HAS_BROKEN_DGRAM_SENDV)
@@ -130,7 +130,8 @@ ACE_RMCast_Fragment::data (ACE_RMCast::Data &received_data)
return -1;
// adjust the offset
- data.fragment_offset += max_fragment_payload;
+ data.fragment_offset += ACE_static_cast (ACE_UINT32,
+ max_fragment_payload);
// Now compute how much data is left in the last message
// block, to check if we should continue sending it...
diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
index 315d5c11f82..cfed8a53d98 100644
--- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
@@ -58,7 +58,7 @@ ACE_RMCast_IO_UDP::handle_events (ACE_Time_Value *tv)
ACE_Countdown_Time countdown (tv);
- int r = ACE_OS::select (int(h) + 1,
+ int r = ACE_OS::select (int(size_t(h)) + 1,
handle_set, 0, 0,
tv);
if (r == -1)
@@ -264,7 +264,7 @@ ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
for (const ACE_Message_Block *i = mb; i != 0; i = i->cont ())
{
iov[iovcnt].iov_base = i->rd_ptr ();
- iov[iovcnt].iov_len = i->length ();
+ iov[iovcnt].iov_len = ACE_static_cast (u_long, i->length ());
iovcnt++;
if (iovcnt >= IOV_MAX)
return -1;
diff --git a/protocols/ace/RMCast/RMCast_Partial_Message.cpp b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
index 5de2e660a11..3d7b85d8871 100644
--- a/protocols/ace/RMCast/RMCast_Partial_Message.cpp
+++ b/protocols/ace/RMCast/RMCast_Partial_Message.cpp
@@ -68,7 +68,8 @@ ACE_RMCast_Partial_Message::fragment_received (ACE_UINT32 message_size,
// iteration if the
ACE_UINT32 start = offset;
- ACE_UINT32 end = offset + total_length;
+ ACE_UINT32 end = ACE_static_cast (ACE_UINT32,
+ offset + total_length);
while (start != end && this->hole_count_ != 0)
{
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.cpp b/protocols/ace/RMCast/RMCast_Reassembly.cpp
index 9e4e9103c45..e16fb368acf 100644
--- a/protocols/ace/RMCast/RMCast_Reassembly.cpp
+++ b/protocols/ace/RMCast/RMCast_Reassembly.cpp
@@ -100,7 +100,9 @@ ACE_RMCast_Reassembly::data (ACE_RMCast::Data &data)
ACE_RMCast::Data downstream_data;
downstream_data.source = data.source;
downstream_data.sequence_number = data.sequence_number;
- downstream_data.total_size = message->message_body ()->length ();
+ downstream_data.total_size = ACE_static_cast(
+ ACE_UINT32,
+ message->message_body ()->length ());
downstream_data.fragment_offset = 0;
downstream_data.payload = message->message_body ();