use NS_OBJECT_ENSURE_REGISTERED and fix off-by-one in IidManager::GetRegistered

This commit is contained in:
Mathieu Lacage
2008-01-03 11:37:09 +01:00
parent 2a4dcce444
commit c547c88e89

View File

@@ -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 {