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

Unified Diff: src/wifi/model/block-ack-manager.cc

Issue 333070043: Eliminate Visual Studio compiler warnings (Closed)
Patch Set: Updated patch for latest changes. Created 6 years, 1 month 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/wifi/model/block-ack-manager.cc
===================================================================
--- a/src/wifi/model/block-ack-manager.cc
+++ b/src/wifi/model/block-ack-manager.cc
@@ -367,10 +367,10 @@
hdr.SetRetry ();
*tstamp = (*it)->timestamp;
NS_LOG_INFO ("Retry packet seq = " << hdr.GetSequenceNumber ());
- Mac48Address recipient = hdr.GetAddr1 ();
+ Mac48Address recip = hdr.GetAddr1 ();
if (!agreement->second.first.IsHtSupported ()
- && (ExistsAgreementInState (recipient, tid, OriginatorBlockAckAgreement::ESTABLISHED)
- || SwitchToBlockAckIfNeeded (recipient, tid, hdr.GetSequenceNumber ())))
+ && (ExistsAgreementInState (recip, tid, OriginatorBlockAckAgreement::ESTABLISHED)
+ || SwitchToBlockAckIfNeeded (recip, tid, hdr.GetSequenceNumber ())))
S. Deronne 2018/02/18 14:52:55 why this rename? If not applicable for cleaning up
{
hdr.SetQosAckPolicy (WifiMacHeader::BLOCK_ACK);
}
@@ -406,14 +406,14 @@
if ((*it)->hdr.GetAddr1 () == recipient && (*it)->hdr.GetQosTid () == tid && (*it)->hdr.GetSequenceNumber () == seqnumber)
{
WifiMacHeader hdr = (*it)->hdr;
- uint8_t tid = hdr.GetQosTid ();
- Mac48Address recipient = hdr.GetAddr1 ();
+ uint8_t hdrTid = hdr.GetQosTid ();
+ Mac48Address hdrRecipient = hdr.GetAddr1 ();
S. Deronne 2018/02/18 14:52:55 idem
- AgreementsI i = m_agreements.find (std::make_pair (recipient, tid));
+ AgreementsI i = m_agreements.find (std::make_pair (hdrRecipient, hdrTid));
i->second.second.erase ((*it));
m_retryPackets.erase (it);
- NS_LOG_DEBUG ("Removed Packet from retry queue = " << hdr.GetSequenceNumber () << " " << static_cast<uint16_t> (tid) << " " << recipient << " Buffer Size = " << m_retryPackets.size ());
+ NS_LOG_DEBUG ("Removed Packet from retry queue = " << hdr.GetSequenceNumber () << " " << static_cast<uint16_t> (hdrTid) << " " << hdrRecipient << " Buffer Size = " << m_retryPackets.size ());
return true;
}
}
@@ -567,7 +567,7 @@
for (PacketQueueI queueIt = it->second.second.begin (); queueIt != queueEnd; )
{
if (blockAck->IsFragmentReceived ((*queueIt).hdr.GetSequenceNumber (),
- (*queueIt).hdr.GetFragmentNumber ()))
+ static_cast<uint8_t>((*queueIt).hdr.GetFragmentNumber ())))
S. Deronne 2018/02/18 14:52:55 GetFragmentNumber will return uint8_t in a next co
{
nSuccessfulMpdus++;
RemoveFromRetryQueue (recipient, tid, (*queueIt).hdr.GetSequenceNumber ());
@@ -630,7 +630,7 @@
}
}
}
- m_stationManager->ReportAmpduTxStatus (recipient, tid, nSuccessfulMpdus, nFailedMpdus, rxSnr, dataSnr);
+ m_stationManager->ReportAmpduTxStatus (recipient, tid, static_cast<uint8_t>(nSuccessfulMpdus), static_cast<uint8_t>(nFailedMpdus), rxSnr, dataSnr);
S. Deronne 2018/02/18 14:52:55 nSuccessfulMpdus and nFailedMpdus will be declared
uint16_t newSeq = m_txMiddle->GetNextSeqNumberByTidAndAddress (tid, recipient);
if ((foundFirstLost && !SwitchToBlockAckIfNeeded (recipient, tid, sequenceFirstLost))
|| (!foundFirstLost && !SwitchToBlockAckIfNeeded (recipient, tid, newSeq)))

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