diff --git a/src/wimax/model/ul-job.cc b/src/wimax/model/ul-job.cc index 7a04d7381..77e6e9ad1 100644 --- a/src/wimax/model/ul-job.cc +++ b/src/wimax/model/ul-job.cc @@ -36,7 +36,7 @@ UlJob::~UlJob() } SSRecord* -UlJob::GetSsRecord() +UlJob::GetSsRecord() const { return m_ssRecord; } @@ -48,7 +48,7 @@ UlJob::SetSsRecord(SSRecord* ssRecord) } ServiceFlow::SchedulingType -UlJob::GetSchedulingType() +UlJob::GetSchedulingType() const { return m_schedulingType; } @@ -60,7 +60,7 @@ UlJob::SetSchedulingType(ServiceFlow::SchedulingType schedulingType) } ReqType -UlJob::GetType() +UlJob::GetType() const { return m_type; } @@ -72,7 +72,7 @@ UlJob::SetType(ReqType type) } ServiceFlow* -UlJob::GetServiceFlow() +UlJob::GetServiceFlow() const { return m_serviceFlow; } @@ -84,7 +84,7 @@ UlJob::SetServiceFlow(ServiceFlow* serviceFlow) } Time -UlJob::GetReleaseTime() +UlJob::GetReleaseTime() const { return m_releaseTime; } @@ -96,7 +96,7 @@ UlJob::SetReleaseTime(Time releaseTime) } Time -UlJob::GetPeriod() +UlJob::GetPeriod() const { return m_period; } @@ -108,7 +108,7 @@ UlJob::SetPeriod(Time period) } Time -UlJob::GetDeadline() +UlJob::GetDeadline() const { return m_deadline; } @@ -140,14 +140,7 @@ UlJob::SetSize(uint32_t size) bool operator==(const UlJob& a, const UlJob& b) { - UlJob A = a; - UlJob B = b; - - if ((A.GetServiceFlow() == B.GetServiceFlow()) && (A.GetSsRecord() == B.GetSsRecord())) - { - return true; - } - return false; + return a.GetServiceFlow() == b.GetServiceFlow() && a.GetSsRecord() == b.GetSsRecord(); } PriorityUlJob::PriorityUlJob() @@ -167,7 +160,7 @@ PriorityUlJob::SetPriority(int priority) } Ptr -PriorityUlJob::GetUlJob() +PriorityUlJob::GetUlJob() const { return m_job; } diff --git a/src/wimax/model/ul-job.h b/src/wimax/model/ul-job.h index 4aabb5874..18ff65ea2 100644 --- a/src/wimax/model/ul-job.h +++ b/src/wimax/model/ul-job.h @@ -63,7 +63,7 @@ class UlJob : public Object * Get SS record * \returns the SS record */ - SSRecord* GetSsRecord(); + SSRecord* GetSsRecord() const; /** * Set SS record * \param ssRecord the SS record @@ -73,7 +73,7 @@ class UlJob : public Object * Get scheduling type * \returns the scheduling type */ - ServiceFlow::SchedulingType GetSchedulingType(); + ServiceFlow::SchedulingType GetSchedulingType() const; /** * Set scheduling type * \param schedulingType the scheduling type @@ -83,7 +83,7 @@ class UlJob : public Object * Get service flow * \returns the service flow */ - ServiceFlow* GetServiceFlow(); + ServiceFlow* GetServiceFlow() const; /** * Set service flow * \param serviceFlow @@ -94,7 +94,7 @@ class UlJob : public Object * Get type * \returns the request type */ - ReqType GetType(); + ReqType GetType() const; /** * Set type * \param type the type @@ -105,7 +105,7 @@ class UlJob : public Object * Get release time * \returns the release time */ - Time GetReleaseTime(); + Time GetReleaseTime() const; /** * Set release time * \param releaseTime the release time @@ -116,7 +116,7 @@ class UlJob : public Object * Get period * \returns the period time */ - Time GetPeriod(); + Time GetPeriod() const; /** * Set period * \param period the period @@ -127,7 +127,7 @@ class UlJob : public Object * Get deadline * \returns the deadline time */ - Time GetDeadline(); + Time GetDeadline() const; /** * Set deadline * \param deadline the dead line @@ -187,7 +187,7 @@ class PriorityUlJob : public Object * Get UL job function * \returns the UL job */ - Ptr GetUlJob(); + Ptr GetUlJob() const; /** * Set UL job * \param job the UL job