ATTRIBUTE_HELPER_HEADER_2 -> ATTRIBUTE_HELPER_HEADER

src/common/data-rate.h

@@ -93,7 +93,7 @@ std::istream &operator >> (std::istream &is, DataRate &rate);
  * \brief hold objects of type ns3::DataRate
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (DataRate);
+ATTRIBUTE_HELPER_HEADER (DataRate);
 
 /**
  * \param lhs

src/core/attribute-helper.h

@@ -238,7 +238,7 @@ MakeSimpleAttributeChecker (std::string name, std::string underlying)
  * This macro should be invoked outside of the class
  * declaration in its public header.
  */
-#define ATTRIBUTE_HELPER_HEADER_2(type)					\
+#define ATTRIBUTE_HELPER_HEADER(type)					\
   ATTRIBUTE_VALUE_DEFINE (type);					\
   ATTRIBUTE_ACCESSOR_DEFINE (type);					\
   ATTRIBUTE_CHECKER_DEFINE (type);

src/core/attribute-test.cc

@@ -53,7 +53,7 @@ std::istream & operator >> (std::istream &is, ValueClassTest &v)
 {
   return is;
 }
-ATTRIBUTE_HELPER_HEADER_2 (ValueClassTest);
+ATTRIBUTE_HELPER_HEADER (ValueClassTest);
 ATTRIBUTE_HELPER_CPP (ValueClassTest);
 
 class AttributeTest : public Test

src/core/object-factory.h

@@ -93,7 +93,7 @@ std::istream & operator >> (std::istream &is, ObjectFactory &factory);
  * \brief hold objects of type ns3::ObjectFactory
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (ObjectFactory);
+ATTRIBUTE_HELPER_HEADER (ObjectFactory);
 
 } // namespace ns3
 

src/core/type-id.h

@@ -387,7 +387,7 @@ bool operator <  (TypeId a, TypeId b);
  */
 
 
-ATTRIBUTE_HELPER_HEADER_2 (TypeId);
+ATTRIBUTE_HELPER_HEADER (TypeId);
 
 } // namespace ns3 
 

src/devices/wifi/ssid.h

@@ -62,7 +62,7 @@ std::istream &operator >> (std::istream &is, Ssid &ssid);
  * \brief hold objects of type ns3::Ssid
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Ssid);
+ATTRIBUTE_HELPER_HEADER (Ssid);
 
 } // namespace ns3
 

src/devices/wifi/wifi-mode.h

@@ -122,7 +122,7 @@ std::istream & operator >> (std::istream &is, WifiMode &mode);
  * \brief hold objects of type ns3::WifiMode
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (WifiMode);
+ATTRIBUTE_HELPER_HEADER (WifiMode);
 
 /**
  * \brief create WifiMode class instances and keep track of them.

src/mobility/rectangle.h

@@ -71,7 +71,7 @@ std::istream &operator >> (std::istream &is, Rectangle &rectangle);
  * \brief hold objects of type ns3::Rectangle
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Rectangle);
+ATTRIBUTE_HELPER_HEADER (Rectangle);
 
 } // namespace ns3
 

src/mobility/vector.h

@@ -66,7 +66,7 @@ double CalculateDistance (const Vector &a, const Vector &b);
  * \brief hold objects of type ns3::Vector
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Vector);
+ATTRIBUTE_HELPER_HEADER (Vector);
 
 std::ostream &operator << (std::ostream &os, const Vector &vector);
 std::istream &operator >> (std::istream &is, Vector &vector);

src/node/address.h

@@ -170,7 +170,7 @@ private:
  * \brief hold objects of type ns3::Address
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Address);
+ATTRIBUTE_HELPER_HEADER (Address);
 
 bool operator == (const Address &a, const Address &b);
 bool operator != (const Address &a, const Address &b);

src/node/ipv4-address.h

@@ -192,8 +192,8 @@ private:
  * \brief hold objects of type ns3::Ipv4Mask
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Ipv4Address);
-ATTRIBUTE_HELPER_HEADER_2 (Ipv4Mask);
+ATTRIBUTE_HELPER_HEADER (Ipv4Address);
+ATTRIBUTE_HELPER_HEADER (Ipv4Mask);
 
 std::ostream& operator<< (std::ostream& os, Ipv4Address const& address);
 std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask);

src/node/mac48-address.h

@@ -116,7 +116,7 @@ private:
  * \brief hold objects of type ns3::Mac48Address
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Mac48Address);
+ATTRIBUTE_HELPER_HEADER (Mac48Address);
 
 bool operator == (const Mac48Address &a, const Mac48Address &b);
 bool operator != (const Mac48Address &a, const Mac48Address &b);