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

Unified Diff: src/lte/test/test-lte-epc-e2e-data.cc

Issue 338840043: Eliminate Visual Studio compiler warnings (Closed)
Patch Set: Patch updates for x64 build Created 6 years, 2 months 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/lte/test/test-lte-antenna.cc ('k') | src/lte/test/test-lte-handover-delay.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lte/test/test-lte-epc-e2e-data.cc
===================================================================
--- a/src/lte/test/test-lte-epc-e2e-data.cc
+++ b/src/lte/test/test-lte-epc-e2e-data.cc
@@ -181,7 +181,7 @@
NodeContainer enbs;
- enbs.Create (m_enbTestData.size ());
+ enbs.Create (static_cast<uint32_t>(m_enbTestData.size ()));
MobilityHelper enbMobility;
enbMobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");
enbMobility.SetPositionAllocator ("ns3::GridPositionAllocator",
@@ -206,7 +206,7 @@
NodeContainer ues;
- ues.Create (enbit->ues.size ());
+ ues.Create (static_cast<uint32_t>(enbit->ues.size ()));
Vector enbPosition = (*enbLteDevIt)->GetNode ()->GetObject<MobilityModel> ()->GetPosition ();
MobilityHelper ueMobility;
ueMobility.SetPositionAllocator ("ns3::UniformDiscPositionAllocator",
@@ -218,8 +218,8 @@
NetDeviceContainer ueLteDevs = lteHelper->InstallUeDevice (ues);
// we install the IP stack on the UEs
- InternetStackHelper internet;
- internet.Install (ues);
+ InternetStackHelper internet1;
+ internet1.Install (ues);
// assign IP address to UEs, and install applications
for (uint32_t u = 0; u < ues.GetN (); ++u)
@@ -326,15 +326,15 @@
{
// LCID 0, 1, 2 are for SRBs
// LCID 3 is (at the moment) the Default EPS bearer, and is unused in this test program
- uint8_t lcid = b+4;
+ uint8_t lcid = static_cast<uint8_t>(b+4);
uint32_t expectedPkts = ueit->bearers.at (b).numPkts;
uint32_t expectedBytes = (ueit->bearers.at (b).numPkts) * (ueit->bearers.at (b).pktSize);
uint32_t txPktsPdcpDl = lteHelper->GetPdcpStats ()->GetDlTxPackets (imsi, lcid);
uint32_t rxPktsPdcpDl = lteHelper->GetPdcpStats ()->GetDlRxPackets (imsi, lcid);
uint32_t txPktsPdcpUl = lteHelper->GetPdcpStats ()->GetUlTxPackets (imsi, lcid);
uint32_t rxPktsPdcpUl = lteHelper->GetPdcpStats ()->GetUlRxPackets (imsi, lcid);
- uint32_t rxBytesDl = ueit->bearers.at (b).dlServerApp->GetTotalRx ();
- uint32_t rxBytesUl = ueit->bearers.at (b).ulServerApp->GetTotalRx ();
+ uint32_t rxBytesDl = static_cast<uint32_t>(ueit->bearers.at (b).dlServerApp->GetTotalRx ());
+ uint32_t rxBytesUl = static_cast<uint32_t>(ueit->bearers.at (b).ulServerApp->GetTotalRx ());
NS_TEST_ASSERT_MSG_EQ (txPktsPdcpDl,
« no previous file with comments | « src/lte/test/test-lte-antenna.cc ('k') | src/lte/test/test-lte-handover-delay.cc » ('j') | no next file with comments »

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