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

Fix gcc-3.4 build issues

Browse Source
This commit is contained in:
Tom Henderson
2010-06-18 21:02:33 -07:00
parent 25153a2734
commit f83cd3308f
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/spectrum/spectrum-error-model.cc
View File

@@ -66,7 +66,7 @@ ShannonSpectrumErrorModel::EvaluateChunk (const SpectrumValue& sinr, Time durati
}
NS_ASSERT (vi == CapacityPerHertz.ConstValuesEnd ());
NS_LOG_LOGIC ("ChunkCapacity = " << capacity);
m_deliverableBytes += capacity * duration.GetSeconds () / 8;
m_deliverableBytes += static_cast<uint32_t> (capacity * duration.GetSeconds () / 8);
NS_LOG_LOGIC ("DeliverableBytes = " << m_deliverableBytes);
}

17
src/devices/spectrum/spectrum-interference-test.cc
View File

@@ -27,7 +27,6 @@
#include <ns3/packet.h>
#include <ns3/ptr.h>
#include <iostream>
#include <math.h>
NS_LOG_COMPONENT_DEFINE ("SpectrumInterferenceTest");
@@ -195,10 +194,10 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite ()
(*s1)[1] = 7.204059965732e-16;
b = 10067205.5632012;
AddTestCase (new SpectrumInterferenceTestCase (s1, 1, 1, "sdBm = [-46 -48] tx bytes: 1"));
AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * 0.5), 1, "sdBm = [-46 -48] tx bytes: b*0.5"));
AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * (1 - e)), 1, "sdBm = [-46 -48] tx bytes: b*(1-e)"));
AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * (1 + e)), 0, "sdBm = [-46 -48] tx bytes: b*(1+e)"));
AddTestCase (new SpectrumInterferenceTestCase (s1, round (b * 1.5), 0, "sdBm = [-46 -48] tx bytes: b*1.5"));
AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 0.5 + 0.5), 1, "sdBm = [-46 -48] tx bytes: b*0.5"));
AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 - e) + 0.5), 1, "sdBm = [-46 -48] tx bytes: b*(1-e)"));
AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 + e) + 0.5), 0, "sdBm = [-46 -48] tx bytes: b*(1+e)"));
AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t>(b * 1.5 + 0.5), 0, "sdBm = [-46 -48] tx bytes: b*1.5"));
AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, 0, "sdBm = [-46 -48] tx bytes: 2^32-1"));
// Power Spectral Density of the signal of interest = [-63 -61] dBm;
@@ -207,10 +206,10 @@ SpectrumInterferenceTestSuite::SpectrumInterferenceTestSuite ()
(*s2)[1] = 3.610582885110e-17;
b = 882401.591840728;
AddTestCase (new SpectrumInterferenceTestCase (s2, 1, 1, "sdBm = [-63 -61] tx bytes: 1"));
AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * 0.5), 1, "sdBm = [-63 -61] tx bytes: b*0.5"));
AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * (1 - e)), 1, "sdBm = [-63 -61] tx bytes: b*(1-e)"));
AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * (1 + e)), 0, "sdBm = [-63 -61] tx bytes: b*(1+e)"));
AddTestCase (new SpectrumInterferenceTestCase (s2, round (b * 1.5), 0, "sdBm = [-63 -61] tx bytes: b*1.5"));
AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 0.5 + 0.5), 1, "sdBm = [-63 -61] tx bytes: b*0.5"));
AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 - e) + 0.5), 1, "sdBm = [-63 -61] tx bytes: b*(1-e)"));
AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 + e) + 0.5), 0, "sdBm = [-63 -61] tx bytes: b*(1+e)"));
AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 1.5 + 0.5), 0, "sdBm = [-63 -61] tx bytes: b*1.5"));
AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, 0, "sdBm = [-63 -61] tx bytes: 2^32-1"));
}