F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some remnants from the iid-a-variable era.

Browse Source
This commit is contained in:
Mathieu Lacage
2008-01-02 11:08:11 +01:00
parent 2deb2ea0f0
commit 328aa2cc45
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/object.cc
View File

@@ -40,15 +40,15 @@ class IidManager : public ns3::UidManager
class IidTree
{
public:
void SetParent (uint16_t child, const uint16_t *parent);
void SetParent (uint16_t child, uint16_t parent);
uint16_t LookupParent (uint16_t child);
private:
std::vector<const uint16_t *> m_parents;
std::vector<uint16_t> m_parents;
};
void
IidTree::SetParent (uint16_t child, const uint16_t *parent)
IidTree::SetParent (uint16_t child, uint16_t parent)
{
m_parents.resize (child+1);
m_parents[child] = parent;
@@ -57,7 +57,7 @@ uint16_t
IidTree::LookupParent (uint16_t child)
{
NS_ASSERT (child < m_parents.size ());
return *(m_parents[child]);
return m_parents[child];
}
} // anonymous namespace
@@ -158,23 +158,23 @@ InterfaceId::GetName (void) const
return name;
}
bool operator == (const InterfaceId &a, const InterfaceId &b)
bool operator == (InterfaceId a, InterfaceId b)
{
return a.m_iid == b.m_iid;
}
bool operator != (const InterfaceId &a, const InterfaceId &b)
bool operator != (InterfaceId a, InterfaceId b)
{
return a.m_iid != b.m_iid;
}
InterfaceId
MakeInterfaceId (std::string name, const InterfaceId &parent)
MakeInterfaceId (std::string name, InterfaceId parent)
{
uint32_t uid = Singleton<IidManager>::Get ()->Allocate (name);
NS_ASSERT (uid <= 0xffff);
InterfaceId iid = uid;
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, &parent.m_iid);
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, parent.m_iid);
return iid;
}
@@ -182,7 +182,7 @@ InterfaceId
MakeObjectInterfaceId (void)
{
InterfaceId iid = Singleton<IidManager>::Get ()->Allocate ("Object");
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, &iid.m_iid);
Singleton<IidTree>::Get ()->SetParent (iid.m_iid, iid.m_iid);
return iid;
}

8
src/core/object.h
View File

@@ -68,10 +68,10 @@ public:
~InterfaceId ();
private:
InterfaceId (uint16_t iid);
friend InterfaceId MakeInterfaceId (std::string name, const InterfaceId &parent);
friend InterfaceId MakeInterfaceId (std::string name, InterfaceId parent);
friend InterfaceId MakeObjectInterfaceId (void);
friend bool operator == (const InterfaceId &a, const InterfaceId &b);
friend bool operator != (const InterfaceId &a, const InterfaceId &b);
friend bool operator == (InterfaceId a, InterfaceId b);
friend bool operator != (InterfaceId a, InterfaceId b);
uint16_t m_iid;
};
@@ -86,7 +86,7 @@ private:
* itself.
*/
InterfaceId
MakeInterfaceId (std::string name, const InterfaceId &parent);
MakeInterfaceId (std::string name, InterfaceId parent);
/**
* \brief a base class which provides memory management and object aggregation