Index: src/olsr/test/olsr-header-test-suite.cc |
=================================================================== |
--- a/src/olsr/test/olsr-header-test-suite.cc |
+++ b/src/olsr/test/olsr-header-test-suite.cc |
@@ -112,7 +112,7 @@ |
msg2.SetMessageSequenceNumber (7); |
// Build an OLSR packet header |
- hdr.SetPacketLength (hdr.GetSerializedSize () + msg1.GetSerializedSize () + msg2.GetSerializedSize ()); |
+ hdr.SetPacketLength (static_cast<uint16_t> (hdr.GetSerializedSize () + msg1.GetSerializedSize () + msg2.GetSerializedSize ())); |
hdr.SetPacketSequenceNumber (123); |
@@ -305,10 +305,10 @@ |
olsr::MessageHeader msgIn; |
olsr::MessageHeader::Hna &hnaIn = msgIn.GetHna (); |
- hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association) |
- { Ipv4Address ("1.2.3.4"), Ipv4Mask ("255.255.255.0")}); |
- hnaIn.associations.push_back ((olsr::MessageHeader::Hna::Association) |
- { Ipv4Address ("1.2.3.5"), Ipv4Mask ("255.255.0.0")}); |
+ olsr::MessageHeader::Hna::Association association1 = { Ipv4Address("1.2.3.4"), Ipv4Mask("255.255.255.0") }; |
+ hnaIn.associations.push_back (association1); |
+ olsr::MessageHeader::Hna::Association association2 = { Ipv4Address("1.2.3.5"), Ipv4Mask("255.255.0.0") }; |
+ hnaIn.associations.push_back (association2); |
packet.AddHeader (msgIn); |
olsr::MessageHeader msgOut; |