Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(618)

Unified Diff: src/olsr/test/olsr-header-test-suite.cc

Issue 337970043: Eliminate Visual Studio compiler warnings (Closed)
Patch Set: Update patch per coding style requirements Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/olsr/model/olsr-state.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « src/olsr/model/olsr-state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b