--- a/src/common/data-rate.h Mon May 26 20:44:19 2008 -0700
+++ b/src/common/data-rate.h Mon May 26 20:48:54 2008 -0700
@@ -93,7 +93,7 @@
* \brief hold objects of type ns3::DataRate
*/
-ATTRIBUTE_HELPER_HEADER_2 (DataRate);
+ATTRIBUTE_HELPER_HEADER (DataRate);
/**
* \param lhs
--- a/src/core/attribute-helper.h Mon May 26 20:44:19 2008 -0700
+++ b/src/core/attribute-helper.h Mon May 26 20:48:54 2008 -0700
@@ -238,7 +238,7 @@
* 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);
--- a/src/core/attribute-test.cc Mon May 26 20:44:19 2008 -0700
+++ b/src/core/attribute-test.cc Mon May 26 20:48:54 2008 -0700
@@ -53,7 +53,7 @@
{
return is;
}
-ATTRIBUTE_HELPER_HEADER_2 (ValueClassTest);
+ATTRIBUTE_HELPER_HEADER (ValueClassTest);
ATTRIBUTE_HELPER_CPP (ValueClassTest);
class AttributeTest : public Test
--- a/src/core/object-factory.h Mon May 26 20:44:19 2008 -0700
+++ b/src/core/object-factory.h Mon May 26 20:48:54 2008 -0700
@@ -93,7 +93,7 @@
* \brief hold objects of type ns3::ObjectFactory
*/
-ATTRIBUTE_HELPER_HEADER_2 (ObjectFactory);
+ATTRIBUTE_HELPER_HEADER (ObjectFactory);
} // namespace ns3
--- a/src/core/type-id.h Mon May 26 20:44:19 2008 -0700
+++ b/src/core/type-id.h Mon May 26 20:48:54 2008 -0700
@@ -387,7 +387,7 @@
*/
-ATTRIBUTE_HELPER_HEADER_2 (TypeId);
+ATTRIBUTE_HELPER_HEADER (TypeId);
} // namespace ns3
--- a/src/devices/wifi/ssid.h Mon May 26 20:44:19 2008 -0700
+++ b/src/devices/wifi/ssid.h Mon May 26 20:48:54 2008 -0700
@@ -62,7 +62,7 @@
* \brief hold objects of type ns3::Ssid
*/
-ATTRIBUTE_HELPER_HEADER_2 (Ssid);
+ATTRIBUTE_HELPER_HEADER (Ssid);
} // namespace ns3
--- a/src/devices/wifi/wifi-mode.h Mon May 26 20:44:19 2008 -0700
+++ b/src/devices/wifi/wifi-mode.h Mon May 26 20:48:54 2008 -0700
@@ -122,7 +122,7 @@
* \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.
--- a/src/mobility/rectangle.h Mon May 26 20:44:19 2008 -0700
+++ b/src/mobility/rectangle.h Mon May 26 20:48:54 2008 -0700
@@ -71,7 +71,7 @@
* \brief hold objects of type ns3::Rectangle
*/
-ATTRIBUTE_HELPER_HEADER_2 (Rectangle);
+ATTRIBUTE_HELPER_HEADER (Rectangle);
} // namespace ns3
--- a/src/mobility/vector.h Mon May 26 20:44:19 2008 -0700
+++ b/src/mobility/vector.h Mon May 26 20:48:54 2008 -0700
@@ -66,7 +66,7 @@
* \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);
--- a/src/node/address.h Mon May 26 20:44:19 2008 -0700
+++ b/src/node/address.h Mon May 26 20:48:54 2008 -0700
@@ -170,7 +170,7 @@
* \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);
--- a/src/node/ipv4-address.h Mon May 26 20:44:19 2008 -0700
+++ b/src/node/ipv4-address.h Mon May 26 20:48:54 2008 -0700
@@ -192,8 +192,8 @@
* \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);
--- a/src/node/mac48-address.h Mon May 26 20:44:19 2008 -0700
+++ b/src/node/mac48-address.h Mon May 26 20:48:54 2008 -0700
@@ -116,7 +116,7 @@
* \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);