From 20d0136449b33681d79795248455b9873c63948c Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Thu, 3 May 2007 11:08:13 +0200
Subject: [PATCH] make Node derive from NsUnknown rather than Object

---
 src/node/node.cc |  9 +++++++--
 src/node/node.h  | 15 ++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/node/node.cc b/src/node/node.cc
index 0fb7e00e9..8de6008e9 100644
--- a/src/node/node.cc
+++ b/src/node/node.cc
@@ -26,18 +26,23 @@
 #include "node-list.h"
 #include "net-device.h"
 #include "ns3/simulator.h"
+#include "ns3/iid-manager.h"
 
 namespace ns3{
 
+const uint32_t Node::iid = IidManager::Allocate ("Node");
+
 Node::Node()
-  : m_id(0), 
+  : NsUnknown (Node::iid),
+    m_id(0), 
     m_sid(0)
 {
   m_id = NodeList::Add (this);
 }
 
 Node::Node(uint32_t sid)
-  : m_id(0), 
+  : NsUnknown (Node::iid),
+    m_id(0), 
     m_sid(sid)
 { 
   m_id = NodeList::Add (this);
diff --git a/src/node/node.h b/src/node/node.h
index c3aa6a9bd..10649fe7c 100644
--- a/src/node/node.h
+++ b/src/node/node.h
@@ -26,18 +26,12 @@
 #define __NODE_H__
 
 #include <vector>
-#include <list>
 
-#include "ns3/smartset.h"
-#include "ns3/object.h"
+#include "ns3/ns-unknown.h"
 
 namespace ns3 {
 
-class NodeList;
-
 class ApplicationList;
-
-// The below five may be encapsulated/abstracted in a Kernel or Stack class
 class L3Demux;
 class Ipv4L4Demux;
 class Ipv4;
@@ -48,12 +42,11 @@ class TraceContext;
 class TraceResolver;
 class NetDevice;
 
-class Node : public Object
+class Node : public NsUnknown
 {
-friend class NodeList;
-friend class SmartSet<Node*>;
-
 public:
+  static const uint32_t iid;
+
   Node();
   Node(uint32_t); // Specify which system for a distributed simulation
   virtual ~Node();