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

(-)a/src/devices/mesh/dot11s/ie-dot11s-beacon-timing.cc (-8 lines)
 Lines 118-136    Link Here 
118 
void
 118 
void
119 
IeBeaconTiming::ClearTimingElement ()
 119 
IeBeaconTiming::ClearTimingElement ()
120 
{
 120 
{
121 
  uint16_t to_delete = 0;
122 
  uint16_t i;
123 
  for (NeighboursTimingUnitsList::iterator j = m_neighbours.begin (); j != m_neighbours.end (); j++)
 121 
  for (NeighboursTimingUnitsList::iterator j = m_neighbours.begin (); j != m_neighbours.end (); j++)
124 
    {
 122 
    {
125 
      to_delete++;
126 
      (*j) = 0;
 123 
      (*j) = 0;
127 
    }
 124 
    }
128 
  for (i = 0; i < to_delete; i++)
129 
    {
130 
      m_neighbours.pop_back ();
131 
    }
132 
  m_neighbours.clear ();
 125 
  m_neighbours.clear ();
133 

              
              
            

        

          134
          
}

          126
          
}

        

        

          135
          
uint8_t

          127
          
uint8_t

        

        

          136
          
IeBeaconTiming::GetInformationSize () const

          128
          
IeBeaconTiming::GetInformationSize () const

        



(-)a/src/devices/mesh/dot11s/ie-dot11s-preq.cc
      (-5 lines)




  

    

    

       Lines 373-388
       
    
  Link Here 
    

  

        

          373
          
void

          373
          
void

        

        

          374
          
IePreq::ClearDestinationAddressElements ()

          374
          
IePreq::ClearDestinationAddressElements ()

        

        

          375
          
{

          375
          
{

        

            

              376
              
  int i;

              
              
            

        

          377
          
  for (std::vector<Ptr<DestinationAddressUnit> >::iterator j = m_destinations.begin (); j

          376
          
  for (std::vector<Ptr<DestinationAddressUnit> >::iterator j = m_destinations.begin (); j

        

        

          378
          
      != m_destinations.end (); j++)

          377
          
      != m_destinations.end (); j++)

        

        

          379
          
    {

          378
          
    {

        

        

          380
          
      (*j) = 0;

          379
          
      (*j) = 0;

        

        

          381
          
    }

          380
          
    }

        

            

              382
              
  for (i = 0; i < m_destCount; i++)

              
              
            

            

              383
              
    {

            

            

              384
              
      m_destinations.pop_back ();

            

            

              385
              
    }

            

        

          386
          
  m_destinations.clear ();

          381
          
  m_destinations.clear ();

        

        

          387
          
  m_destCount = 0;

          382
          
  m_destCount = 0;

        

        

          388
          
}

          383
          
}

        



(-)a/src/devices/mesh/mesh-wifi-beacon.h
      (-2 lines)




  

    

    

       Lines 27-34
       
    
  Link Here 
    

  

        

          27
          
#include "ns3/wifi-mac-header.h"

          27
          
#include "ns3/wifi-mac-header.h"

        

        

          28
          
#include "ns3/wifi-information-element-vector.h"

          28
          
#include "ns3/wifi-information-element-vector.h"

        

        

          29
          

          29
          

        

            

              30
              
#include <vector>

              
              
            

            

              31
              

            

        

          32
          
namespace ns3 {

          30
          
namespace ns3 {

        

        

          33
          

          31
          

        

        

          34
          
/**

          32
          
/**

        



(-)a/src/devices/mesh/wifi-information-element-vector.cc
      (-1 / +1 lines)




  

    

    

       Lines 74-80
       
    
  Link Here 
    

  

        

          74
          
void

          74
          
void

        

        

          75
          
WifiInformationElementVector::Serialize (Buffer::Iterator start) const

          75
          
WifiInformationElementVector::Serialize (Buffer::Iterator start) const

        

        

          76
          
{

          76
          
{

        

          
            

              77
              
  for(std::vector<Ptr<WifiInformationElement> >::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)


              77
              
  for(IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)

            

        

          78
          
    {

          78
          
    {

        

        

          79
          
      start.WriteU8((*i)->ElementId ());

          79
          
      start.WriteU8((*i)->ElementId ());

        

        

          80
          
      start.WriteU8 ((*i)->GetInformationSize ());

          80
          
      start.WriteU8 ((*i)->GetInformationSize ());

        



(-)a/src/devices/wifi/interference-helper.cc
      (-1 / +1 lines)




  

    

    

       Lines 611-617
       
    
  Link Here 
    

  

        

          611
          
    {

          611
          
    {

        

        

          612
          
      *i = 0;

          612
          
      *i = 0;

        

        

          613
          
    }

          613
          
    }

        

          
            

              614
              
  m_events.erase (m_events.begin (), m_events.end ());


              614
              
  m_events.clear ();

            

        

          615
          
}

          615
          
}

        

        

          616
          

          616
          

        

        

          617
          
void

          617
          
void

        






  

  Return to bug 711