fixed compilation error with g++-4.4
authorNicola Baldo <nbaldo@cttc.es>
Wed, 07 Mar 2012 16:42:46 +0100
changeset 8670 8f63d16fb2e8
parent 8669 7f1d62565d04
child 8672 d02df5f59a0b
fixed compilation error with g++-4.4
src/lte/model/lte-enb-phy.cc
src/lte/model/lte-enb-phy.h
src/lte/model/lte-phy.cc
src/lte/model/lte-phy.h
src/lte/model/lte-ue-phy.cc
src/lte/model/lte-ue-phy.h
--- a/src/lte/model/lte-enb-phy.cc	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-enb-phy.cc	Wed Mar 07 16:42:46 2012 +0100
@@ -143,8 +143,9 @@
     .AddAttribute ("MacToChannelDelay",
                    "The delay in TTI units that occurs between a scheduling decision in the MAC and the actual start of the transmission by the PHY. This is intended to be used to model the latency of real PHY and MAC implementations.",
                    UintegerValue (1),
-                   MakeUintegerAccessor (&LteEnbPhy::m_macChTtiDelay),
-                   MakeUintegerChecker<uint8_t> (1,255))
+                   MakeUintegerAccessor (&LteEnbPhy::SetMacChDelay, 
+                                         &LteEnbPhy::GetMacChDelay),
+                   MakeUintegerChecker<uint8_t> ())
   ;
   return tid;
 }
@@ -213,6 +214,19 @@
   return m_noiseFigure;
 }
 
+void
+LteEnbPhy::SetMacChDelay (uint8_t delay)
+{
+  m_macChTtiDelay = delay;
+  m_packetBurstQueue.resize (delay);
+}
+
+uint8_t
+LteEnbPhy::GetMacChDelay (void) const
+{
+  return (m_macChTtiDelay);
+}
+
 bool
 LteEnbPhy::AddUePhy (uint16_t rnti, Ptr<LteUePhy> phy)
 {
--- a/src/lte/model/lte-enb-phy.h	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-enb-phy.h	Wed Mar 07 16:42:46 2012 +0100
@@ -85,6 +85,7 @@
    */
   double GetTxPower () const;
 
+
   /**
    * \param pw the noise figure in dB
    */
@@ -96,6 +97,16 @@
   double GetNoiseFigure () const;
 
   /**
+   * \param delay the TTI delay between MAC and channel
+   */
+  void SetMacChDelay (uint8_t delay);
+  
+  /**
+   * \returns the TTI delay between MAC and channel
+   */
+  uint8_t GetMacChDelay (void) const;
+
+  /**
   * \brief Queue the MAC PDU to be sent
   * \param p the MAC PDU to sent
   */
--- a/src/lte/model/lte-phy.cc	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-phy.cc	Wed Mar 07 16:42:46 2012 +0100
@@ -232,21 +232,6 @@
   return m_rbgSize;
 }
 
-
-void
-LtePhy::SetMacChDelay (uint8_t delay)
-{
-  m_macChTtiDelay = delay;
-  m_packetBurstQueue.resize (delay);
-}
-
-
-uint8_t
-LtePhy::GetMacChDelay (void)
-{
-  return (m_macChTtiDelay);
-}
-
 void
 LtePhy::SetMacPdu (Ptr<Packet> p)
 {
--- a/src/lte/model/lte-phy.h	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-phy.h	Wed Mar 07 16:42:46 2012 +0100
@@ -194,14 +194,6 @@
   */
   uint8_t GetRbgSize (void) const;
 
-  /**
-  * \param delay the TTI delay between MAC and channel
-  */
-  void SetMacChDelay (uint8_t delay);
-  /**
-  * \returns the TTI delay between MAC and channel
-  */
-  uint8_t GetMacChDelay (void);
 
   /**
   * \param p queue MAC PDU to be sent
--- a/src/lte/model/lte-ue-phy.cc	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-ue-phy.cc	Wed Mar 07 16:42:46 2012 +0100
@@ -155,8 +155,9 @@
     .AddAttribute ("MacToChannelDelay",
                    "The delay in TTI units that occurs between a scheduling decision in the MAC and the actual start of the transmission by the PHY. This is intended to be used to model the latency of real PHY and MAC implementations.",
                    UintegerValue (1),
-                   MakeUintegerAccessor (&LteUePhy::m_macChTtiDelay),
-                   MakeUintegerChecker<uint8_t> (1,255))
+                   MakeUintegerAccessor (&LteUePhy::SetMacChDelay, 
+                                         &LteUePhy::GetMacChDelay),
+                   MakeUintegerChecker<uint8_t> ())
   ;
   return tid;
 }
@@ -213,6 +214,19 @@
 }
 
 void
+LteUePhy::SetMacChDelay (uint8_t delay)
+{
+  m_macChTtiDelay = delay;
+  m_packetBurstQueue.resize (delay);
+}
+
+uint8_t
+LteUePhy::GetMacChDelay (void) const
+{
+  return (m_macChTtiDelay);
+}
+
+void
 LteUePhy::DoSendMacPdu (Ptr<Packet> p)
 {
   NS_LOG_FUNCTION (this);
--- a/src/lte/model/lte-ue-phy.h	Mon Mar 05 19:09:57 2012 +0100
+++ b/src/lte/model/lte-ue-phy.h	Wed Mar 07 16:42:46 2012 +0100
@@ -102,6 +102,16 @@
   double GetNoiseFigure () const;
 
   /**
+   * \param delay the TTI delay between MAC and channel
+   */
+  void SetMacChDelay (uint8_t delay);
+
+  /**
+   * \returns the TTI delay between MAC and channel
+   */
+  uint8_t GetMacChDelay (void) const;
+
+  /**
    * \brief Queue the MAC PDU to be sent
    * \param p the MAC PDU to sent
    */