--- a/samples/main-adhoc-wifi.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/samples/main-adhoc-wifi.cc Tue Jan 15 12:44:09 2008 +0100
@@ -95,8 +95,8 @@
static Ptr<Socket>
SetupPacketReceive (Ptr<Node> node, uint16_t port)
{
- TypeId iid = TypeId::LookupByName ("Packet");
- Ptr<SocketFactory> socketFactory = node->QueryInterface<SocketFactory> (iid);
+ TypeId tid = TypeId::LookupByName ("Packet");
+ Ptr<SocketFactory> socketFactory = node->QueryInterface<SocketFactory> (tid);
Ptr<Socket> sink = socketFactory->CreateSocket ();
sink->Bind ();
sink->SetRecvCallback (MakeCallback (&ReceivePacket));
--- a/samples/main-simple.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/samples/main-simple.cc Tue Jan 15 12:44:09 2008 +0100
@@ -42,8 +42,8 @@
{
Ptr<Node> a = CreateObject<InternetNode> ();
- TypeId iid = TypeId::LookupByName ("Udp");
- Ptr<SocketFactory> socketFactory = a->QueryInterface<SocketFactory> (iid);
+ TypeId tid = TypeId::LookupByName ("Udp");
+ Ptr<SocketFactory> socketFactory = a->QueryInterface<SocketFactory> (tid);
Ptr<Socket> sink = socketFactory->CreateSocket ();
InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), 80);
--- a/src/applications/onoff/onoff-application.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/onoff/onoff-application.cc Tue Jan 15 12:44:09 2008 +0100
@@ -53,20 +53,20 @@
OnOffApplication::OnOffApplication(Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& ontime,
const RandomVariable& offtime)
: Application(n),
m_cbrRate (g_defaultRate.GetValue ())
{
- Construct (n, remote, iid,
+ Construct (n, remote, tid,
ontime, offtime,
g_defaultSize.GetValue ());
}
OnOffApplication::OnOffApplication(Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& ontime,
const RandomVariable& offtime,
DataRate rate,
@@ -75,13 +75,13 @@
m_cbrRate (rate)
{
NS_LOG_FUNCTION;
- Construct (n, remote, iid, ontime, offtime, size);
+ Construct (n, remote, tid, ontime, offtime, size);
}
void
OnOffApplication::Construct (Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& onTime,
const RandomVariable& offTime,
uint32_t size)
@@ -98,7 +98,7 @@
m_lastStartTime = Seconds (0);
m_maxBytes = 0;
m_totBytes = 0;
- m_iid = iid;
+ m_tid = tid;
}
OnOffApplication::~OnOffApplication()
@@ -154,8 +154,8 @@
// Create the socket if not already
if (!m_socket)
{
- TypeId iid = TypeId::LookupByName (m_iid);
- Ptr<SocketFactory> socketFactory = GetNode ()->QueryInterface<SocketFactory> (iid);
+ TypeId tid = TypeId::LookupByName (m_tid);
+ Ptr<SocketFactory> socketFactory = GetNode ()->QueryInterface<SocketFactory> (tid);
m_socket = socketFactory->CreateSocket ();
m_socket->Bind ();
m_socket->Connect (m_peer);
--- a/src/applications/onoff/onoff-application.h Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/onoff/onoff-application.h Tue Jan 15 12:44:09 2008 +0100
@@ -54,20 +54,20 @@
/**
* \param n node associated to this application
* \param remote remote ip address
- * \param iid
+ * \param tid
* \param ontime on time random variable
* \param offtime off time random variable
*/
OnOffApplication(Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& ontime,
const RandomVariable& offtime);
/**
* \param n node associated to this application
* \param remote remote ip address
- * \param iid
+ * \param tid
* \param ontime on time random variable
* \param offtime off time random variable
* \param rate data rate when on
@@ -75,7 +75,7 @@
*/
OnOffApplication(Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& ontime,
const RandomVariable& offtime,
DataRate rate,
@@ -110,7 +110,7 @@
void Construct (Ptr<Node> n,
const Address &remote,
- std::string iid,
+ std::string tid,
const RandomVariable& ontime,
const RandomVariable& offtime,
uint32_t size);
@@ -135,7 +135,7 @@
EventId m_startStopEvent; // Event id for next start or stop event
EventId m_sendEvent; // Eventid of pending "send packet" event
bool m_sending; // True if currently in sending state
- std::string m_iid;
+ std::string m_tid;
CallbackTraceSource<Ptr<const Packet> > m_txTrace;
private:
--- a/src/applications/packet-sink/packet-sink.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/packet-sink/packet-sink.cc Tue Jan 15 12:44:09 2008 +0100
@@ -38,20 +38,20 @@
PacketSink::PacketSink (Ptr<Node> n,
const Address &local,
- std::string iid)
+ std::string tid)
: Application(n)
{
- Construct (n, local, iid);
+ Construct (n, local, tid);
}
void
PacketSink::Construct (Ptr<Node> n,
const Address &local,
- std::string iid)
+ std::string tid)
{
m_socket = 0;
m_local = local;
- m_iid = iid;
+ m_tid = tid;
}
PacketSink::~PacketSink()
@@ -73,9 +73,9 @@
// Create the socket if not already
if (!m_socket)
{
- TypeId iid = TypeId::LookupByName (m_iid);
+ TypeId tid = TypeId::LookupByName (m_tid);
Ptr<SocketFactory> socketFactory =
- GetNode ()->QueryInterface<SocketFactory> (iid);
+ GetNode ()->QueryInterface<SocketFactory> (tid);
m_socket = socketFactory->CreateSocket ();
m_socket->Bind (m_local);
}
--- a/src/applications/packet-sink/packet-sink.h Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/packet-sink/packet-sink.h Tue Jan 15 12:44:09 2008 +0100
@@ -56,11 +56,11 @@
/**
* \param n node associated to this application
* \param local local address to bind to
- * \param iid string to identify transport protocol of interest
+ * \param tid string to identify transport protocol of interest
*/
PacketSink (Ptr<Node> n,
const Address &local,
- std::string iid);
+ std::string tid);
virtual ~PacketSink ();
@@ -75,13 +75,13 @@
void Construct (Ptr<Node> n,
const Address &local,
- std::string iid);
+ std::string tid);
virtual void Receive (Ptr<Socket> socket, Ptr<Packet> packet, const Address& from);
Ptr<Socket> m_socket; // Associated socket
Address m_local; // Local address to bind to
- std::string m_iid; // Protocol name (e.g., "Udp")
+ std::string m_tid; // Protocol name (e.g., "Udp")
CallbackTraceSource<Ptr<const Packet>, const Address &> m_rxTrace;
};
--- a/src/applications/udp-echo/udp-echo-client.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/udp-echo/udp-echo-client.cc Tue Jan 15 12:44:09 2008 +0100
@@ -91,9 +91,9 @@
if (!m_socket)
{
- TypeId iid = TypeId::LookupByName ("Udp");
+ TypeId tid = TypeId::LookupByName ("Udp");
Ptr<SocketFactory> socketFactory =
- GetNode ()->QueryInterface<SocketFactory> (iid);
+ GetNode ()->QueryInterface<SocketFactory> (tid);
m_socket = socketFactory->CreateSocket ();
m_socket->Bind ();
m_socket->Connect (m_peer);
--- a/src/applications/udp-echo/udp-echo-server.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/applications/udp-echo/udp-echo-server.cc Tue Jan 15 12:44:09 2008 +0100
@@ -77,9 +77,9 @@
if (!m_socket)
{
- TypeId iid = TypeId::LookupByName ("Udp");
+ TypeId tid = TypeId::LookupByName ("Udp");
Ptr<SocketFactory> socketFactory =
- GetNode ()->QueryInterface<SocketFactory> (iid);
+ GetNode ()->QueryInterface<SocketFactory> (tid);
m_socket = socketFactory->CreateSocket ();
m_socket->Bind (m_local);
}
--- a/src/common/error-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/common/error-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -43,9 +43,9 @@
TypeId ErrorModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("ErrorModel")
+ static TypeId tid = TypeId ("ErrorModel")
.SetParent<Object> ();
- return iid;
+ return tid;
}
ErrorModel::ErrorModel () :
@@ -127,10 +127,10 @@
TypeId RateErrorModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("RateErrorModel")
+ static TypeId tid = TypeId ("RateErrorModel")
.SetParent<ErrorModel> ()
.AddConstructor<RateErrorModel> ();
- return iid;
+ return tid;
}
@@ -248,10 +248,10 @@
TypeId ListErrorModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("ListErrorModel")
+ static TypeId tid = TypeId ("ListErrorModel")
.SetParent<ErrorModel> ()
.AddConstructor<ListErrorModel> ();
- return iid;
+ return tid;
}
ListErrorModel::ListErrorModel ()
--- a/src/core/interface-id-default-value.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/core/interface-id-default-value.cc Tue Jan 15 12:44:09 2008 +0100
@@ -4,12 +4,12 @@
TypeIdDefaultValue::TypeIdDefaultValue (std::string name,
std::string help,
- TypeId iid,
+ TypeId tid,
std::string defaultValue)
: DefaultValueBase (name, help),
m_defaultName (defaultValue),
m_name (defaultValue),
- m_interfaceId (iid)
+ m_interfaceId (tid)
{
DefaultValueList::Add (this);
}
@@ -33,13 +33,13 @@
{
for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
{
- TypeId iid = TypeId::GetRegistered (i);
+ TypeId tid = TypeId::GetRegistered (i);
do {
- if (iid.GetName () == value &&
- iid.HasConstructor ())
+ if (tid.GetName () == value &&
+ tid.HasConstructor ())
{
// check that it really supports the requested interface.
- TypeId tmp = iid;
+ TypeId tmp = tid;
do {
if (tmp == m_interfaceId)
{
@@ -49,8 +49,8 @@
tmp = tmp.GetParent ();
} while (tmp != Object::GetTypeId ());
}
- iid = iid.GetParent ();
- } while (iid != Object::GetTypeId ());
+ tid = tid.GetParent ();
+ } while (tid != Object::GetTypeId ());
}
return false;
}
@@ -63,11 +63,11 @@
bool first = true;
for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++)
{
- TypeId iid = TypeId::GetRegistered (i);
+ TypeId tid = TypeId::GetRegistered (i);
// can this interface id be used to create objects ?
- if (iid.HasConstructor ())
+ if (tid.HasConstructor ())
{
- TypeId tmp = iid;
+ TypeId tmp = tid;
// does this interface id supports the requested interface id ?
do {
if (tmp == m_interfaceId)
@@ -77,7 +77,7 @@
oss << "|";
first = false;
}
- oss << iid.GetName ();
+ oss << tid.GetName ();
}
tmp = tmp.GetParent ();
} while (tmp != Object::GetTypeId ());
--- a/src/core/interface-id-default-value.h Tue Jan 15 12:43:07 2008 +0100
+++ b/src/core/interface-id-default-value.h Tue Jan 15 12:44:09 2008 +0100
@@ -12,14 +12,14 @@
/**
* \param name the name of this default value.
* \param help the help text associated to this default value
- * \param iid the interface id which all objects created
+ * \param tid the interface id which all objects created
* through this "default value" must support.
* \param defaultValue the name of the object to create
* by default.
*/
TypeIdDefaultValue (std::string name,
std::string help,
- TypeId iid,
+ TypeId tid,
std::string defaultValue);
/**
* \returns the TypeId of the object selected by the user.
--- a/src/core/object.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/core/object.cc Tue Jan 15 12:44:09 2008 +0100
@@ -257,12 +257,12 @@
{
uint16_t uid = Singleton<IidManager>::Get ()->AllocateUid (name);
NS_ASSERT (uid != 0);
- m_iid = uid;
+ m_tid = uid;
}
-TypeId::TypeId (uint16_t iid)
- : m_iid (iid)
+TypeId::TypeId (uint16_t tid)
+ : m_tid (tid)
{}
TypeId::~TypeId ()
{}
@@ -285,41 +285,41 @@
}
TypeId
-TypeId::SetParent (TypeId iid)
+TypeId::SetParent (TypeId tid)
{
- Singleton<IidManager>::Get ()->SetParent (m_iid, iid.m_iid);
+ Singleton<IidManager>::Get ()->SetParent (m_tid, tid.m_tid);
return *this;
}
TypeId
TypeId::GetParent (void) const
{
- uint16_t parent = Singleton<IidManager>::Get ()->GetParent (m_iid);
+ uint16_t parent = Singleton<IidManager>::Get ()->GetParent (m_tid);
return TypeId (parent);
}
std::string
TypeId::GetName (void) const
{
- std::string name = Singleton<IidManager>::Get ()->GetName (m_iid);
+ std::string name = Singleton<IidManager>::Get ()->GetName (m_tid);
return name;
}
bool
TypeId::HasConstructor (void) const
{
- bool hasConstructor = Singleton<IidManager>::Get ()->HasConstructor (m_iid);
+ bool hasConstructor = Singleton<IidManager>::Get ()->HasConstructor (m_tid);
return hasConstructor;
}
void
TypeId::DoAddConstructor (CallbackBase cb, uint32_t nArguments)
{
- Singleton<IidManager>::Get ()->AddConstructor (m_iid, cb, nArguments);
+ Singleton<IidManager>::Get ()->AddConstructor (m_tid, cb, nArguments);
}
CallbackBase
TypeId::LookupConstructor (uint32_t nArguments)
{
- CallbackBase constructor = Singleton<IidManager>::Get ()->GetConstructor (m_iid, nArguments);
+ CallbackBase constructor = Singleton<IidManager>::Get ()->GetConstructor (m_tid, nArguments);
return constructor;
}
@@ -335,12 +335,12 @@
bool operator == (TypeId a, TypeId b)
{
- return a.m_iid == b.m_iid;
+ return a.m_tid == b.m_tid;
}
bool operator != (TypeId a, TypeId b)
{
- return a.m_iid != b.m_iid;
+ return a.m_tid != b.m_tid;
}
/*********************************************************************
@@ -352,22 +352,22 @@
static TypeId
GetObjectIid (void)
{
- TypeId iid = TypeId ("Object");
- iid.SetParent (iid);
- return iid;
+ TypeId tid = TypeId ("Object");
+ tid.SetParent (tid);
+ return tid;
}
TypeId
Object::GetTypeId (void)
{
- static TypeId iid = GetObjectIid ();
- return iid;
+ static TypeId tid = GetObjectIid ();
+ return tid;
}
Object::Object ()
: m_count (1),
- m_iid (Object::GetTypeId ()),
+ m_tid (Object::GetTypeId ()),
m_disposed (false),
m_collecting (false),
m_next (this)
@@ -377,18 +377,18 @@
m_next = 0;
}
Ptr<Object>
-Object::DoQueryInterface (TypeId iid) const
+Object::DoQueryInterface (TypeId tid) const
{
NS_ASSERT (CheckLoose ());
const Object *currentObject = this;
do {
NS_ASSERT (currentObject != 0);
- TypeId cur = currentObject->m_iid;
- while (cur != iid && cur != Object::GetTypeId ())
+ TypeId cur = currentObject->m_tid;
+ while (cur != tid && cur != Object::GetTypeId ())
{
cur = cur.GetParent ();
}
- if (cur == iid)
+ if (cur == tid)
{
return const_cast<Object *> (currentObject);
}
@@ -438,10 +438,10 @@
}
void
-Object::SetTypeId (TypeId iid)
+Object::SetTypeId (TypeId tid)
{
NS_ASSERT (Check ());
- m_iid = iid;
+ m_tid = tid;
}
void
@@ -535,7 +535,7 @@
{
NS_ASSERT (current != 0);
NS_LOG_LOGIC ("collect current=" << current);
- TypeId cur = current->m_iid;
+ TypeId cur = current->m_tid;
while (cur != Object::GetTypeId ())
{
std::string name = cur.GetName ();
@@ -592,10 +592,10 @@
{
public:
static ns3::TypeId GetTypeId (void) {
- static ns3::TypeId iid = ns3::TypeId ("BaseA")
+ static ns3::TypeId tid = ns3::TypeId ("BaseA")
.SetParent (Object::GetTypeId ())
.AddConstructor<BaseA> ();
- return iid;
+ return tid;
}
BaseA ()
{}
@@ -617,10 +617,10 @@
{
public:
static ns3::TypeId GetTypeId (void) {
- static ns3::TypeId iid = ns3::TypeId ("DerivedA")
+ static ns3::TypeId tid = ns3::TypeId ("DerivedA")
.SetParent (BaseA::GetTypeId ())
.AddConstructor<DerivedA,int> ();
- return iid;
+ return tid;
}
DerivedA (int v)
{}
@@ -644,10 +644,10 @@
{
public:
static ns3::TypeId GetTypeId (void) {
- static ns3::TypeId iid = ns3::TypeId ("BaseB")
+ static ns3::TypeId tid = ns3::TypeId ("BaseB")
.SetParent (Object::GetTypeId ())
.AddConstructor<BaseB> ();
- return iid;
+ return tid;
}
BaseB ()
{}
@@ -669,11 +669,11 @@
{
public:
static ns3::TypeId GetTypeId (void) {
- static ns3::TypeId iid = ns3::TypeId ("DerivedB")
+ static ns3::TypeId tid = ns3::TypeId ("DerivedB")
.SetParent (BaseB::GetTypeId ())
.AddConstructor<DerivedB,int> ()
.AddConstructor<DerivedB,int,int &> ();
- return iid;
+ return tid;
}
DerivedB (int v)
{}
--- a/src/core/object.h Tue Jan 15 12:43:07 2008 +0100
+++ b/src/core/object.h Tue Jan 15 12:44:09 2008 +0100
@@ -32,8 +32,8 @@
static struct X##type##RegistrationClass \
{ \
X##type##RegistrationClass () { \
- ns3::TypeId iid = type::GetTypeId (); \
- iid.GetParent (); \
+ ns3::TypeId tid = type::GetTypeId (); \
+ tid.GetParent (); \
} \
} x_##type##RegistrationVariable
@@ -63,7 +63,7 @@
static uint32_t GetRegisteredN (void);
static TypeId GetRegistered (uint32_t i);
/**
- * \param iid a unique id
+ * \param tid a unique id
* \returns the parent of the requested id
*
* This method cannot fail: it will crash if the input
@@ -83,7 +83,7 @@
TypeId (std::string);
- TypeId SetParent (TypeId iid);
+ TypeId SetParent (TypeId tid);
template <typename T>
TypeId SetParent (void);
@@ -118,11 +118,11 @@
friend bool operator == (TypeId a, TypeId b);
friend bool operator != (TypeId a, TypeId b);
- explicit TypeId (uint16_t iid);
+ explicit TypeId (uint16_t tid);
void DoAddConstructor (CallbackBase callback, uint32_t nArguments);
CallbackBase LookupConstructor (uint32_t nArguments);
- uint16_t m_iid;
+ uint16_t m_tid;
};
/**
@@ -159,11 +159,11 @@
template <typename T>
Ptr<T> QueryInterface (void) const;
/**
- * \param iid the interface id of the requested interface
+ * \param tid the interface id of the requested interface
* \returns a pointer to the requested interface or zero if it could not be found.
*/
template <typename T>
- Ptr<T> QueryInterface (TypeId iid) const;
+ Ptr<T> QueryInterface (TypeId tid) const;
/**
* Run the DoDispose methods of this object and all the
* objects aggregated to it.
@@ -231,7 +231,7 @@
template <typename T, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
friend Ptr<T> CreateObject (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7);
- Ptr<Object> DoQueryInterface (TypeId iid) const;
+ Ptr<Object> DoQueryInterface (TypeId tid) const;
void DoCollectSources (std::string path, const TraceContext &context,
TraceResolver::SourceCollection *collection) const;
void DoTraceAll (std::ostream &os, const TraceContext &context) const;
@@ -239,16 +239,16 @@
bool CheckLoose (void) const;
void MaybeDelete (void) const;
/**
- * \param iid an TypeId
+ * \param tid an TypeId
*
* Every subclass which defines a new TypeId for itself
* should register this TypeId by calling this method
* from its constructor.
*/
- void SetTypeId (TypeId iid);
+ void SetTypeId (TypeId tid);
mutable uint32_t m_count;
- TypeId m_iid;
+ TypeId m_tid;
bool m_disposed;
mutable bool m_collecting;
Object *m_next;
@@ -451,9 +451,9 @@
template <typename T>
Ptr<T>
-Object::QueryInterface (TypeId iid) const
+Object::QueryInterface (TypeId tid) const
{
- Ptr<Object> found = DoQueryInterface (iid);
+ Ptr<Object> found = DoQueryInterface (tid);
if (found != 0)
{
return Ptr<T> (dynamic_cast<T *> (PeekPointer (found)));
--- a/src/devices/csma/csma-topology.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/devices/csma/csma-topology.cc Tue Jan 15 12:44:09 2008 +0100
@@ -85,12 +85,12 @@
}
Ptr<Socket>
-CsmaTopology::CreatePacketSocket(Ptr<Node> n1, std::string iid_name)
+CsmaTopology::CreatePacketSocket(Ptr<Node> n1, std::string tid_name)
{
- TypeId iid = TypeId::LookupByName (iid_name);
+ TypeId tid = TypeId::LookupByName (tid_name);
Ptr<SocketFactory> socketFactory =
- n1->QueryInterface<SocketFactory> (iid);
+ n1->QueryInterface<SocketFactory> (tid);
Ptr<Socket> socket = socketFactory->CreateSocket ();
--- a/src/devices/csma/csma-topology.h Tue Jan 15 12:43:07 2008 +0100
+++ b/src/devices/csma/csma-topology.h Tue Jan 15 12:44:09 2008 +0100
@@ -106,14 +106,14 @@
/**
* \param n1 Node from which socketfactory should be tested.
- * \param iid_name Interface identifier ("Packet", in this case)
+ * \param tid_name Interface identifier ("Packet", in this case)
*
* This is a test function to make sure that a socket can be created
* by using the socketfactory interface provided in the
* netdevicenode.
*/
static Ptr<Socket> CreatePacketSocket(Ptr<Node> n1,
- std::string iid_name);
+ std::string tid_name);
#endif
};
--- a/src/internet-node/arp-l3-protocol.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/internet-node/arp-l3-protocol.cc Tue Jan 15 12:44:09 2008 +0100
@@ -40,9 +40,9 @@
TypeId
ArpL3Protocol::GetTypeId (void)
{
- static TypeId iid = TypeId ("ArpL3Protocol")
+ static TypeId tid = TypeId ("ArpL3Protocol")
.SetParent<Object> ();
- return iid;
+ return tid;
}
ArpL3Protocol::ArpL3Protocol (Ptr<Node> node)
--- a/src/internet-node/ipv4-l3-protocol.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/internet-node/ipv4-l3-protocol.cc Tue Jan 15 12:44:09 2008 +0100
@@ -47,9 +47,9 @@
TypeId
Ipv4L3Protocol::GetTypeId (void)
{
- static TypeId iid = TypeId ("Ipv4L3Protocol")
+ static TypeId tid = TypeId ("Ipv4L3Protocol")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Ipv4L3ProtocolTraceContextElement::Ipv4L3ProtocolTraceContextElement ()
--- a/src/internet-node/ipv4-l4-demux.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/internet-node/ipv4-l4-demux.cc Tue Jan 15 12:44:09 2008 +0100
@@ -63,9 +63,9 @@
TypeId
Ipv4L4Demux::GetTypeId (void)
{
- static TypeId iid = TypeId ("Ipv4L4Demux")
+ static TypeId tid = TypeId ("Ipv4L4Demux")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Ipv4L4Demux::Ipv4L4Demux (Ptr<Node> node)
--- a/src/mobility/hierarchical-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/hierarchical-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -27,9 +27,9 @@
TypeId
HierarchicalMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("HierarchicalMobilityModel")
+ static TypeId tid = TypeId ("HierarchicalMobilityModel")
.SetParent<MobilityModel> ();
- return iid;
+ return tid;
}
HierarchicalMobilityModel::HierarchicalMobilityModel (Ptr<MobilityModel> child, Ptr<MobilityModel> parent)
--- a/src/mobility/mobility-model-notifier.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/mobility-model-notifier.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,10 +26,10 @@
TypeId
MobilityModelNotifier::GetTypeId (void)
{
- static TypeId iid = TypeId ("MobilityModelNotifier")
+ static TypeId tid = TypeId ("MobilityModelNotifier")
.SetParent<Object> ()
.AddConstructor<MobilityModelNotifier> ();
- return iid;
+ return tid;
}
MobilityModelNotifier::MobilityModelNotifier ()
--- a/src/mobility/mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,9 +26,9 @@
TypeId
MobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("MobilityModel")
+ static TypeId tid = TypeId ("MobilityModel")
.SetParent<Object> ();
- return iid;
+ return tid;
}
MobilityModel::MobilityModel ()
--- a/src/mobility/random-direction-2d-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/random-direction-2d-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -113,11 +113,11 @@
TypeId
RandomDirection2dMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomDirection2dMobilityModel")
+ static TypeId tid = TypeId ("RandomDirection2dMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<RandomDirection2dMobilityModel> ()
.AddConstructor<RandomDirection2dMobilityModel,Ptr<RandomDirection2dMobilityModelParameters> > ();
- return iid;
+ return tid;
}
--- a/src/mobility/random-position.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/random-position.cc Tue Jan 15 12:44:09 2008 +0100
@@ -63,9 +63,9 @@
TypeId
RandomPosition::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomPosition")
+ static TypeId tid = TypeId ("RandomPosition")
.SetParent<Object> ();
- return iid;
+ return tid;
}
RandomPosition::RandomPosition ()
@@ -80,11 +80,11 @@
TypeId
RandomRectanglePosition::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomRectanglePosition")
+ static TypeId tid = TypeId ("RandomRectanglePosition")
.SetParent<RandomPosition> ()
.AddConstructor<RandomRectanglePosition> ()
.AddConstructor<RandomRectanglePosition, const RandomVariable &, const RandomVariable &> ();
- return iid;
+ return tid;
}
RandomRectanglePosition::RandomRectanglePosition ()
@@ -116,11 +116,11 @@
TypeId
RandomDiscPosition::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomDiscPosition")
+ static TypeId tid = TypeId ("RandomDiscPosition")
.SetParent<RandomPosition> ()
.AddConstructor<RandomDiscPosition> ()
.AddConstructor<RandomDiscPosition, const RandomVariable &, const RandomVariable &, double, double> ();
- return iid;
+ return tid;
}
RandomDiscPosition::RandomDiscPosition ()
--- a/src/mobility/random-walk-2d-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/random-walk-2d-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -132,11 +132,11 @@
TypeId
RandomWalk2dMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomWalkMobilityModel")
+ static TypeId tid = TypeId ("RandomWalkMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<RandomWalk2dMobilityModel> ()
.AddConstructor<RandomWalk2dMobilityModel,Ptr<RandomWalk2dMobilityModelParameters> > ();
- return iid;
+ return tid;
}
RandomWalk2dMobilityModel::RandomWalk2dMobilityModel ()
--- a/src/mobility/random-waypoint-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/random-waypoint-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -103,11 +103,11 @@
TypeId
RandomWaypointMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("RandomWaypointMobilityModel")
+ static TypeId tid = TypeId ("RandomWaypointMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<RandomWaypointMobilityModel> ()
.AddConstructor<RandomWaypointMobilityModel,Ptr<RandomWaypointMobilityModelParameters> > ();
- return iid;
+ return tid;
}
RandomWaypointMobilityModel::RandomWaypointMobilityModel ()
--- a/src/mobility/static-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/static-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,11 +26,11 @@
TypeId
StaticMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("StaticMobilityModel")
+ static TypeId tid = TypeId ("StaticMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<StaticMobilityModel> ()
.AddConstructor<StaticMobilityModel,const Vector &> ();
- return iid;
+ return tid;
}
StaticMobilityModel::StaticMobilityModel ()
--- a/src/mobility/static-speed-mobility-model.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/mobility/static-speed-mobility-model.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,12 +26,12 @@
TypeId StaticSpeedMobilityModel::GetTypeId (void)
{
- static TypeId iid = TypeId ("StaticSpeedMobilityModel")
+ static TypeId tid = TypeId ("StaticSpeedMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<StaticSpeedMobilityModel> ()
.AddConstructor<StaticSpeedMobilityModel,const Vector &> ()
.AddConstructor<StaticSpeedMobilityModel,const Vector &,const Vector &> ();
- return iid;
+ return tid;
}
StaticSpeedMobilityModel::StaticSpeedMobilityModel ()
--- a/src/node/channel.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/channel.cc Tue Jan 15 12:44:09 2008 +0100
@@ -29,9 +29,9 @@
TypeId
Channel::GetTypeId (void)
{
- static TypeId iid = TypeId ("Channel")
+ static TypeId tid = TypeId ("Channel")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Channel::Channel ()
--- a/src/node/drop-tail-queue.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/drop-tail-queue.cc Tue Jan 15 12:44:09 2008 +0100
@@ -28,10 +28,10 @@
TypeId DropTailQueue::GetTypeId (void)
{
- static TypeId iid = TypeId ("DropTailQueue")
+ static TypeId tid = TypeId ("DropTailQueue")
.SetParent<Queue> ()
.AddConstructor<DropTailQueue> ();
- return iid;
+ return tid;
}
DropTailQueue::DropTailQueue () :
--- a/src/node/ipv4.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/ipv4.cc Tue Jan 15 12:44:09 2008 +0100
@@ -30,9 +30,9 @@
TypeId
Ipv4::GetTypeId (void)
{
- static TypeId iid = TypeId ("Ipv4")
+ static TypeId tid = TypeId ("Ipv4")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Ipv4::Ipv4 ()
--- a/src/node/net-device.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/net-device.cc Tue Jan 15 12:44:09 2008 +0100
@@ -37,9 +37,9 @@
TypeId NetDevice::GetTypeId (void)
{
- static TypeId iid = TypeId ("NetDevice")
+ static TypeId tid = TypeId ("NetDevice")
.SetParent<Object> ();
- return iid;
+ return tid;
}
NetDevice::NetDevice(Ptr<Node> node, const Address& addr) :
--- a/src/node/node.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/node.cc Tue Jan 15 12:44:09 2008 +0100
@@ -34,9 +34,9 @@
TypeId
Node::GetTypeId (void)
{
- static TypeId iid = TypeId ("Node")
+ static TypeId tid = TypeId ("Node")
.SetParent<Object> ();
- return iid;
+ return tid;
}
NodeNetDeviceIndex::NodeNetDeviceIndex ()
--- a/src/node/packet-socket-factory.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/packet-socket-factory.cc Tue Jan 15 12:44:09 2008 +0100
@@ -29,9 +29,9 @@
TypeId
PacketSocketFactory::GetTypeId (void)
{
- static TypeId iid = TypeId ("Packet")
+ static TypeId tid = TypeId ("Packet")
.SetParent<SocketFactory> ();
- return iid;
+ return tid;
}
PacketSocketFactory::PacketSocketFactory ()
--- a/src/node/queue.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/queue.cc Tue Jan 15 12:44:09 2008 +0100
@@ -101,9 +101,9 @@
TypeId
Queue::GetTypeId (void)
{
- static TypeId iid = TypeId ("Queue")
+ static TypeId tid = TypeId ("Queue")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Queue::Queue() :
--- a/src/node/socket-factory.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/socket-factory.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,9 +26,9 @@
TypeId SocketFactory::GetTypeId (void)
{
- static TypeId iid = TypeId ("SocketFactory")
+ static TypeId tid = TypeId ("SocketFactory")
.SetParent<Object> ();
- return iid;
+ return tid;
}
SocketFactory::SocketFactory ()
--- a/src/node/udp.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/node/udp.cc Tue Jan 15 12:44:09 2008 +0100
@@ -26,9 +26,9 @@
TypeId Udp::GetTypeId (void)
{
- static TypeId iid = TypeId ("Udp")
+ static TypeId tid = TypeId ("Udp")
.SetParent<SocketFactory> ();
- return iid;
+ return tid;
}
Udp::Udp ()
--- a/src/routing/global-routing/global-router-interface.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/routing/global-routing/global-router-interface.cc Tue Jan 15 12:44:09 2008 +0100
@@ -436,9 +436,9 @@
TypeId
GlobalRouter::GetTypeId (void)
{
- static TypeId iid = TypeId ("GlobalRouter")
+ static TypeId tid = TypeId ("GlobalRouter")
.SetParent<Object> ();
- return iid;
+ return tid;
}
GlobalRouter::GlobalRouter ()
--- a/src/routing/olsr/olsr-agent-impl.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/routing/olsr/olsr-agent-impl.cc Tue Jan 15 12:44:09 2008 +0100
@@ -153,10 +153,10 @@
TypeId
AgentImpl::GetTypeId (void)
{
- static TypeId iid = TypeId ("OlsrAgentImpl")
+ static TypeId tid = TypeId ("OlsrAgentImpl")
.SetParent<Agent> ()
.AddConstructor<AgentImpl,Ptr<Node> > ();
- return iid;
+ return tid;
}
--- a/src/routing/olsr/olsr-agent.cc Tue Jan 15 12:43:07 2008 +0100
+++ b/src/routing/olsr/olsr-agent.cc Tue Jan 15 12:44:09 2008 +0100
@@ -35,16 +35,16 @@
TypeId
Agent::GetTypeId (void)
{
- static TypeId iid = TypeId ("OlsrAgent")
+ static TypeId tid = TypeId ("OlsrAgent")
.SetParent<Object> ();
- return iid;
+ return tid;
}
Ptr<Agent>
Agent::CreateDefault (Ptr<Node> node)
{
- TypeId iid = g_defaultImpl.GetValue ();
- Ptr<Agent> agent = iid.CreateObject (node)->QueryInterface<Agent> ();
+ TypeId tid = g_defaultImpl.GetValue ();
+ Ptr<Agent> agent = tid.CreateObject (node)->QueryInterface<Agent> ();
return agent;
}