iid (void) -> GetTypeId (void)

src/node/channel.cc

@@ -27,7 +27,7 @@ namespace ns3 {
 NS_OBJECT_ENSURE_REGISTERED (Channel);
 
 TypeId 
-Channel::iid (void)
+Channel::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Channel")
     .SetParent<Object> ();

src/node/channel.h

@@ -35,7 +35,7 @@ class NetDevice;
 class Channel : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   Channel ();
   Channel (std::string name);

src/node/drop-tail-queue.cc

@@ -26,7 +26,7 @@ namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (DropTailQueue);
 
-TypeId DropTailQueue::iid (void) 
+TypeId DropTailQueue::GetTypeId (void) 
 {
   static TypeId iid = TypeId ("DropTailQueue")
     .SetParent<Queue> ()

src/node/drop-tail-queue.h

@@ -35,7 +35,7 @@ const int DTQ_NPACKETS_MAX_DEFAULT = 100;
  */
 class DropTailQueue : public Queue {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
   /**
    * \brief DropTailQueue Constructor
    *

src/node/ipv4.cc

@@ -28,7 +28,7 @@ namespace ns3 {
 NS_OBJECT_ENSURE_REGISTERED (Ipv4);
 
 TypeId 
-Ipv4::iid (void)
+Ipv4::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Ipv4")
     .SetParent<Object> ();

src/node/ipv4.h

@@ -157,7 +157,7 @@ public:
 class Ipv4 : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
   Ipv4 ();
   virtual ~Ipv4 ();
 

src/node/net-device.cc

@@ -35,7 +35,7 @@ namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (NetDevice);
 
-TypeId NetDevice::iid (void)
+TypeId NetDevice::GetTypeId (void)
 {
   static TypeId iid = TypeId ("NetDevice")
     .SetParent<Object> ();

src/node/net-device.h

@@ -60,7 +60,7 @@ class Packet;
 class NetDevice : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
   virtual ~NetDevice();
 
 

src/node/node.cc

@@ -32,7 +32,7 @@ namespace ns3{
 NS_OBJECT_ENSURE_REGISTERED (Node);
 
 TypeId 
-Node::iid (void)
+Node::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Node")
     .SetParent<Object> ();

src/node/node.h

@@ -96,7 +96,7 @@ private:
 class Node : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   /**
    * Must be invoked by subclasses only.

src/node/packet-socket-factory.cc

@@ -27,7 +27,7 @@ namespace ns3 {
 NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory);
 
 TypeId 
-PacketSocketFactory::iid (void)
+PacketSocketFactory::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Packet")
     .SetParent<SocketFactory> ();

src/node/packet-socket-factory.h

@@ -34,7 +34,7 @@ class Socket;
 class PacketSocketFactory : public SocketFactory
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   PacketSocketFactory ();
 

src/node/queue.cc

@@ -28,7 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Queue");
 namespace ns3 {
 
 static TypeIdDefaultValue g_interfaceIdDefaultValue ("Queue", "Packet Queue",
-                                                          Queue::iid (), "DropTailQueue");
+                                                          Queue::GetTypeId (), "DropTailQueue");
 
 NS_OBJECT_ENSURE_REGISTERED (Queue);
 
@@ -99,7 +99,7 @@ QueueTraceType::Print (std::ostream &os) const
 }
 
 TypeId 
-Queue::iid (void)
+Queue::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Queue")
     .SetParent<Object> ();

src/node/queue.h

@@ -78,7 +78,7 @@ private:
 class Queue : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   Queue ();
   virtual ~Queue ();

src/node/socket-factory.cc

@@ -24,7 +24,7 @@ namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (SocketFactory);
 
-TypeId SocketFactory::iid (void)
+TypeId SocketFactory::GetTypeId (void)
 {
   static TypeId iid = TypeId ("SocketFactory")
     .SetParent<Object> ();

src/node/socket-factory.h

@@ -47,7 +47,7 @@ class Socket;
 class SocketFactory : public Object
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   SocketFactory ();
 

src/node/udp.cc

@@ -24,7 +24,7 @@ namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (Udp);
 
-TypeId Udp::iid (void)
+TypeId Udp::GetTypeId (void)
 {
   static TypeId iid = TypeId ("Udp")
     .SetParent<SocketFactory> ();

src/node/udp.h

@@ -43,7 +43,7 @@ class Socket;
 class Udp : public SocketFactory
 {
 public:
-  static TypeId iid (void);
+  static TypeId GetTypeId (void);
 
   Udp ();