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

(-)a/src/devices/mesh/dot11s/hwmp-protocol.cc (+3 lines)
 Lines 184-189    Link Here 
184 
  m_doFlag (false),
 184 
  m_doFlag (false),
185 
  m_rfFlag (false)
 185 
  m_rfFlag (false)
186 
{
 186 
{
187 
  NS_LOG_FUNCTION_NOARGS ();
187 

          188
          

        

        

          188
          
  if (m_isRoot)

          189
          
  if (m_isRoot)

        

        

          189
          
    {

          190
          
    {

        

  

    

    

       Lines 193-203
       
    
  Link Here 
    

  

        

          193
          

          194
          

        

        

          194
          
HwmpProtocol::~HwmpProtocol ()

          195
          
HwmpProtocol::~HwmpProtocol ()

        

        

          195
          
{

          196
          
{

        

            

              
              
              197
              
  NS_LOG_FUNCTION_NOARGS ();

            

        

          196
          
}

          198
          
}

        

        

          197
          

          199
          

        

        

          198
          
void

          200
          
void

        

        

          199
          
HwmpProtocol::DoDispose ()

          201
          
HwmpProtocol::DoDispose ()

        

        

          200
          
{

          202
          
{

        

            

              
              
              203
              
  NS_LOG_FUNCTION_NOARGS ();

            

        

          201
          
  for (std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.begin (); i != m_preqTimeouts.end (); i ++)

          204
          
  for (std::map<Mac48Address, EventId>::iterator i = m_preqTimeouts.begin (); i != m_preqTimeouts.end (); i ++)

        

        

          202
          
    {

          205
          
    {

        

        

          203
          
      i->second.Cancel ();

          206
          
      i->second.Cancel ();

        



(-)a/src/devices/wifi/wifi-net-device.cc
      (-2 / +10 lines)




  

    

    

       Lines 28-33
       
    
  Link Here 
    

  

        

          28
          
#include "ns3/pointer.h"

          28
          
#include "ns3/pointer.h"

        

        

          29
          
#include "ns3/node.h"

          29
          
#include "ns3/node.h"

        

        

          30
          
#include "ns3/trace-source-accessor.h"

          30
          
#include "ns3/trace-source-accessor.h"

        

            

              
              
              31
              
#include "ns3/log.h"

            

            

              32
              

            

            

              33
              
NS_LOG_COMPONENT_DEFINE ("WifiNetDevice");

            

        

          31
          

          34
          

        

        

          32
          
namespace ns3 {

          35
          
namespace ns3 {

        

        

          33
          

          36
          

        

  

    

    

       Lines 65-77
       
    
  Link Here 
    

  

        

          65
          
WifiNetDevice::WifiNetDevice ()

          68
          
WifiNetDevice::WifiNetDevice ()

        

        

          66
          
  : m_mtu (0),

          69
          
  : m_mtu (0),

        

        

          67
          
    m_configComplete (false)

          70
          
    m_configComplete (false)

        

          
            

              68
              
{}


              71
              
{

            

            

              
              

              72
              
  NS_LOG_FUNCTION_NOARGS ();

            

            


              73
              
}

            

        

          69
          
WifiNetDevice::~WifiNetDevice ()

          74
          
WifiNetDevice::~WifiNetDevice ()

        

          
            

              70
              
{}


              75
              
{

            

            

              
              

              76
              
  NS_LOG_FUNCTION_NOARGS ();

            

            


              77
              
}

            

        

          71
          

          78
          

        

        

          72
          
void

          79
          
void

        

        

          73
          
WifiNetDevice::DoDispose (void)

          80
          
WifiNetDevice::DoDispose (void)

        

        

          74
          
{

          81
          
{

        

            

              
              
              82
              
  NS_LOG_FUNCTION_NOARGS ();

            

        

          75
          
  m_node = 0;

          83
          
  m_node = 0;

        

        

          76
          
  m_mac->Dispose ();

          84
          
  m_mac->Dispose ();

        

        

          77
          
  m_phy->Dispose ();

          85
          
  m_phy->Dispose ();

        



(-)a/src/devices/wifi/yans-wifi-channel.cc
      (+1 lines)




  

    

    

       Lines 56-61
       
    
  Link Here 
    

  

        

          56
          
{}

          56
          
{}

        

        

          57
          
YansWifiChannel::~YansWifiChannel ()

          57
          
YansWifiChannel::~YansWifiChannel ()

        

        

          58
          
{

          58
          
{

        

            

              
              
              59
              
  NS_LOG_FUNCTION_NOARGS ();

            

        

          59
          
  m_phyList.clear ();

          60
          
  m_phyList.clear ();

        

        

          60
          
}

          61
          
}

        

        

          61
          

          62
          

        



(-)a/src/node/net-device.cc
      (-1 / +3 lines)




  

    

    

       Lines 45-50
       
    
  Link Here 
    

  

        

          45
          
}

          45
          
}

        

        

          46
          

          46
          

        

        

          47
          
NetDevice::~NetDevice ()

          47
          
NetDevice::~NetDevice ()

        

          
            

              48
              
{}


              48
              
{

            

            

              
              

              49
              
  NS_LOG_FUNCTION_NOARGS ();

            

            


              50
              
}

            

        

          49
          

          51
          

        

        

          50
          
} // namespace ns3

          52
          
} // namespace ns3

        






  

  Return to bug 711