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

Unified Diff: src/lte/test/test-lte-rrc.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
Index: src/lte/test/test-lte-rrc.cc
===================================================================
--- a/src/lte/test/test-lte-rrc.cc
+++ b/src/lte/test/test-lte-rrc.cc
@@ -251,7 +251,7 @@
}
double dcr = (10.0 + (2.0 * nUes) / 4.0) * (m_nBearers + nCrs);
- m_delayConnEnd = round (dsi + dra + dce + dcr);
+ m_delayConnEnd = static_cast<uint32_t> (round (dsi + dra + dce + dcr));
NS_LOG_LOGIC (this << " " << GetName () << " dsi=" << dsi << " dra=" << dra << " dce=" << dce << " dcr=" << dcr << " m_delayConnEnd=" << m_delayConnEnd);
}
@@ -434,16 +434,16 @@
uint16_t ueCellId = ueRrc->GetCellId ();
uint16_t enbCellId = enbLteDevice->GetCellId ();
- uint16_t ueImsi = ueLteDevice->GetImsi ();
+ uint16_t ueImsi = static_cast<uint16_t> (ueLteDevice->GetImsi ());
uint8_t ueDlBandwidth = ueRrc->GetDlBandwidth ();
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 ();
- uint8_t enbUlEarfcn = enbLteDevice->GetUlEarfcn ();
+ uint8_t ueDlEarfcn = static_cast<uint8_t> (ueRrc->GetDlEarfcn ());
Biljana Bojović 2018/08/22 11:35:29 Is it possible to define here ueDlEarfcn with the
+ 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 ());
NS_TEST_ASSERT_MSG_EQ (ueCellId, enbCellId, "inconsistent CellId");
NS_TEST_ASSERT_MSG_EQ (ueDlBandwidth, enbDlBandwidth, "inconsistent DlBandwidth");
@@ -456,7 +456,7 @@
Ptr<UeManager> ueManager = enbRrc->GetUeManager (rnti);
NS_ASSERT (ueManager != 0);
UeManager::State state = ueManager->GetState ();
- uint16_t enbImsi = ueManager->GetImsi ();
+ uint16_t enbImsi = static_cast<uint16_t> (ueManager->GetImsi ());
NS_TEST_ASSERT_MSG_EQ (ueImsi, enbImsi, "inconsistent Imsi");
if (state == UeManager::CONNECTED_NORMALLY)
@@ -528,6 +528,7 @@
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti)
{
NS_LOG_FUNCTION (this << imsi << cellId);
+ NS_UNUSED (rnti);
m_isConnectionEstablished[imsi] = true;
}
@@ -537,6 +538,7 @@
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti)
{
NS_LOG_FUNCTION (this << imsi << cellId);
+ NS_UNUSED (rnti);
}

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