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

eliminate some warnings breaking builds

Browse Source
This commit is contained in:
Tom Henderson
2010-07-03 15:52:09 -07:00
parent 58225f43ce
commit 34fcbcf287
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/uan/uan-mac-rc-gw.cc
View File

@@ -655,7 +655,7 @@ UanMacRcGw::ComputeExpBOverA (uint32_t n, uint32_t a, uint32_t ldlh, std::vector
{
double sum = 0;
uint32_t lt = 8.0 * (m_ctsSizeN + ldlh + m_ackSize);
uint32_t lt = 8 * (m_ctsSizeN + ldlh + m_ackSize);
for (uint32_t k = 1; k <= n; k++)
{
double num = 8.0 * m_ctsSizeG + k * lt;

8
src/devices/uan/uan-prop-model.cc
View File

@@ -207,7 +207,7 @@ UanPdp::SumTapsFromMaxC (Time delay, Time duration) const
return m_taps[0].GetAmp ();
}
uint32_t numTaps = (uint32_t)(duration.GetSeconds () / (double) m_resolution.GetSeconds () + 0.5);
uint32_t numTaps = static_cast<uint32_t> (duration.GetSeconds () / m_resolution.GetSeconds () + 0.5);
double maxAmp = -1;
uint32_t maxTapIndex = 0;
@@ -219,7 +219,7 @@ UanPdp::SumTapsFromMaxC (Time delay, Time duration) const
maxTapIndex = i;
}
}
uint32_t start = maxTapIndex + delay.GetSeconds () / m_resolution.GetSeconds ();
uint32_t start = maxTapIndex + static_cast<uint32_t> (delay.GetSeconds () / m_resolution.GetSeconds ());
uint32_t end = std::min (start + numTaps, GetNTaps ());
std::complex<double> sum = 0;
for (uint32_t i = start; i < end; i++)
@@ -239,7 +239,7 @@ UanPdp::SumTapsFromMaxNc (Time delay, Time duration) const
return abs (m_taps[0].GetAmp ());
}
uint32_t numTaps = (uint32_t)(duration.GetSeconds () / (double) m_resolution.GetSeconds () + 0.5);
uint32_t numTaps = static_cast<uint32_t> (duration.GetSeconds () / m_resolution.GetSeconds () + 0.5);
double maxAmp = -1;
uint32_t maxTapIndex = 0;
@@ -253,7 +253,7 @@ UanPdp::SumTapsFromMaxNc (Time delay, Time duration) const
}
uint32_t start = maxTapIndex + delay.GetSeconds () / m_resolution.GetSeconds ();
uint32_t start = maxTapIndex + static_cast<uint32_t> (delay.GetSeconds () / m_resolution.GetSeconds ());
uint32_t end = std::min (start + numTaps, GetNTaps ());
double sum = 0;
for (uint32_t i = start; i < end; i++)