Index: src/wimax/model/wimax-tlv.cc |
=================================================================== |
--- a/src/wimax/model/wimax-tlv.cc |
+++ b/src/wimax/model/wimax-tlv.cc |
@@ -130,7 +130,7 @@ |
uint8_t lenSize = GetSizeOfLen (); |
if (lenSize == 1) |
{ |
- i.WriteU8 (m_length); |
+ i.WriteU8 (static_cast<uint8_t> (m_length)); |
} |
else |
{ |
@@ -490,9 +490,9 @@ |
NS_ASSERT_MSG (false, "Unknown tlv type."); |
break; |
} |
- i.Next (length); |
+ i.Next (static_cast<uint32_t> (length)); |
} |
- return serializedSize; |
+ return static_cast<uint32_t> (serializedSize); |
} |
// ============================================================================== |
@@ -523,6 +523,7 @@ |
uint32_t |
U8TlvValue::Deserialize (Buffer::Iterator i, uint64_t valueLen) |
{ |
+ NS_UNUSED (valueLen); |
return Deserialize (i); |
} |
@@ -573,6 +574,7 @@ |
uint32_t |
U16TlvValue::Deserialize (Buffer::Iterator i, uint64_t valueLen) |
{ |
+ NS_UNUSED (valueLen); |
return Deserialize (i); |
} |
@@ -622,6 +624,7 @@ |
uint32_t |
U32TlvValue::Deserialize (Buffer::Iterator i, uint64_t valueLen) |
{ |
+ NS_UNUSED (valueLen); |
return Deserialize (i); |
} |
@@ -688,9 +691,9 @@ |
break; |
} |
} |
- i.Next (length); |
+ i.Next (static_cast<uint32_t> (length)); |
} |
- return serializedSize; |
+ return static_cast<uint32_t> (serializedSize); |
} |
CsParamVectorTlvValue::CsParamVectorTlvValue () |
@@ -812,9 +815,9 @@ |
break; |
} |
} |
- i.Next (length); |
+ i.Next (static_cast<uint32_t> (length)); |
} |
- return serializedSize; |
+ return static_cast<uint32_t> (serializedSize); |
} |
// ============================================================================== |
@@ -849,6 +852,7 @@ |
uint32_t |
TosTlvValue::Deserialize (Buffer::Iterator i, uint64_t valueLength) |
{ |
+ NS_UNUSED (valueLength); |
m_low = i.ReadU8 (); |
m_high = i.ReadU8 (); |
m_mask = i.ReadU8 (); |
@@ -890,7 +894,7 @@ |
uint32_t |
PortRangeTlvValue::GetSerializedSize (void) const |
{ |
- return m_portRange->size () * sizeof(struct PortRange); |
+ return static_cast<uint32_t> (m_portRange->size () * sizeof(struct PortRange)); |
} |
void |
PortRangeTlvValue::Serialize (Buffer::Iterator i) const |
@@ -912,7 +916,7 @@ |
Add (low, high); |
len += 4; |
} |
- return len; |
+ return static_cast<uint32_t> (len); |
} |
void |
PortRangeTlvValue::Add (uint16_t portLow, uint16_t portHigh) |
@@ -964,7 +968,7 @@ |
uint32_t |
ProtocolTlvValue::GetSerializedSize (void) const |
{ |
- return m_protocol->size (); |
+ return static_cast<uint32_t> (m_protocol->size ()); |
} |
void |
@@ -985,7 +989,7 @@ |
Add (i.ReadU8 ()); |
len++; |
} |
- return len; |
+ return static_cast<uint32_t> (len); |
} |
void |
@@ -1037,7 +1041,7 @@ |
uint32_t |
Ipv4AddressTlvValue::GetSerializedSize (void) const |
{ |
- return m_ipv4Addr->size () * sizeof(struct ipv4Addr); |
+ return static_cast<uint32_t> (m_ipv4Addr->size () * sizeof(struct ipv4Addr)); |
} |
void |
@@ -1061,7 +1065,7 @@ |
Add (Ipv4Address (addr), Ipv4Mask (mask)); |
len += 8; |
} |
- return len; |
+ return static_cast<uint32_t> (len); |
} |
void |