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

fix some energy test compiler warnings

Browse Source
This commit is contained in:
Josh Pelkey
2010-07-08 11:04:25 -04:00
parent 2d87e8d326
commit f48a89b75c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/contrib/energy/test/basic-energy-model-test.cc
View File

@@ -132,7 +132,7 @@ BasicEnergyUpdateTest::StateSwitchTest (
Ptr<BasicRadioEnergyModel> devModel =
DynamicCast<BasicRadioEnergyModel> (modelList[0]);
// check pointer
NS_TEST_ASSERT_MSG_NE (NULL, devModel, "NULL pointer to device model!");
NS_TEST_ASSERT_MSG_NE (0, devModel, "NULL pointer to device model!");
// schedule change of state
Simulator::Schedule (Seconds (m_timeS),
@@ -315,7 +315,7 @@ BasicEnergyDepletionTest::DepletionTestCase (double simTimeS,
* the floor here because initial update is at time = 0.
*/
double tmp = ceil (simTimeS / updateIntervalS);
int numOfUpdates = (tmp == 0) ? 1 : tmp;
int numOfUpdates = (tmp == 0) ? 1 : static_cast<int> (tmp);
/*
* Every update will trigger *all* DeviceEnergyModels to react, therefore the
* total count should be numOfUpdates * m_numOfModels ^ 2