Fixed compilation bug for gcc 4.4.3

This commit is contained in:
Jaume Nin
2012-01-16 11:40:15 +01:00
parent ae52ff16f6
commit e7d401fcb9
2 changed files with 50 additions and 2 deletions

View File

@@ -51,17 +51,41 @@ MacStatsCalculator::GetTypeId (void)
.AddAttribute ("DlOutputFilename",
"Name of the file where the downlink results will be saved.",
StringValue ("DlMacStats.txt"),
MakeStringAccessor (&LteStatsCalculator::SetDlOutputFilename),
MakeStringAccessor (&MacStatsCalculator::SetDlOutputFilename),
MakeStringChecker ())
.AddAttribute ("UlOutputFilename",
"Name of the file where the uplink results will be saved.",
StringValue ("UlMacStats.txt"),
MakeStringAccessor (&LteStatsCalculator::SetUlOutputFilename),
MakeStringAccessor (&MacStatsCalculator::SetUlOutputFilename),
MakeStringChecker ())
;
return tid;
}
void
MacStatsCalculator::SetUlOutputFilename (std::string outputFilename)
{
LteStatsCalculator::SetUlOutputFilename (outputFilename);
}
std::string
MacStatsCalculator::GetUlOutputFilename (void)
{
return LteStatsCalculator::GetUlOutputFilename ();
}
void
MacStatsCalculator::SetDlOutputFilename (std::string outputFilename)
{
LteStatsCalculator::SetDlOutputFilename (outputFilename);
}
std::string
MacStatsCalculator::GetDlOutputFilename (void)
{
return LteStatsCalculator::GetDlOutputFilename ();
}
void
MacStatsCalculator::DlScheduling (uint16_t cellId, uint64_t imsi, uint32_t frameNo, uint32_t subframeNo,
uint16_t rnti, uint8_t mcsTb1, uint16_t sizeTb1, uint8_t mcsTb2, uint16_t sizeTb2)

View File

@@ -59,6 +59,30 @@ public:
*/
static TypeId GetTypeId (void);
/**
* Set the name of the file where the uplink statistics will be stored.
*
* \param outputFilename string with the name of the file
*/
void SetUlOutputFilename (std::string outputFilename);
/**
* Get the name of the file where the uplink statistics will be stored.
*/
std::string GetUlOutputFilename (void);
/**
* Set the name of the file where the downlink statistics will be stored.
*
* @param outputFilename string with the name of the file
*/
void SetDlOutputFilename (std::string outputFilename);
/**
* Get the name of the file where the downlink statistics will be stored.
*/
std::string GetDlOutputFilename (void);
/**
* Notifies the stats calculator that an downlink scheduling has occurred.
* @param cellId Cell ID of the attached Enb