F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netanim, wimax: Use for-range and remove variable aliases

Browse Source
This commit is contained in:
Eduardo Almeida
2025-02-07 00:33:15 +00:00
parent 6473ac88e2
commit c5125c111d
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/netanim/model/animation-interface.cc
View File

@@ -2518,9 +2518,8 @@ AnimationInterface::WriteXmlRp(uint32_t nodeId,
element.AddAttribute("id", nodeId);
element.AddAttribute("d", destination.c_str());
element.AddAttribute("c", rpElements.size());
for (auto i = rpElements.begin(); i != rpElements.end(); ++i)
for (const auto& rpElement : rpElements)
{
const Ipv4RoutePathElement& rpElement = *i;
AnimXmlElement rpeElement("rpe");
rpeElement.AddAttribute("n", rpElement.nodeId);
rpeElement.AddAttribute("nH", rpElement.nextHop.c_str());

6
src/wimax/model/bs-net-device.cc
View File

@@ -1177,11 +1177,9 @@ void
BaseStationNetDevice::MarkUplinkAllocations()
{
uint16_t symbolsToAllocation = 0;
std::list<OfdmUlMapIe> uplinkAllocations = m_uplinkScheduler->GetUplinkAllocations();
for (auto iter = uplinkAllocations.begin(); iter != uplinkAllocations.end(); ++iter)
const auto& uplinkAllocations = m_uplinkScheduler->GetUplinkAllocations();
for (const auto& uplinkAllocation : uplinkAllocations)
{
const OfdmUlMapIe& uplinkAllocation = *iter;
if (uplinkAllocation.GetUiuc() == OfdmUlBurstProfile::UIUC_END_OF_MAP)
{
break;

19
src/wimax/model/ss-net-device.cc
View File

@@ -1161,13 +1161,11 @@ SubscriberStationNetDevice::ProcessUlMap(const UlMap& ulmap)
m_nrUlMapRecvd++;
m_ucdCount = ulmap.GetUcdCount();
m_allocationStartTime = ulmap.GetAllocationStartTime();
std::list<OfdmUlMapIe> ulMapElements = ulmap.GetUlMapElements();
const auto& ulMapElements = ulmap.GetUlMapElements();
m_linkManager->SetRangingIntervalFound(false);
for (auto iter = ulMapElements.begin(); iter != ulMapElements.end(); ++iter)
for (const auto& ulMapIe : ulMapElements)
{
const OfdmUlMapIe& ulMapIe = *iter;
if (ulMapIe.GetUiuc() == OfdmUlBurstProfile::UIUC_END_OF_MAP)
{
break;
@@ -1263,12 +1261,10 @@ SubscriberStationNetDevice::ProcessDcd(const Dcd& dcd)
GetPhy()->GetFrameDuration(dcdChnlEncodings.GetFrameDurationCode());
std::vector<OfdmDlBurstProfile> dlBurstProfiles = dcd.GetDlBurstProfiles();
const auto& dlBurstProfiles = dcd.GetDlBurstProfiles();
for (auto iter = dlBurstProfiles.begin(); iter != dlBurstProfiles.end(); ++iter)
for (const auto& brstProfile : dlBurstProfiles)
{
const OfdmDlBurstProfile& brstProfile = *iter;
/*NS-2 does this, may be not correct, assumes DIUC/UIUC to
modulation type mapping in DCD/UCD may change over time*/
if (brstProfile.GetFecCodeType() == m_modulationType)
@@ -1298,12 +1294,9 @@ SubscriberStationNetDevice::ProcessUcd(const Ucd& ucd)
1); // initializing ranging CW
OfdmUcdChannelEncodings ucdChnlEncodings = ucd.GetChannelEncodings();
std::vector<OfdmUlBurstProfile> ulBurstProfiles = ucd.GetUlBurstProfiles();
for (auto iter = ulBurstProfiles.begin(); iter != ulBurstProfiles.end(); ++iter)
const auto& ulBurstProfiles = ucd.GetUlBurstProfiles();
for (const auto& brstProfile : ulBurstProfiles)
{
const OfdmUlBurstProfile& brstProfile = *iter;
/*NS-2 does this, may be not correct, assumes DIUC/UIUC to
modulation type mapping in DCD/UCD may change over time*/
if (brstProfile.GetFecCodeType() == m_modulationType)