View | Details | Raw Unified | Return to bug 95
Collapse All | Expand All

(-)a/src/common/data-rate.cc (+30 lines)
 Lines 150-176   bool DataRate::operator < (const DataRat Link Here 
150 
	return m_bps<rhs.m_bps;
 150 
	return m_bps<rhs.m_bps;
151 
}
 151 
}
152 

          152
          

        

            

              
              
              153
              
bool DataRate::operator < (const DataRate& rhs) const

            

            

              154
              
{

            

            

              155
              
	return m_bps<rhs.m_bps;

            

            

              156
              
}

            

            

              157
              

            

        

          153
          
bool DataRate::operator <= (const DataRate& rhs)

          158
          
bool DataRate::operator <= (const DataRate& rhs)

        

        

          154
          
{

          159
          
{

        

        

          155
          
	return m_bps<=rhs.m_bps;

          160
          
	return m_bps<=rhs.m_bps;

        

        

          156
          
}

          161
          
}

        

        

          157
          

          162
          

        

            

              
              
              163
              
bool DataRate::operator <= (const DataRate& rhs) const

            

            

              164
              
{

            

            

              165
              
	return m_bps<=rhs.m_bps;

            

            

              166
              
}

            

            

              167
              

            

        

          158
          
bool DataRate::operator >  (const DataRate& rhs)

          168
          
bool DataRate::operator >  (const DataRate& rhs)

        

        

          159
          
{

          169
          
{

        

        

          160
          
	return m_bps>rhs.m_bps;

          170
          
	return m_bps>rhs.m_bps;

        

        

          161
          
}

          171
          
}

        

        

          162
          

          172
          

        

            

              
              
              173
              
bool DataRate::operator >  (const DataRate& rhs) const

            

            

              174
              
{

            

            

              175
              
	return m_bps>rhs.m_bps;

            

            

              176
              
}

            

            

              177
              

            

        

          163
          
bool DataRate::operator >= (const DataRate& rhs)

          178
          
bool DataRate::operator >= (const DataRate& rhs)

        

        

          164
          
{

          179
          
{

        

        

          165
          
	return m_bps>=rhs.m_bps;

          180
          
	return m_bps>=rhs.m_bps;

        

        

          166
          
}

          181
          
}

        

        

          167
          

          182
          

        

            

              
              
              183
              
bool DataRate::operator >= (const DataRate& rhs) const

            

            

              184
              
{

            

            

              185
              
	return m_bps>=rhs.m_bps;

            

            

              186
              
}

            

            

              187
              

            

        

          168
          
bool DataRate::operator == (const DataRate& rhs)

          188
          
bool DataRate::operator == (const DataRate& rhs)

        

        

          169
          
{

          189
          
{

        

        

          170
          
	return m_bps==rhs.m_bps;

          190
          
	return m_bps==rhs.m_bps;

        

        

          171
          
}

          191
          
}

        

        

          172
          

          192
          

        

            

              
              
              193
              
bool DataRate::operator == (const DataRate& rhs) const

            

            

              194
              
{

            

            

              195
              
	return m_bps==rhs.m_bps;

            

            

              196
              
}

            

            

              197
              

            

        

          173
          
bool DataRate::operator != (const DataRate& rhs)

          198
          
bool DataRate::operator != (const DataRate& rhs)

        

            

              
              
              199
              
{

            

            

              200
              
	return m_bps!=rhs.m_bps;

            

            

              201
              
}

            

            

              202
              

            

            

              203
              
bool DataRate::operator != (const DataRate& rhs) const

            

        

          174
          
{

          204
          
{

        

        

          175
          
	return m_bps!=rhs.m_bps;

          205
          
	return m_bps!=rhs.m_bps;

        

        

          176
          
}

          206
          
}

        



(-)a/src/common/data-rate.h
      (+6 lines)




  

    

    

       Lines 73-83
      class DataRate 
    
  Link Here 
    

  

        

          73
          
  DataRate (const std::string s);

          73
          
  DataRate (const std::string s);

        

        

          74
          
  

          74
          
  

        

        

          75
          
  bool operator <  (const DataRate& rhs);

          75
          
  bool operator <  (const DataRate& rhs);

        

            

              
              
              76
              
  bool operator <  (const DataRate& rhs) const;

            

        

          76
          
  bool operator <= (const DataRate& rhs);

          77
          
  bool operator <= (const DataRate& rhs);

        

            

              
              
              78
              
  bool operator <= (const DataRate& rhs) const;

            

        

          77
          
  bool operator >  (const DataRate& rhs);

          79
          
  bool operator >  (const DataRate& rhs);

        

            

              
              
              80
              
  bool operator >  (const DataRate& rhs) const;

            

        

          78
          
  bool operator >= (const DataRate& rhs);

          81
          
  bool operator >= (const DataRate& rhs);

        

            

              
              
              82
              
  bool operator >= (const DataRate& rhs) const;

            

        

          79
          
  bool operator == (const DataRate& rhs);

          83
          
  bool operator == (const DataRate& rhs);

        

            

              
              
              84
              
  bool operator == (const DataRate& rhs) const;

            

        

          80
          
  bool operator != (const DataRate& rhs);

          85
          
  bool operator != (const DataRate& rhs);

        

            

              
              
              86
              
  bool operator != (const DataRate& rhs) const;

            

        

          81
          
  

          87
          
  

        

        

          82
          
  /**

          88
          
  /**

        

        

          83
          
   * \brief Calculate transmission time

          89
          
   * \brief Calculate transmission time

        



(-)a/src/devices/csma/csma-net-device.cc
      (-1 / +4 lines)




  

    

    

       Lines 195-201
      CsmaNetDevice::SetDataRate (DataRate bps 
    
  Link Here 
    

  

        

          195
          
CsmaNetDevice::SetDataRate (DataRate bps)

          195
          
CsmaNetDevice::SetDataRate (DataRate bps)

        

        

          196
          
{

          196
          
{

        

        

          197
          
  NS_LOG_FUNCTION;

          197
          
  NS_LOG_FUNCTION;

        

          
            

              198
              
  m_bps = bps;


              198
              
  if (!m_channel || bps <= m_channel->GetDataRate ())

            

            

              
              

              199
              
    {

            

            


              200
              
      m_bps = bps;

            

            


              201
              
    }

            

        

          199
          
}

          202
          
}

        

        

          200
          

          203
          

        

        

          201
          
void 

          204
          
void 

        



(-)a/src/devices/point-to-point/point-to-point-net-device.cc
      (-1 / +4 lines)




  

    

    

       Lines 127-133
      void PointToPointNetDevice::SetDataRate( 
    
  Link Here 
    

  

        

          127
          
void PointToPointNetDevice::SetDataRate(const DataRate& bps)

          127
          
void PointToPointNetDevice::SetDataRate(const DataRate& bps)

        

        

          128
          
{

          128
          
{

        

        

          129
          
  NS_LOG_FUNCTION;

          129
          
  NS_LOG_FUNCTION;

        

          
            

              130
              
  m_bps = bps;


              130
              
  if (!m_channel || bps <= m_channel->GetDataRate ())

            

            

              
              

              131
              
    {

            

            


              132
              
      m_bps = bps;

            

            


              133
              
    }

            

        

          131
          
}

          134
          
}

        

        

          132
          

          135
          

        

        

          133
          
void PointToPointNetDevice::SetInterframeGap(const Time& t)

          136
          
void PointToPointNetDevice::SetInterframeGap(const Time& t)

        






  

  Return to bug 95