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

(-)a/src/node/mac48-address.cc (-2 / +7 lines)
 Lines 108-119    Link Here 
108 
  return Address (GetType (), m_address, 6);
 108 
  return Address (GetType (), m_address, 6);
109 
}
 109 
}
110 
Mac48Address
110 
Mac48Address
111 
Mac48Address::ConvertFrom (const Address &address)
 111 
Mac48AddressConvertFrom (const Address &address)
112 
{
 112 
{
113 
  NS_ASSERT (address.CheckCompatible (GetType (), 6));
 113 
  NS_ASSERT (address.CheckCompatible (Mac48Address::GetType (), 6));
114 
  Mac48Address retval;
 114 
  Mac48Address retval;
115 
  address.CopyTo (retval.m_address);
 115 
  address.CopyTo (retval.m_address);
116 
  return retval;
 116 
  return retval;
117 
}
118 
Mac48Address
119 
Mac48Address::ConvertFrom (const Address &address)
120 
{
121 
  return Mac48AddressConvertFrom (address);
117 
}
 122 
}
118 
Mac48Address
123 
Mac48Address
119 
Mac48Address::Allocate (void)
 124 
Mac48Address::Allocate (void)
(-)a/src/node/mac48-address.h (-2 / +5 lines)
 Lines 24-29    Link Here 
24 
#include <ostream>
 24 
#include <ostream>
25 
#include "ns3/attribute.h"
 25 
#include "ns3/attribute.h"
26 
#include "ns3/attribute-helper.h"
 26 
#include "ns3/attribute-helper.h"
27 
#include "ns3/deprecated.h"
27 

          28
          

        

        

          28
          
namespace ns3 {

          29
          
namespace ns3 {

        

        

          29
          

          30
          

        

  

    

    

       Lines 70-80
       
    
  Link Here 
    

  

        

          70
          
   * \param address a polymorphic address

          71
          
   * \param address a polymorphic address

        

        

          71
          
   * \returns a new Mac48Address from the polymorphic address

          72
          
   * \returns a new Mac48Address from the polymorphic address

        

        

          72
          
   * 

          73
          
   * 

        

          
            

              73
              
   * This function performs a type check and asserts if the


              74
              
   * Deprecated.  This function performs a type check and asserts if the

            

        

          74
          
   * type of the input address is not compatible with an

          75
          
   * type of the input address is not compatible with an

        

        

          75
          
   * Mac48Address.

          76
          
   * Mac48Address.

        

        

          76
          
   */

          77
          
   */

        

          
            

              77
              
  static Mac48Address ConvertFrom (const Address &address);


              78
              
  static Mac48Address ConvertFrom (const Address &address) NS_DEPRECATED;

            

            

              
              

              79
              
  friend Mac48Address Mac48AddressConvertFrom (const Address &address);

            

            


              80
              

            

        

          78
          
  /**

          81
          
  /**

        

        

          79
          
   * \returns true if the address matches, false otherwise.

          82
          
   * \returns true if the address matches, false otherwise.

        

        

          80
          
   */

          83
          
   */

        






  

  Return to bug 263