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

Fix clang compilation issues

Browse Source
This commit is contained in:
Tom Henderson
2019-09-30 20:33:20 -07:00
parent d7914a847d
commit 64cd4291b2
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internet/model/tcp-rate-ops.cc
View File

@@ -149,14 +149,14 @@ TcpRateLinux::CalculateAppLimited (uint32_t cWnd, uint32_t in_flight,
&& in_flight < cWnd // We are not limited by CWND.
&& lostOut <= retransOut) // All lost packets have been retransmitted.
{
m_rate.m_appLimited = std::max (m_rate.m_delivered + in_flight, 1UL);
m_rate.m_appLimited = std::max<uint32_t> (m_rate.m_delivered + in_flight, 1);
m_rateTrace (m_rate);
}
// m_appLimited will be reset once in GenerateSample, if it has to be.
// else
// {
// m_rate.m_appLimited = 0U;
// m_rate.m_appLimited = 0;
// }
}

4
src/internet/test/tcp-rate-ops-test.cc
View File

@@ -62,8 +62,6 @@ private:
Time m_deliveredTime;
SequenceNumber32 m_tailSeq;
SequenceNumber32 m_nextTx;
uint32_t m_lostOut;
uint32_t m_retransOut;
uint32_t m_testCase;
std::vector <TcpTxItem *> m_skbs;
};
@@ -79,8 +77,6 @@ TcpRateLinuxBasicTest::TcpRateLinuxBasicTest (uint32_t cWnd, SequenceNumber32 ta
m_deliveredTime (Seconds (0)),
m_tailSeq (tailSeq),
m_nextTx (nextTx),
m_lostOut (lostOut),
m_retransOut (retransOut),
m_testCase (testCase)
{
}