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

Unified Diff: src/lte/test/test-lte-x2-handover-measures.cc

Issue 338840043: Eliminate Visual Studio compiler warnings (Closed)
Patch Set: Update patch with latest module changes. 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
« src/lte/test/test-lte-rrc.cc ('K') | « src/lte/test/test-lte-x2-handover.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lte/test/test-lte-x2-handover-measures.cc
===================================================================
--- a/src/lte/test/test-lte-x2-handover-measures.cc
+++ b/src/lte/test/test-lte-x2-handover-measures.cc
@@ -366,8 +366,8 @@
// in this container, interface 0 is the pgw, 1 is the remoteHost
remoteHostAddr = internetIpIfaces.GetAddress (1);
- Ipv4StaticRoutingHelper ipv4RoutingHelper;
- Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
+ Ipv4StaticRoutingHelper ipv4RoutingHelper1;
+ Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper1.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);
// Install the IP stack on the UEs
@@ -590,10 +590,10 @@
uint8_t enbDlBandwidth = enbLteDevice->GetDlBandwidth ();
uint8_t ueUlBandwidth = ueRrc->GetUlBandwidth ();
uint8_t enbUlBandwidth = enbLteDevice->GetUlBandwidth ();
- uint8_t ueDlEarfcn = ueRrc->GetDlEarfcn ();
- uint8_t enbDlEarfcn = enbLteDevice->GetDlEarfcn ();
- uint8_t ueUlEarfcn = ueRrc->GetUlEarfcn ();
Biljana Bojović 2018/08/22 11:35:29 Again, is it possible to declare these variable wi
- uint8_t enbUlEarfcn = enbLteDevice->GetUlEarfcn ();
+ uint8_t ueDlEarfcn = static_cast<uint8_t> (ueRrc->GetDlEarfcn ());
+ uint8_t enbDlEarfcn = static_cast<uint8_t> (enbLteDevice->GetDlEarfcn ());
+ uint8_t ueUlEarfcn = static_cast<uint8_t> (ueRrc->GetUlEarfcn ());
+ uint8_t enbUlEarfcn = static_cast<uint8_t> (enbLteDevice->GetUlEarfcn ());
uint64_t ueImsi = ueLteDevice->GetImsi ();
uint64_t enbImsi = ueManager->GetImsi ();
@@ -643,11 +643,11 @@
{
if (it->dlSink)
{
- it->dlOldTotalRx = it->dlSink->GetTotalRx ();
+ it->dlOldTotalRx = static_cast<uint32_t> (it->dlSink->GetTotalRx ());
}
if (it->ulSink)
{
- it->ulOldTotalRx = it->ulSink->GetTotalRx ();
+ it->ulOldTotalRx = static_cast<uint32_t> (it->ulSink->GetTotalRx ());
}
}
}
@@ -666,12 +666,12 @@
if (it->dlSink)
{
- dlRx = it->dlSink->GetTotalRx () - it->dlOldTotalRx;
+ dlRx = static_cast<uint32_t> (it->dlSink->GetTotalRx () - it->dlOldTotalRx);
}
if (it->ulSink)
{
- ulRx = it->ulSink->GetTotalRx () - it->ulOldTotalRx;
+ ulRx = static_cast<uint32_t> (it->ulSink->GetTotalRx () - it->ulOldTotalRx);
}
double expectedBytes = m_udpClientPktSize * (m_statsDuration.GetSeconds () / m_udpClientInterval.GetSeconds ());
« src/lte/test/test-lte-rrc.cc ('K') | « src/lte/test/test-lte-x2-handover.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