From ebd894a7fda142e4648d4013dc11bb0abc3eb220 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Thu, 22 Dec 2011 13:12:02 +0100 Subject: [PATCH] Change LteAmc* to Ptr in RR scheduler --- src/lte/model/rr-ff-mac-scheduler.cc | 3 +-- src/lte/model/rr-ff-mac-scheduler.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index d320cc3f9..6a860fae3 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -213,7 +213,7 @@ RrFfMacScheduler::RrFfMacScheduler () m_nextRntiDl (0), m_nextRntiUl (0) { - m_amc = new LteAmc (); + m_amc = CreateObject (); m_cschedSapProvider = new RrSchedulerMemberCschedSapProvider (this); m_schedSapProvider = new RrSchedulerMemberSchedSapProvider (this); } @@ -227,7 +227,6 @@ void RrFfMacScheduler::DoDispose () { NS_LOG_FUNCTION (this); - delete m_amc; delete m_cschedSapProvider; delete m_schedSapProvider; } diff --git a/src/lte/model/rr-ff-mac-scheduler.h b/src/lte/model/rr-ff-mac-scheduler.h index 4f58fe3d9..b79a3c7ba 100644 --- a/src/lte/model/rr-ff-mac-scheduler.h +++ b/src/lte/model/rr-ff-mac-scheduler.h @@ -125,7 +125,7 @@ private: void RefreshDlCqiMaps(void); void RefreshUlCqiMaps(void); - LteAmc* m_amc; + Ptr m_amc; /* * Vectors of UE's RLC info