From 667b4a00662785ff755434dae3134dcbb09d7c64 Mon Sep 17 00:00:00 2001 From: mmiozzo Date: Thu, 31 Mar 2011 17:19:00 +0200 Subject: [PATCH] Move inline code in pf-ff-mac-schedluer to cc file --- src/lte/model/pf-ff-mac-scheduler.cc | 14 ++++++++++++++ src/lte/model/pf-ff-mac-scheduler.h | 5 ++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index 3758f75fd..618e66356 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -40,6 +40,20 @@ int PfType0AllocationRbg[4] = { NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler); +bool +operator< (const pfsFlowId_t& lhs, const pfsFlowId_t& rhs) +{ + if (lhs.m_rnti == rhs.m_rnti) + { + return (lhs.m_lcId < rhs.m_lcId); + } + else + { + return (lhs.m_rnti < rhs.m_rnti); + } +} + + class PfSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider { public: diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h index 694edde5e..f86399f4e 100644 --- a/src/lte/model/pf-ff-mac-scheduler.h +++ b/src/lte/model/pf-ff-mac-scheduler.h @@ -36,11 +36,10 @@ struct pfsFlowId_t { uint16_t m_rnti; uint8_t m_lcId; - - bool operator<(const pfsFlowId_t& A) const - { return m_rnti