From c547c88e89ec4b3921cfeabb5308e01e1fc8eec5 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Thu, 3 Jan 2008 11:37:09 +0100
Subject: [PATCH] use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in
 IidManager::GetRegistered

---
 src/core/object.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/object.cc b/src/core/object.cc
index ac16ec000..ee147cf5f 100644
--- a/src/core/object.cc
+++ b/src/core/object.cc
@@ -176,7 +176,7 @@ IidManager::GetRegisteredN (void)
 uint16_t 
 IidManager::GetRegistered (uint32_t i)
 {
-  return i;
+  return i + 1;
 }
 
 
@@ -347,6 +347,8 @@ bool operator != (InterfaceId a, InterfaceId b)
  *         The Object implementation
  *********************************************************************/
 
+NS_OBJECT_ENSURE_REGISTERED (Object);
+
 static InterfaceId
 GetObjectIid (void)
 {
@@ -693,6 +695,11 @@ public:
   ns3::SVTraceSource<int16_t> m_sourceDerived;
 };
 
+NS_OBJECT_ENSURE_REGISTERED (BaseA);
+NS_OBJECT_ENSURE_REGISTERED (DerivedA);
+NS_OBJECT_ENSURE_REGISTERED (BaseB);
+NS_OBJECT_ENSURE_REGISTERED (DerivedB);
+
 } // namespace anonymous
 
 namespace ns3 {