lteFlowId_t --> LteFlowId_t
authorNicola Baldo <nbaldo@cttc.es>
Mon, 18 Apr 2011 17:35:49 +0200
changeset 7971 3cc205853837
parent 7970 ab929949c162
child 7972 6d24eb482e41
lteFlowId_t --> LteFlowId_t
src/lte/helper/rlc-stats-calculator.cc
src/lte/helper/rlc-stats-calculator.h
src/lte/model/lte-common.cc
src/lte/model/lte-common.h
src/lte/model/lte-enb-mac.cc
src/lte/model/lte-enb-mac.h
src/lte/model/pf-ff-mac-scheduler.cc
src/lte/model/pf-ff-mac-scheduler.h
--- a/src/lte/helper/rlc-stats-calculator.cc	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/helper/rlc-stats-calculator.cc	Mon Apr 18 17:35:49 2011 +0200
@@ -93,7 +93,7 @@
   NS_LOG_FUNCTION (this << "UlTxPDU" << rnti << (uint32_t) lcid << packetSize);
   if (Simulator::Now () > m_startTime )
     {
-      lteFlowId_t pair (rnti, lcid);
+      LteFlowId_t pair (rnti, lcid);
       m_ulTxPackets[pair]++;
       m_ulTxData[pair] += packetSize;
     }
@@ -106,7 +106,7 @@
   NS_LOG_FUNCTION (this << "DlTxPDU" << rnti << (uint32_t) lcid << packetSize);
   if (Simulator::Now () > m_startTime )
     {
-      lteFlowId_t pair (rnti, lcid);
+      LteFlowId_t pair (rnti, lcid);
       m_dlTxPackets[pair]++;
       m_dlTxData[pair] += packetSize;
     }
@@ -119,7 +119,7 @@
   NS_LOG_FUNCTION (this << "UlRxPDU" << rnti << (uint32_t) lcid << packetSize << delay);
   if (Simulator::Now () > m_startTime )
     {
-      lteFlowId_t pair(rnti, lcid);
+      LteFlowId_t pair(rnti, lcid);
       m_ulRxPackets[pair]++;
       m_ulRxData[pair] += packetSize;
 
@@ -141,7 +141,7 @@
   NS_LOG_FUNCTION (this << "UlRxPDU" << rnti << (uint32_t) lcid << packetSize << delay);
   if (Simulator::Now () > m_startTime )
     {
-      lteFlowId_t pair(rnti, lcid);
+      LteFlowId_t pair(rnti, lcid);
       m_dlRxPackets[pair]++;
       m_dlRxData[pair] += packetSize;
 
@@ -221,7 +221,7 @@
   uint32Map::iterator it;
 
   // Get all the unique lteFlowIds in the calculator
-  std::vector<lteFlowId_t> lteFlowIds;
+  std::vector<LteFlowId_t> lteFlowIds;
   for ( it = m_ulTxPackets.begin(); it != m_ulTxPackets.end(); ++it)
     {
       if (find (lteFlowIds.begin (), lteFlowIds.end (),  (*it).first ) == lteFlowIds.end () )
@@ -230,7 +230,7 @@
         }
     }
 
-  std::vector<lteFlowId_t>::iterator itFlow;
+  std::vector<LteFlowId_t>::iterator itFlow;
   Time endTime = m_startTime + m_epochDuration;
   for ( itFlow = lteFlowIds.begin(); itFlow != lteFlowIds.end(); ++itFlow)
     {
@@ -264,7 +264,7 @@
   uint32Map::iterator it;
 
   // Get all the unique lteFlowIds in the calculator
-  std::vector<lteFlowId_t> lteFlowIds;
+  std::vector<LteFlowId_t> lteFlowIds;
   for ( it = m_dlTxPackets.begin(); it != m_dlTxPackets.end(); ++it)
     {
       if (find (lteFlowIds.begin (), lteFlowIds.end (),  (*it).first ) == lteFlowIds.end () )
@@ -273,7 +273,7 @@
         }
     }
 
-  std::vector<lteFlowId_t>::iterator itFlow;
+  std::vector<LteFlowId_t>::iterator itFlow;
   Time endTime = m_startTime + m_epochDuration;
   for ( itFlow = lteFlowIds.begin(); itFlow != lteFlowIds.end(); ++itFlow)
     {
@@ -337,31 +337,31 @@
 }
 
 uint32_t
-RlcStatsCalculator::GetUlTxPackets (lteFlowId_t p)
+RlcStatsCalculator::GetUlTxPackets (LteFlowId_t p)
 {
   return m_ulTxPackets[p];
 }
 
 uint32_t
-RlcStatsCalculator::GetUlRxPackets (lteFlowId_t p)
+RlcStatsCalculator::GetUlRxPackets (LteFlowId_t p)
 {
   return m_ulRxPackets[p];
 }
 
 uint64_t
-RlcStatsCalculator::GetUlTxData (lteFlowId_t p)
+RlcStatsCalculator::GetUlTxData (LteFlowId_t p)
 {
   return m_ulTxData[p];
 }
 
 uint64_t
-RlcStatsCalculator::GetUlRxData (lteFlowId_t p)
+RlcStatsCalculator::GetUlRxData (LteFlowId_t p)
 {
   return m_ulRxData[p];
 }
 
 double
-RlcStatsCalculator::GetUlDelay (lteFlowId_t p)
+RlcStatsCalculator::GetUlDelay (LteFlowId_t p)
 {
   uint64StatsMap::iterator it = m_ulDelay.find (p);
   if ( it == m_ulDelay.end () )
@@ -375,7 +375,7 @@
 }
 
 std::vector<double>
-RlcStatsCalculator::GetUlDelayStats (lteFlowId_t p)
+RlcStatsCalculator::GetUlDelayStats (LteFlowId_t p)
 {
   std::vector<double> stats;
   uint64StatsMap::iterator it = m_ulDelay.find (p);
@@ -394,7 +394,7 @@
 }
 
 std::vector<double>
-RlcStatsCalculator::GetUlPduSizeStats (lteFlowId_t p)
+RlcStatsCalculator::GetUlPduSizeStats (LteFlowId_t p)
 {
   std::vector<double> stats;
   uint32StatsMap::iterator it = m_ulPduSize.find (p);
@@ -413,31 +413,31 @@
 }
 
 uint32_t
-RlcStatsCalculator::GetDlTxPackets (lteFlowId_t p)
+RlcStatsCalculator::GetDlTxPackets (LteFlowId_t p)
 {
   return m_dlTxPackets[p];
 }
 
 uint32_t
-RlcStatsCalculator::GetDlRxPackets (lteFlowId_t p)
+RlcStatsCalculator::GetDlRxPackets (LteFlowId_t p)
 {
   return m_dlRxPackets[p];
 }
 
 uint64_t
-RlcStatsCalculator::GetDlTxData (lteFlowId_t p)
+RlcStatsCalculator::GetDlTxData (LteFlowId_t p)
 {
   return m_dlTxData[p];
 }
 
 uint64_t
-RlcStatsCalculator::GetDlRxData (lteFlowId_t p)
+RlcStatsCalculator::GetDlRxData (LteFlowId_t p)
 {
   return m_dlRxData[p];
 }
 
 double
-RlcStatsCalculator::GetDlDelay (lteFlowId_t p)
+RlcStatsCalculator::GetDlDelay (LteFlowId_t p)
 {
   uint64StatsMap::iterator it = m_dlDelay.find (p);
   if ( it == m_dlDelay.end () )
@@ -450,7 +450,7 @@
 }
 
 std::vector<double>
-RlcStatsCalculator::GetDlDelayStats (lteFlowId_t p)
+RlcStatsCalculator::GetDlDelayStats (LteFlowId_t p)
 {
   std::vector<double> stats;
   uint64StatsMap::iterator it = m_dlDelay.find (p);
@@ -470,7 +470,7 @@
 }
 
 std::vector<double>
-RlcStatsCalculator::GetDlPduSizeStats (lteFlowId_t p)
+RlcStatsCalculator::GetDlPduSizeStats (LteFlowId_t p)
 {
   std::vector<double> stats;
   uint32StatsMap::iterator it = m_dlPduSize.find (p);
@@ -492,49 +492,49 @@
 uint32_t
 RlcStatsCalculator::GetUlTxPackets (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlTxPackets (p);
 }
 
 uint32_t
 RlcStatsCalculator::GetUlRxPackets (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlRxPackets (p);
 }
 
 uint64_t
 RlcStatsCalculator::GetUlTxData (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlTxData (p);
 }
 
 uint64_t
 RlcStatsCalculator::GetUlRxData (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlRxData (p);
 }
 
 double
 RlcStatsCalculator::GetUlDelay (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlDelay (p);
 }
 
 std::vector<double>
 RlcStatsCalculator::GetUlDelayStats (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlDelayStats (p);
 }
 
 std::vector<double>
 RlcStatsCalculator::GetUlPduSizeStats (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetUlPduSizeStats (p);
 }
 
@@ -542,49 +542,49 @@
 uint32_t
 RlcStatsCalculator::GetDlTxPackets (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlTxPackets (p);
 }
 
 uint32_t
 RlcStatsCalculator::GetDlRxPackets (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlRxPackets (p);
 }
 
 uint64_t
 RlcStatsCalculator::GetDlTxData (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlTxData (p);
 }
 
 uint64_t
 RlcStatsCalculator::GetDlRxData (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlRxData (p);
 }
 
 double
 RlcStatsCalculator::GetDlDelay (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlDelay (p);
 }
 
 std::vector<double>
 RlcStatsCalculator::GetDlDelayStats (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlDelayStats (p);
 }
 
 std::vector<double>
 RlcStatsCalculator::GetDlPduSizeStats (uint16_t rnti, uint8_t lcid)
 {
-  lteFlowId_t p (rnti, lcid);
+  LteFlowId_t p (rnti, lcid);
   return GetDlPduSizeStats (p);
 }
 
--- a/src/lte/helper/rlc-stats-calculator.h	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/helper/rlc-stats-calculator.h	Mon Apr 18 17:35:49 2011 +0200
@@ -32,11 +32,11 @@
 namespace ns3 {
   
 
-typedef std::map<lteFlowId_t, uint32_t> uint32Map;
-typedef std::map<lteFlowId_t, uint64_t> uint64Map;
-typedef std::map<lteFlowId_t, Ptr<MinMaxAvgTotalCalculator<uint32_t> > > uint32StatsMap;
-typedef std::map<lteFlowId_t, Ptr<MinMaxAvgTotalCalculator<uint64_t> > > uint64StatsMap;
-typedef std::map<lteFlowId_t, double> doubleMap;
+typedef std::map<LteFlowId_t, uint32_t> uint32Map;
+typedef std::map<LteFlowId_t, uint64_t> uint64Map;
+typedef std::map<LteFlowId_t, Ptr<MinMaxAvgTotalCalculator<uint32_t> > > uint32StatsMap;
+typedef std::map<LteFlowId_t, Ptr<MinMaxAvgTotalCalculator<uint64_t> > > uint64StatsMap;
+typedef std::map<LteFlowId_t, double> doubleMap;
 
 
 class RlcStatsCalculator : public Object
@@ -56,13 +56,13 @@
   void DlTxPdu (uint16_t rnti, uint8_t lcid, uint32_t packetSize);
   void DlRxPdu (uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay);
 
-  uint32_t GetUlTxPackets (lteFlowId_t p);
-  uint32_t GetUlRxPackets (lteFlowId_t p);
-  uint64_t GetUlTxData (lteFlowId_t p);
-  uint64_t GetUlRxData (lteFlowId_t p);
-  double   GetUlDelay (lteFlowId_t p);
-  std::vector<double> GetUlDelayStats (lteFlowId_t p);
-  std::vector<double> GetUlPduSizeStats (lteFlowId_t p);
+  uint32_t GetUlTxPackets (LteFlowId_t p);
+  uint32_t GetUlRxPackets (LteFlowId_t p);
+  uint64_t GetUlTxData (LteFlowId_t p);
+  uint64_t GetUlRxData (LteFlowId_t p);
+  double   GetUlDelay (LteFlowId_t p);
+  std::vector<double> GetUlDelayStats (LteFlowId_t p);
+  std::vector<double> GetUlPduSizeStats (LteFlowId_t p);
 
   uint32_t GetUlTxPackets (uint16_t rnti, uint8_t lcid);
   uint32_t GetUlRxPackets (uint16_t rnti, uint8_t lcid);
@@ -73,13 +73,13 @@
   std::vector<double> GetUlPduSizeStats (uint16_t rnti, uint8_t lcid);
 
 
-  uint32_t GetDlTxPackets (lteFlowId_t p);
-  uint32_t GetDlRxPackets (lteFlowId_t p);
-  uint64_t GetDlTxData (lteFlowId_t p);
-  uint64_t GetDlRxData (lteFlowId_t p);
-  double   GetDlDelay (lteFlowId_t p);
-  std::vector<double> GetDlDelayStats (lteFlowId_t p);
-  std::vector<double> GetDlPduSizeStats (lteFlowId_t p);
+  uint32_t GetDlTxPackets (LteFlowId_t p);
+  uint32_t GetDlRxPackets (LteFlowId_t p);
+  uint64_t GetDlTxData (LteFlowId_t p);
+  uint64_t GetDlRxData (LteFlowId_t p);
+  double   GetDlDelay (LteFlowId_t p);
+  std::vector<double> GetDlDelayStats (LteFlowId_t p);
+  std::vector<double> GetDlPduSizeStats (LteFlowId_t p);
 
   uint32_t GetDlTxPackets (uint16_t rnti, uint8_t lcid);
   uint32_t GetDlRxPackets (uint16_t rnti, uint8_t lcid);
--- a/src/lte/model/lte-common.cc	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/lte-common.cc	Mon Apr 18 17:35:49 2011 +0200
@@ -27,24 +27,24 @@
 namespace ns3 {
 
 
-lteFlowId_t::lteFlowId_t ()
+LteFlowId_t::LteFlowId_t ()
 {
 }
 
-lteFlowId_t::lteFlowId_t (const uint16_t a, const uint8_t b)
+LteFlowId_t::LteFlowId_t (const uint16_t a, const uint8_t b)
   : m_rnti(a),
     m_lcId(b)
 {
 }
 
 bool
-operator == (const lteFlowId_t &a, const lteFlowId_t &b)
+operator == (const LteFlowId_t &a, const LteFlowId_t &b)
 {
   return ( (a.m_rnti == b.m_rnti) && (a.m_lcId == b.m_lcId) );
 }
 
 bool
-operator < (const lteFlowId_t& a, const lteFlowId_t& b)
+operator < (const LteFlowId_t& a, const LteFlowId_t& b)
 {
   return ( (a.m_rnti < b.m_rnti) || ( (a.m_rnti == b.m_rnti) && (a.m_lcId < b.m_lcId) ) );
 }
--- a/src/lte/model/lte-common.h	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/lte-common.h	Mon Apr 18 17:35:49 2011 +0200
@@ -27,17 +27,17 @@
 namespace ns3 {
 
 
-struct lteFlowId_t
+struct LteFlowId_t
 {
   uint16_t  m_rnti;
   uint8_t   m_lcId;
 
 public:
-  lteFlowId_t ();
-  lteFlowId_t (const uint16_t a, const uint8_t b);
+  LteFlowId_t ();
+  LteFlowId_t (const uint16_t a, const uint8_t b);
 
-  friend bool operator == (const lteFlowId_t &a, const lteFlowId_t &b);
-  friend bool operator < (const lteFlowId_t &a, const lteFlowId_t &b);
+  friend bool operator == (const LteFlowId_t &a, const LteFlowId_t &b);
+  friend bool operator < (const LteFlowId_t &a, const LteFlowId_t &b);
 };
 
 class LteFfConverter
--- a/src/lte/model/lte-enb-mac.cc	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/lte-enb-mac.cc	Mon Apr 18 17:35:49 2011 +0200
@@ -565,8 +565,8 @@
   
 
   // forward the packet to the correspondent RLC
-  lteFlowId_t flow ( tag.GetRnti (), tag.GetLcid () );
-  std::map <lteFlowId_t, LteMacSapUser* >::iterator it2;
+  LteFlowId_t flow ( tag.GetRnti (), tag.GetLcid () );
+  std::map <LteFlowId_t, LteMacSapUser* >::iterator it2;
   it2 = m_rlcAttached.find (flow);
   NS_ASSERT_MSG (it2 != m_rlcAttached.end (), "UE not attached rnti=" << flow.m_rnti << " lcid=" << (uint32_t) flow.m_lcId);
   (*it2).second->ReceivePdu (p);
@@ -607,14 +607,14 @@
 LteEnbMac::DoAddLc (LteEnbCmacSapProvider::LcInfo lcinfo, LteMacSapUser* msu)
 {
   NS_LOG_FUNCTION (this);
-  std::map <lteFlowId_t, LteMacSapUser* >::iterator it;
+  std::map <LteFlowId_t, LteMacSapUser* >::iterator it;
 
-  lteFlowId_t flow (lcinfo.rnti, lcinfo.lcId);
+  LteFlowId_t flow (lcinfo.rnti, lcinfo.lcId);
 
   it = m_rlcAttached.find (flow);
   if (it == m_rlcAttached.end ())
     {
-      m_rlcAttached.insert (std::pair<lteFlowId_t, LteMacSapUser* > (flow, msu));
+      m_rlcAttached.insert (std::pair<LteFlowId_t, LteMacSapUser* > (flow, msu));
     }
   else
     {
@@ -701,13 +701,13 @@
   NS_LOG_FUNCTION (this);
   // Create DL PHY PDU
   Ptr<PacketBurst> pb = CreateObject<PacketBurst> ();
-  std::map <lteFlowId_t, LteMacSapUser* >::iterator it;
+  std::map <LteFlowId_t, LteMacSapUser* >::iterator it;
 
   for (unsigned int i = 0; i < ind.m_buildDataList.size (); i++)
     {
       for (unsigned int j = 0; j < ind.m_buildDataList.at (i).m_rlcPduList.size (); j++)
         {
-          lteFlowId_t flow (ind.m_buildDataList.at (i).m_rnti,
+          LteFlowId_t flow (ind.m_buildDataList.at (i).m_rnti,
                             ind.m_buildDataList.at (i).m_rlcPduList.at (j).at (0).m_logicalChannelIdentity);
           it = m_rlcAttached.find (flow);
           NS_ASSERT_MSG (it != m_rlcAttached.end (), "rnti=" << flow.m_rnti << " lcid=" << (uint32_t) flow.m_lcId);
--- a/src/lte/model/lte-enb-mac.h	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/lte-enb-mac.h	Mon Apr 18 17:35:49 2011 +0200
@@ -181,7 +181,7 @@
 private:
 private:
   // std::map <uint16_t, std::map <uint8_t,Ptr<LteMacSapUser> > > m_rlcAttached;
-  std::map <lteFlowId_t, LteMacSapUser*> m_rlcAttached;
+  std::map <LteFlowId_t, LteMacSapUser*> m_rlcAttached;
 
   std::vector <CqiListElement_s> m_dlCqiReceived; // DL-CQI received
   std::vector <UlCqi_s> m_ulCqiReceived; // UL-CQI received
--- a/src/lte/model/pf-ff-mac-scheduler.cc	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/pf-ff-mac-scheduler.cc	Mon Apr 18 17:35:49 2011 +0200
@@ -290,10 +290,10 @@
 {
   NS_LOG_FUNCTION (this << " New LC, rnti: "  << params.m_rnti);
   
-  std::map <lteFlowId_t, pfsFlowPerf_t>::iterator it;
+  std::map <LteFlowId_t, pfsFlowPerf_t>::iterator it;
   for (uint16_t i = 0; i < params.m_logicalChannelConfigList.size (); i++)
     {
-      lteFlowId_t flow (params.m_rnti, params.m_logicalChannelConfigList.at (i).m_logicalChannelIdentity);
+      LteFlowId_t flow (params.m_rnti, params.m_logicalChannelConfigList.at (i).m_logicalChannelIdentity);
       
       it = m_flowStats.find (flow);
       
@@ -314,7 +314,7 @@
           flowStats.rlcBufferReq.m_rlcTransmissionQueueSize = 0;
           flowStats.rlcBufferReq.m_rlcRetransmissionQueueSize = 0;
           flowStats.rlcBufferReq.m_rlcStatusPduSize = 0;
-          m_flowStats.insert (std::pair<lteFlowId_t, pfsFlowPerf_t> (flow, flowStats));
+          m_flowStats.insert (std::pair<LteFlowId_t, pfsFlowPerf_t> (flow, flowStats));
         }
       else
         {
@@ -349,9 +349,9 @@
   // API generated by RLC for updating RLC parameters on a LC (tx and retx queues)
   
   
-  std::map <lteFlowId_t, pfsFlowPerf_t>::iterator it;
+  std::map <LteFlowId_t, pfsFlowPerf_t>::iterator it;
   
-  lteFlowId_t flow (params.m_rnti, params.m_logicalChannelIdentity);
+  LteFlowId_t flow (params.m_rnti, params.m_logicalChannelIdentity);
   
   it = m_flowStats.find (flow);
   
@@ -410,12 +410,12 @@
   // Resource allocation type 0 (see sec 7.1.6.1 of 36.213)
   int rbgSize = GetRbgSize (m_cschedCellConfig.m_dlBandwidth);
   int rbgNum = m_cschedCellConfig.m_dlBandwidth / rbgSize;
-  std::vector <lteFlowId_t> rbgAllocationMap;
+  std::vector <LteFlowId_t> rbgAllocationMap;
   for (int i = 0; i < rbgNum; i++)
     {
       //NS_LOG_DEBUG (this << " ALLOCATION for RBG " << i << " of " << rbgNum);
-      std::map <lteFlowId_t, pfsFlowPerf_t>::iterator it;
-      std::map <lteFlowId_t, pfsFlowPerf_t>::iterator itMax = m_flowStats.end ();
+      std::map <LteFlowId_t, pfsFlowPerf_t>::iterator it;
+      std::map <LteFlowId_t, pfsFlowPerf_t>::iterator itMax = m_flowStats.end ();
       double rcqiMax = 0.0;
       for (it = m_flowStats.begin (); it != m_flowStats.end (); it++)
         {
@@ -459,7 +459,7 @@
         {
           // no UE available for this RB
           //NS_LOG_DEBUG (this << " no UE found");
-          lteFlowId_t nullFlow;
+          LteFlowId_t nullFlow;
           nullFlow.m_rnti = 0;
           rbgAllocationMap.push_back (nullFlow);
         }
@@ -473,7 +473,7 @@
     // generate the transmission opportunities by grouping the adjacent RBGs and
     // creating the correspondent DCIs
     FfMacSchedSapUser::SchedDlConfigIndParameters ret;
-    std::vector <lteFlowId_t>:: iterator flowIt = rbgAllocationMap.begin ();
+    std::vector <LteFlowId_t>:: iterator flowIt = rbgAllocationMap.begin ();
     int rbgAllocated = 0;
     while (flowIt != rbgAllocationMap.end ())
       {
@@ -560,7 +560,7 @@
         ret.m_buildDataList.push_back (newEl);
         
         // update UE-LC stats
-        std::map <lteFlowId_t, pfsFlowPerf_t>::iterator it;
+        std::map <LteFlowId_t, pfsFlowPerf_t>::iterator it;
         it = m_flowStats.find ((*flowIt));
         if (it != m_flowStats.end())
           {
@@ -590,7 +590,7 @@
       ret.m_nrOfPdcchOfdmSymbols = 1;   // TODO: check correct value according the DCIs txed
       
       // update the UE-LC stats
-      std::map <lteFlowId_t, pfsFlowPerf_t>::iterator it;
+      std::map <LteFlowId_t, pfsFlowPerf_t>::iterator it;
       for (it = m_flowStats.begin (); it != m_flowStats.end (); it++)
         {
           (*it).second.totalBytesTransmitted += (*it).second.lastTtiBytesTrasmitted;
--- a/src/lte/model/pf-ff-mac-scheduler.h	Mon Apr 18 17:20:46 2011 +0200
+++ b/src/lte/model/pf-ff-mac-scheduler.h	Mon Apr 18 17:35:49 2011 +0200
@@ -138,7 +138,7 @@
   /*
   * Map of UE-LC statistics
   */
-  std::map <lteFlowId_t, pfsFlowPerf_t> m_flowStats;
+  std::map <LteFlowId_t, pfsFlowPerf_t> m_flowStats;
   
 
   /*