From a2e63b7f0be1d495163ac39a5204582a362edc19 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 15 Jan 2008 12:43:07 +0100 Subject: [PATCH] iid (void) -> GetTypeId (void) --- samples/main-grid-topology.cc | 2 +- src/common/error-model.cc | 8 ++--- src/common/error-model.h | 6 ++-- src/core/interface-id-default-value.cc | 6 ++-- src/core/object.cc | 36 +++++++++---------- src/core/object.h | 24 ++++++------- src/internet-node/arp-l3-protocol.cc | 2 +- src/internet-node/arp-l3-protocol.h | 2 +- src/internet-node/ipv4-l3-protocol.cc | 2 +- src/internet-node/ipv4-l3-protocol.h | 2 +- src/internet-node/ipv4-l4-demux.cc | 2 +- src/internet-node/ipv4-l4-demux.h | 2 +- src/mobility/grid-topology.cc | 2 +- src/mobility/hierarchical-mobility-model.cc | 2 +- src/mobility/hierarchical-mobility-model.h | 2 +- src/mobility/mobility-model-notifier.cc | 2 +- src/mobility/mobility-model-notifier.h | 2 +- src/mobility/mobility-model.cc | 2 +- src/mobility/mobility-model.h | 2 +- .../random-direction-2d-mobility-model.cc | 2 +- .../random-direction-2d-mobility-model.h | 2 +- src/mobility/random-position.cc | 6 ++-- src/mobility/random-position.h | 6 ++-- src/mobility/random-topology.cc | 4 +-- src/mobility/random-walk-2d-mobility-model.cc | 2 +- src/mobility/random-walk-2d-mobility-model.h | 2 +- .../random-waypoint-mobility-model.cc | 4 +-- src/mobility/random-waypoint-mobility-model.h | 2 +- src/mobility/static-mobility-model.cc | 2 +- src/mobility/static-mobility-model.h | 2 +- src/mobility/static-speed-mobility-model.cc | 2 +- src/mobility/static-speed-mobility-model.h | 2 +- src/node/channel.cc | 2 +- src/node/channel.h | 2 +- src/node/drop-tail-queue.cc | 2 +- src/node/drop-tail-queue.h | 2 +- src/node/ipv4.cc | 2 +- src/node/ipv4.h | 2 +- src/node/net-device.cc | 2 +- src/node/net-device.h | 2 +- src/node/node.cc | 2 +- src/node/node.h | 2 +- src/node/packet-socket-factory.cc | 2 +- src/node/packet-socket-factory.h | 2 +- src/node/queue.cc | 4 +-- src/node/queue.h | 2 +- src/node/socket-factory.cc | 2 +- src/node/socket-factory.h | 2 +- src/node/udp.cc | 2 +- src/node/udp.h | 2 +- .../global-routing/global-router-interface.cc | 2 +- .../global-routing/global-router-interface.h | 2 +- src/routing/olsr/olsr-agent-impl.cc | 4 +-- src/routing/olsr/olsr-agent-impl.h | 2 +- src/routing/olsr/olsr-agent.cc | 4 +-- src/routing/olsr/olsr-agent.h | 2 +- 56 files changed, 100 insertions(+), 100 deletions(-) diff --git a/samples/main-grid-topology.cc b/samples/main-grid-topology.cc index 156d7d627..7dc850e4d 100644 --- a/samples/main-grid-topology.cc +++ b/samples/main-grid-topology.cc @@ -27,7 +27,7 @@ int main (int argc, char *argv[]) GridTopology grid (-100, -100, 20, 5, 20); // each object will be attached a static position. - grid.SetMobilityModel (StaticMobilityModel::iid ()); + grid.SetMobilityModel (StaticMobilityModel::GetTypeId ()); // finalize the setup by attaching to each object // in the input array a position and initializing diff --git a/src/common/error-model.cc b/src/common/error-model.cc index db726d133..8c11d573b 100644 --- a/src/common/error-model.cc +++ b/src/common/error-model.cc @@ -36,12 +36,12 @@ namespace ns3 { static TypeIdDefaultValue g_interfaceIdErrorModelDefaultValue ("ErrorModel", "Error Model", - ErrorModel::iid (), + ErrorModel::GetTypeId (), "RateErrorModel"); NS_OBJECT_ENSURE_REGISTERED (ErrorModel); -TypeId ErrorModel::iid (void) +TypeId ErrorModel::GetTypeId (void) { static TypeId iid = TypeId ("ErrorModel") .SetParent (); @@ -125,7 +125,7 @@ static EnumDefaultValue NS_OBJECT_ENSURE_REGISTERED (RateErrorModel); -TypeId RateErrorModel::iid (void) +TypeId RateErrorModel::GetTypeId (void) { static TypeId iid = TypeId ("RateErrorModel") .SetParent () @@ -246,7 +246,7 @@ RateErrorModel::DoReset (void) NS_OBJECT_ENSURE_REGISTERED (ListErrorModel); -TypeId ListErrorModel::iid (void) +TypeId ListErrorModel::GetTypeId (void) { static TypeId iid = TypeId ("ListErrorModel") .SetParent () diff --git a/src/common/error-model.h b/src/common/error-model.h index 0128da77e..1791e56e5 100644 --- a/src/common/error-model.h +++ b/src/common/error-model.h @@ -66,7 +66,7 @@ class RandomVariable; class ErrorModel : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * A factory method to generate a preconfigured default ErrorModel for use * \return an ErrorModel smart pointer that is the default ErrorModel @@ -136,7 +136,7 @@ enum ErrorUnit class RateErrorModel : public ErrorModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); RateErrorModel (); virtual ~RateErrorModel (); @@ -202,7 +202,7 @@ private: class ListErrorModel : public ErrorModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); ListErrorModel (); virtual ~ListErrorModel (); diff --git a/src/core/interface-id-default-value.cc b/src/core/interface-id-default-value.cc index a74826f7a..87124d3b6 100644 --- a/src/core/interface-id-default-value.cc +++ b/src/core/interface-id-default-value.cc @@ -47,10 +47,10 @@ TypeIdDefaultValue::DoParseValue (const std::string &value) return true; } tmp = tmp.GetParent (); - } while (tmp != Object::iid ()); + } while (tmp != Object::GetTypeId ()); } iid = iid.GetParent (); - } while (iid != Object::iid ()); + } while (iid != Object::GetTypeId ()); } return false; } @@ -80,7 +80,7 @@ TypeIdDefaultValue::DoGetType (void) const oss << iid.GetName (); } tmp = tmp.GetParent (); - } while (tmp != Object::iid ()); + } while (tmp != Object::GetTypeId ()); } } oss << ")"; diff --git a/src/core/object.cc b/src/core/object.cc index 8c06e90b9..91eed49bc 100644 --- a/src/core/object.cc +++ b/src/core/object.cc @@ -358,7 +358,7 @@ GetObjectIid (void) } TypeId -Object::iid (void) +Object::GetTypeId (void) { static TypeId iid = GetObjectIid (); return iid; @@ -367,7 +367,7 @@ Object::iid (void) Object::Object () : m_count (1), - m_iid (Object::iid ()), + m_iid (Object::GetTypeId ()), m_disposed (false), m_collecting (false), m_next (this) @@ -384,7 +384,7 @@ Object::DoQueryInterface (TypeId iid) const do { NS_ASSERT (currentObject != 0); TypeId cur = currentObject->m_iid; - while (cur != iid && cur != Object::iid ()) + while (cur != iid && cur != Object::GetTypeId ()) { cur = cur.GetParent (); } @@ -536,7 +536,7 @@ Object::DoCollectSources (std::string path, const TraceContext &context, NS_ASSERT (current != 0); NS_LOG_LOGIC ("collect current=" << current); TypeId cur = current->m_iid; - while (cur != Object::iid ()) + while (cur != Object::GetTypeId ()) { std::string name = cur.GetName (); std::string fullpath = path; @@ -591,9 +591,9 @@ namespace { class BaseA : public ns3::Object { public: - static ns3::TypeId iid (void) { + static ns3::TypeId GetTypeId (void) { static ns3::TypeId iid = ns3::TypeId ("BaseA") - .SetParent (Object::iid ()) + .SetParent (Object::GetTypeId ()) .AddConstructor (); return iid; } @@ -616,9 +616,9 @@ public: class DerivedA : public BaseA { public: - static ns3::TypeId iid (void) { + static ns3::TypeId GetTypeId (void) { static ns3::TypeId iid = ns3::TypeId ("DerivedA") - .SetParent (BaseA::iid ()) + .SetParent (BaseA::GetTypeId ()) .AddConstructor (); return iid; } @@ -643,9 +643,9 @@ public: class BaseB : public ns3::Object { public: - static ns3::TypeId iid (void) { + static ns3::TypeId GetTypeId (void) { static ns3::TypeId iid = ns3::TypeId ("BaseB") - .SetParent (Object::iid ()) + .SetParent (Object::GetTypeId ()) .AddConstructor (); return iid; } @@ -668,9 +668,9 @@ public: class DerivedB : public BaseB { public: - static ns3::TypeId iid (void) { + static ns3::TypeId GetTypeId (void) { static ns3::TypeId iid = ns3::TypeId ("DerivedB") - .SetParent (BaseB::iid ()) + .SetParent (BaseB::GetTypeId ()) .AddConstructor () .AddConstructor (); return iid; @@ -752,11 +752,11 @@ ObjectTest::RunTests (void) Ptr baseA = CreateObject (); NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (), baseA); - NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (DerivedA::iid ()), 0); + NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (DerivedA::GetTypeId ()), 0); NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (), 0); baseA = CreateObject (10); NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (), baseA); - NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (DerivedA::iid ()), baseA); + NS_TEST_ASSERT_EQUAL (baseA->QueryInterface (DerivedA::GetTypeId ()), baseA); NS_TEST_ASSERT_UNEQUAL (baseA->QueryInterface (), 0); baseA = CreateObject (); @@ -862,13 +862,13 @@ ObjectTest::RunTests (void) baseB->TraceDisconnect ("/$DerivedA/*", MakeCallback (&ObjectTest::BaseATrace, this)); // Test the object creation code of TypeId - Ptr a = BaseA::iid ().CreateObject (); + Ptr a = BaseA::GetTypeId ().CreateObject (); NS_TEST_ASSERT_EQUAL (a->QueryInterface (), a); - NS_TEST_ASSERT_EQUAL (a->QueryInterface (DerivedA::iid ()), 0); + NS_TEST_ASSERT_EQUAL (a->QueryInterface (DerivedA::GetTypeId ()), 0); NS_TEST_ASSERT_EQUAL (a->QueryInterface (), 0); - a = DerivedA::iid ().CreateObject (10); + a = DerivedA::GetTypeId ().CreateObject (10); NS_TEST_ASSERT_EQUAL (a->QueryInterface (), a); - NS_TEST_ASSERT_EQUAL (a->QueryInterface (DerivedA::iid ()), a); + NS_TEST_ASSERT_EQUAL (a->QueryInterface (DerivedA::GetTypeId ()), a); NS_TEST_ASSERT_UNEQUAL (a->QueryInterface (), 0); diff --git a/src/core/object.h b/src/core/object.h index 4c375108c..4de7f6692 100644 --- a/src/core/object.h +++ b/src/core/object.h @@ -32,7 +32,7 @@ static struct X##type##RegistrationClass \ { \ X##type##RegistrationClass () { \ - ns3::TypeId iid = type::iid (); \ + ns3::TypeId iid = type::GetTypeId (); \ iid.GetParent (); \ } \ } x_##type##RegistrationVariable @@ -135,7 +135,7 @@ private: class Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Object (); virtual ~Object (); @@ -286,7 +286,7 @@ template TypeId TypeId::SetParent (void) { - return SetParent (T::iid ()); + return SetParent (T::GetTypeId ()); } template @@ -441,7 +441,7 @@ template Ptr Object::QueryInterface () const { - Ptr found = DoQueryInterface (T::iid ()); + Ptr found = DoQueryInterface (T::GetTypeId ()); if (found != 0) { return Ptr (dynamic_cast (PeekPointer (found))); @@ -465,7 +465,7 @@ template Ptr CreateObject (void) { Ptr p = Ptr (new T (), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -473,7 +473,7 @@ template Ptr CreateObject (T1 a1) { Ptr p = Ptr (new T (a1), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -481,7 +481,7 @@ template Ptr CreateObject (T1 a1, T2 a2) { Ptr p = Ptr (new T (a1, a2), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -489,7 +489,7 @@ template Ptr CreateObject (T1 a1, T2 a2, T3 a3) { Ptr p = Ptr (new T (a1, a2, a3), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -497,7 +497,7 @@ template Ptr CreateObject (T1 a1, T2 a2, T3 a3, T4 a4) { Ptr p = Ptr (new T (a1, a2, a3, a4), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -505,7 +505,7 @@ template CreateObject (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5) { Ptr p = Ptr (new T (a1, a2, a3, a4, a5), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -513,7 +513,7 @@ template CreateObject (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6) { Ptr p = Ptr (new T (a1, a2, a3, a4, a5, a6), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } @@ -521,7 +521,7 @@ template CreateObject (T1 a1, T2 a2, T3 a3, T4 a4, T5 a5, T6 a6, T7 a7) { Ptr p = Ptr (new T (a1, a2, a3, a4, a5, a6, a7), false); - p->SetTypeId (T::iid ()); + p->SetTypeId (T::GetTypeId ()); return p; } diff --git a/src/internet-node/arp-l3-protocol.cc b/src/internet-node/arp-l3-protocol.cc index 7b5369535..cd3ca69b7 100644 --- a/src/internet-node/arp-l3-protocol.cc +++ b/src/internet-node/arp-l3-protocol.cc @@ -38,7 +38,7 @@ const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806; NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol); TypeId -ArpL3Protocol::iid (void) +ArpL3Protocol::GetTypeId (void) { static TypeId iid = TypeId ("ArpL3Protocol") .SetParent (); diff --git a/src/internet-node/arp-l3-protocol.h b/src/internet-node/arp-l3-protocol.h index a31a99ae8..6e035cadd 100644 --- a/src/internet-node/arp-l3-protocol.h +++ b/src/internet-node/arp-l3-protocol.h @@ -40,7 +40,7 @@ class TraceContext; class ArpL3Protocol : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); static const uint16_t PROT_NUMBER; /** * \brief Constructor diff --git a/src/internet-node/ipv4-l3-protocol.cc b/src/internet-node/ipv4-l3-protocol.cc index 041013089..245cbf348 100644 --- a/src/internet-node/ipv4-l3-protocol.cc +++ b/src/internet-node/ipv4-l3-protocol.cc @@ -45,7 +45,7 @@ const uint16_t Ipv4L3Protocol::PROT_NUMBER = 0x0800; NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol); TypeId -Ipv4L3Protocol::iid (void) +Ipv4L3Protocol::GetTypeId (void) { static TypeId iid = TypeId ("Ipv4L3Protocol") .SetParent (); diff --git a/src/internet-node/ipv4-l3-protocol.h b/src/internet-node/ipv4-l3-protocol.h index ad5e2584c..e0cefe1ba 100644 --- a/src/internet-node/ipv4-l3-protocol.h +++ b/src/internet-node/ipv4-l3-protocol.h @@ -99,7 +99,7 @@ private: class Ipv4L3Protocol : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); static const uint16_t PROT_NUMBER; Ipv4L3Protocol(Ptr node); diff --git a/src/internet-node/ipv4-l4-demux.cc b/src/internet-node/ipv4-l4-demux.cc index 59e8a7fee..ab9f994b3 100644 --- a/src/internet-node/ipv4-l4-demux.cc +++ b/src/internet-node/ipv4-l4-demux.cc @@ -61,7 +61,7 @@ Ipv4L4ProtocolTraceContextElement::GetTypeName (void) const } TypeId -Ipv4L4Demux::iid (void) +Ipv4L4Demux::GetTypeId (void) { static TypeId iid = TypeId ("Ipv4L4Demux") .SetParent (); diff --git a/src/internet-node/ipv4-l4-demux.h b/src/internet-node/ipv4-l4-demux.h index 417db350d..28d566362 100644 --- a/src/internet-node/ipv4-l4-demux.h +++ b/src/internet-node/ipv4-l4-demux.h @@ -62,7 +62,7 @@ private: class Ipv4L4Demux : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Ipv4L4Demux (Ptr node); virtual ~Ipv4L4Demux(); diff --git a/src/mobility/grid-topology.cc b/src/mobility/grid-topology.cc index 62891c615..e83946f66 100644 --- a/src/mobility/grid-topology.cc +++ b/src/mobility/grid-topology.cc @@ -28,7 +28,7 @@ GridTopology::GridTopology (double xMin, double yMin, uint32_t n, double deltaX, m_n (n), m_deltaX (deltaX), m_deltaY (deltaY), - m_positionTypeId (StaticMobilityModel::iid ()) + m_positionTypeId (StaticMobilityModel::GetTypeId ()) {} void diff --git a/src/mobility/hierarchical-mobility-model.cc b/src/mobility/hierarchical-mobility-model.cc index b830987fa..c1fd062ba 100644 --- a/src/mobility/hierarchical-mobility-model.cc +++ b/src/mobility/hierarchical-mobility-model.cc @@ -25,7 +25,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel); TypeId -HierarchicalMobilityModel::iid (void) +HierarchicalMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("HierarchicalMobilityModel") .SetParent (); diff --git a/src/mobility/hierarchical-mobility-model.h b/src/mobility/hierarchical-mobility-model.h index 8faf29bb5..e45380bbd 100644 --- a/src/mobility/hierarchical-mobility-model.h +++ b/src/mobility/hierarchical-mobility-model.h @@ -33,7 +33,7 @@ namespace ns3 { class HierarchicalMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * \param child the "relative" mobility model diff --git a/src/mobility/mobility-model-notifier.cc b/src/mobility/mobility-model-notifier.cc index 9a68fda4d..6941b7274 100644 --- a/src/mobility/mobility-model-notifier.cc +++ b/src/mobility/mobility-model-notifier.cc @@ -24,7 +24,7 @@ namespace ns3 { TypeId -MobilityModelNotifier::iid (void) +MobilityModelNotifier::GetTypeId (void) { static TypeId iid = TypeId ("MobilityModelNotifier") .SetParent () diff --git a/src/mobility/mobility-model-notifier.h b/src/mobility/mobility-model-notifier.h index edebcc999..495661cec 100644 --- a/src/mobility/mobility-model-notifier.h +++ b/src/mobility/mobility-model-notifier.h @@ -33,7 +33,7 @@ namespace ns3 { class MobilityModelNotifier : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create a new position notifier diff --git a/src/mobility/mobility-model.cc b/src/mobility/mobility-model.cc index 524d8ba77..7a8d56f48 100644 --- a/src/mobility/mobility-model.cc +++ b/src/mobility/mobility-model.cc @@ -24,7 +24,7 @@ namespace ns3 { TypeId -MobilityModel::iid (void) +MobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("MobilityModel") .SetParent (); diff --git a/src/mobility/mobility-model.h b/src/mobility/mobility-model.h index 1bf51ff0e..28cb67457 100644 --- a/src/mobility/mobility-model.h +++ b/src/mobility/mobility-model.h @@ -35,7 +35,7 @@ namespace ns3 { class MobilityModel : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); MobilityModel (); virtual ~MobilityModel () = 0; diff --git a/src/mobility/random-direction-2d-mobility-model.cc b/src/mobility/random-direction-2d-mobility-model.cc index 321077e26..d519f3d80 100644 --- a/src/mobility/random-direction-2d-mobility-model.cc +++ b/src/mobility/random-direction-2d-mobility-model.cc @@ -111,7 +111,7 @@ RandomDirection2dMobilityModelParameters::GetCurrent (void) } TypeId -RandomDirection2dMobilityModel::iid (void) +RandomDirection2dMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("RandomDirection2dMobilityModel") .SetParent () diff --git a/src/mobility/random-direction-2d-mobility-model.h b/src/mobility/random-direction-2d-mobility-model.h index 676e5faf0..14fd06611 100644 --- a/src/mobility/random-direction-2d-mobility-model.h +++ b/src/mobility/random-direction-2d-mobility-model.h @@ -89,7 +89,7 @@ class RandomDirection2dMobilityModelParameters : public Object class RandomDirection2dMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create from \valueref{RandomDirection2dSpeed}, diff --git a/src/mobility/random-position.cc b/src/mobility/random-position.cc index 85ab94720..234d16d74 100644 --- a/src/mobility/random-position.cc +++ b/src/mobility/random-position.cc @@ -61,7 +61,7 @@ g_discY ("RandomDiscPositionY", NS_OBJECT_ENSURE_REGISTERED (RandomPosition); TypeId -RandomPosition::iid (void) +RandomPosition::GetTypeId (void) { static TypeId iid = TypeId ("RandomPosition") .SetParent (); @@ -78,7 +78,7 @@ RandomPosition::~RandomPosition () NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePosition); TypeId -RandomRectanglePosition::iid (void) +RandomRectanglePosition::GetTypeId (void) { static TypeId iid = TypeId ("RandomRectanglePosition") .SetParent () @@ -114,7 +114,7 @@ RandomRectanglePosition::Get (void) const NS_OBJECT_ENSURE_REGISTERED (RandomDiscPosition); TypeId -RandomDiscPosition::iid (void) +RandomDiscPosition::GetTypeId (void) { static TypeId iid = TypeId ("RandomDiscPosition") .SetParent () diff --git a/src/mobility/random-position.h b/src/mobility/random-position.h index 44b6d3efa..c9f0c65f8 100644 --- a/src/mobility/random-position.h +++ b/src/mobility/random-position.h @@ -35,7 +35,7 @@ class RandomVariable; class RandomPosition : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); RandomPosition (); virtual ~RandomPosition (); /** @@ -51,7 +51,7 @@ public: class RandomRectanglePosition : public RandomPosition { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create a random position model with construction * values from \valueref{RandomRectanglePositionX}, and @@ -80,7 +80,7 @@ private: class RandomDiscPosition : public RandomPosition { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create a random position model with construction * values from \valueref{RandomDiscPositionTheta}, diff --git a/src/mobility/random-topology.cc b/src/mobility/random-topology.cc index ebaffaa1d..6808216d4 100644 --- a/src/mobility/random-topology.cc +++ b/src/mobility/random-topology.cc @@ -29,13 +29,13 @@ namespace ns3 { static TypeIdDefaultValue g_position ("RandomTopologyPositionType", "The type of initial random position in a 3d topology.", - RandomPosition::iid (), + RandomPosition::GetTypeId (), "RandomRectanglePosition"); static TypeIdDefaultValue g_mobility ("RandomTopologyMobilityType", "The type of mobility model attached to an object in a 3d topology.", - MobilityModel::iid (), + MobilityModel::GetTypeId (), "StaticMobilityModel"); RandomTopology::RandomTopology () diff --git a/src/mobility/random-walk-2d-mobility-model.cc b/src/mobility/random-walk-2d-mobility-model.cc index 052e150d9..3f32d9762 100644 --- a/src/mobility/random-walk-2d-mobility-model.cc +++ b/src/mobility/random-walk-2d-mobility-model.cc @@ -130,7 +130,7 @@ RandomWalk2dMobilityModelParameters::GetCurrent (void) } TypeId -RandomWalk2dMobilityModel::iid (void) +RandomWalk2dMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("RandomWalkMobilityModel") .SetParent () diff --git a/src/mobility/random-walk-2d-mobility-model.h b/src/mobility/random-walk-2d-mobility-model.h index 2c596a5fe..376152d52 100644 --- a/src/mobility/random-walk-2d-mobility-model.h +++ b/src/mobility/random-walk-2d-mobility-model.h @@ -115,7 +115,7 @@ class RandomWalk2dMobilityModelParameters : public Object class RandomWalk2dMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Instantiate a set of RandomWalk parameters initialized * with construction values from \valueref{RandomWalk2dMode}, diff --git a/src/mobility/random-waypoint-mobility-model.cc b/src/mobility/random-waypoint-mobility-model.cc index a9644f672..01eb71754 100644 --- a/src/mobility/random-waypoint-mobility-model.cc +++ b/src/mobility/random-waypoint-mobility-model.cc @@ -42,7 +42,7 @@ g_pause ("RandomWaypointPause", static TypeIdDefaultValue g_position ("RandomWaypointPosition", "A random position model used to pick the next waypoint position.", - RandomPosition::iid (), + RandomPosition::GetTypeId (), "RandomRectanglePosition"); @@ -101,7 +101,7 @@ RandomWaypointMobilityModelParameters::GetCurrent (void) } TypeId -RandomWaypointMobilityModel::iid (void) +RandomWaypointMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("RandomWaypointMobilityModel") .SetParent () diff --git a/src/mobility/random-waypoint-mobility-model.h b/src/mobility/random-waypoint-mobility-model.h index 0d3530619..d6dd0ac53 100644 --- a/src/mobility/random-waypoint-mobility-model.h +++ b/src/mobility/random-waypoint-mobility-model.h @@ -86,7 +86,7 @@ private: class RandomWaypointMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Default parameters from \valueref{RandomWaypointPause}, * and, \valueref{RandomWaypointPosition}. diff --git a/src/mobility/static-mobility-model.cc b/src/mobility/static-mobility-model.cc index 333d016cc..a12dd63cc 100644 --- a/src/mobility/static-mobility-model.cc +++ b/src/mobility/static-mobility-model.cc @@ -24,7 +24,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (StaticMobilityModel); TypeId -StaticMobilityModel::iid (void) +StaticMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("StaticMobilityModel") .SetParent () diff --git a/src/mobility/static-mobility-model.h b/src/mobility/static-mobility-model.h index ea675b4c3..56358f366 100644 --- a/src/mobility/static-mobility-model.h +++ b/src/mobility/static-mobility-model.h @@ -32,7 +32,7 @@ namespace ns3 { class StaticMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create a position located at coordinates (0,0,0) */ diff --git a/src/mobility/static-speed-mobility-model.cc b/src/mobility/static-speed-mobility-model.cc index 8e7414478..ce8a3f76a 100644 --- a/src/mobility/static-speed-mobility-model.cc +++ b/src/mobility/static-speed-mobility-model.cc @@ -24,7 +24,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (StaticSpeedMobilityModel); -TypeId StaticSpeedMobilityModel::iid (void) +TypeId StaticSpeedMobilityModel::GetTypeId (void) { static TypeId iid = TypeId ("StaticSpeedMobilityModel") .SetParent () diff --git a/src/mobility/static-speed-mobility-model.h b/src/mobility/static-speed-mobility-model.h index be7c11e79..27a0fb4aa 100644 --- a/src/mobility/static-speed-mobility-model.h +++ b/src/mobility/static-speed-mobility-model.h @@ -35,7 +35,7 @@ namespace ns3 { class StaticSpeedMobilityModel : public MobilityModel { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Create position located at coordinates (0,0,0) with * speed (0,0,0). diff --git a/src/node/channel.cc b/src/node/channel.cc index 71cd26e62..d48b00b9d 100644 --- a/src/node/channel.cc +++ b/src/node/channel.cc @@ -27,7 +27,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (Channel); TypeId -Channel::iid (void) +Channel::GetTypeId (void) { static TypeId iid = TypeId ("Channel") .SetParent (); diff --git a/src/node/channel.h b/src/node/channel.h index ec3ccce53..e3e5ca0c0 100644 --- a/src/node/channel.h +++ b/src/node/channel.h @@ -35,7 +35,7 @@ class NetDevice; class Channel : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Channel (); Channel (std::string name); diff --git a/src/node/drop-tail-queue.cc b/src/node/drop-tail-queue.cc index d7a9418ce..b6bf848e3 100644 --- a/src/node/drop-tail-queue.cc +++ b/src/node/drop-tail-queue.cc @@ -26,7 +26,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); -TypeId DropTailQueue::iid (void) +TypeId DropTailQueue::GetTypeId (void) { static TypeId iid = TypeId ("DropTailQueue") .SetParent () diff --git a/src/node/drop-tail-queue.h b/src/node/drop-tail-queue.h index 9d6d0f7ee..b9a1f6570 100644 --- a/src/node/drop-tail-queue.h +++ b/src/node/drop-tail-queue.h @@ -35,7 +35,7 @@ const int DTQ_NPACKETS_MAX_DEFAULT = 100; */ class DropTailQueue : public Queue { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * \brief DropTailQueue Constructor * diff --git a/src/node/ipv4.cc b/src/node/ipv4.cc index 791fd0892..5c4569386 100644 --- a/src/node/ipv4.cc +++ b/src/node/ipv4.cc @@ -28,7 +28,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (Ipv4); TypeId -Ipv4::iid (void) +Ipv4::GetTypeId (void) { static TypeId iid = TypeId ("Ipv4") .SetParent (); diff --git a/src/node/ipv4.h b/src/node/ipv4.h index 83759e6a8..6961ff04c 100644 --- a/src/node/ipv4.h +++ b/src/node/ipv4.h @@ -157,7 +157,7 @@ public: class Ipv4 : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Ipv4 (); virtual ~Ipv4 (); diff --git a/src/node/net-device.cc b/src/node/net-device.cc index 8005d289c..ee9b3dc81 100644 --- a/src/node/net-device.cc +++ b/src/node/net-device.cc @@ -35,7 +35,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (NetDevice); -TypeId NetDevice::iid (void) +TypeId NetDevice::GetTypeId (void) { static TypeId iid = TypeId ("NetDevice") .SetParent (); diff --git a/src/node/net-device.h b/src/node/net-device.h index 89a2dde49..f3da61269 100644 --- a/src/node/net-device.h +++ b/src/node/net-device.h @@ -60,7 +60,7 @@ class Packet; class NetDevice : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); virtual ~NetDevice(); diff --git a/src/node/node.cc b/src/node/node.cc index 2847bb369..29777427e 100644 --- a/src/node/node.cc +++ b/src/node/node.cc @@ -32,7 +32,7 @@ namespace ns3{ NS_OBJECT_ENSURE_REGISTERED (Node); TypeId -Node::iid (void) +Node::GetTypeId (void) { static TypeId iid = TypeId ("Node") .SetParent (); diff --git a/src/node/node.h b/src/node/node.h index fa21d1f5b..60875dc45 100644 --- a/src/node/node.h +++ b/src/node/node.h @@ -96,7 +96,7 @@ private: class Node : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); /** * Must be invoked by subclasses only. diff --git a/src/node/packet-socket-factory.cc b/src/node/packet-socket-factory.cc index 30855eff1..d53c6b7c6 100644 --- a/src/node/packet-socket-factory.cc +++ b/src/node/packet-socket-factory.cc @@ -27,7 +27,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory); TypeId -PacketSocketFactory::iid (void) +PacketSocketFactory::GetTypeId (void) { static TypeId iid = TypeId ("Packet") .SetParent (); diff --git a/src/node/packet-socket-factory.h b/src/node/packet-socket-factory.h index 1f521cfd8..df6ea9fbc 100644 --- a/src/node/packet-socket-factory.h +++ b/src/node/packet-socket-factory.h @@ -34,7 +34,7 @@ class Socket; class PacketSocketFactory : public SocketFactory { public: - static TypeId iid (void); + static TypeId GetTypeId (void); PacketSocketFactory (); diff --git a/src/node/queue.cc b/src/node/queue.cc index f739dd8a3..6044c9695 100644 --- a/src/node/queue.cc +++ b/src/node/queue.cc @@ -28,7 +28,7 @@ NS_LOG_COMPONENT_DEFINE ("Queue"); namespace ns3 { static TypeIdDefaultValue g_interfaceIdDefaultValue ("Queue", "Packet Queue", - Queue::iid (), "DropTailQueue"); + Queue::GetTypeId (), "DropTailQueue"); NS_OBJECT_ENSURE_REGISTERED (Queue); @@ -99,7 +99,7 @@ QueueTraceType::Print (std::ostream &os) const } TypeId -Queue::iid (void) +Queue::GetTypeId (void) { static TypeId iid = TypeId ("Queue") .SetParent (); diff --git a/src/node/queue.h b/src/node/queue.h index e12b9fc09..29df5cd7b 100644 --- a/src/node/queue.h +++ b/src/node/queue.h @@ -78,7 +78,7 @@ private: class Queue : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Queue (); virtual ~Queue (); diff --git a/src/node/socket-factory.cc b/src/node/socket-factory.cc index fa56f89fc..8c53e5bd5 100644 --- a/src/node/socket-factory.cc +++ b/src/node/socket-factory.cc @@ -24,7 +24,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (SocketFactory); -TypeId SocketFactory::iid (void) +TypeId SocketFactory::GetTypeId (void) { static TypeId iid = TypeId ("SocketFactory") .SetParent (); diff --git a/src/node/socket-factory.h b/src/node/socket-factory.h index b17c3c225..106b8b53f 100644 --- a/src/node/socket-factory.h +++ b/src/node/socket-factory.h @@ -47,7 +47,7 @@ class Socket; class SocketFactory : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); SocketFactory (); diff --git a/src/node/udp.cc b/src/node/udp.cc index 50cac9500..77fd75375 100644 --- a/src/node/udp.cc +++ b/src/node/udp.cc @@ -24,7 +24,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (Udp); -TypeId Udp::iid (void) +TypeId Udp::GetTypeId (void) { static TypeId iid = TypeId ("Udp") .SetParent (); diff --git a/src/node/udp.h b/src/node/udp.h index 8b31795fd..630db0f79 100644 --- a/src/node/udp.h +++ b/src/node/udp.h @@ -43,7 +43,7 @@ class Socket; class Udp : public SocketFactory { public: - static TypeId iid (void); + static TypeId GetTypeId (void); Udp (); diff --git a/src/routing/global-routing/global-router-interface.cc b/src/routing/global-routing/global-router-interface.cc index 793f623a6..efdbe557f 100644 --- a/src/routing/global-routing/global-router-interface.cc +++ b/src/routing/global-routing/global-router-interface.cc @@ -434,7 +434,7 @@ std::ostream& operator<< (std::ostream& os, GlobalRoutingLSA& lsa) NS_OBJECT_ENSURE_REGISTERED (GlobalRouter); TypeId -GlobalRouter::iid (void) +GlobalRouter::GetTypeId (void) { static TypeId iid = TypeId ("GlobalRouter") .SetParent (); diff --git a/src/routing/global-routing/global-router-interface.h b/src/routing/global-routing/global-router-interface.h index c1df20ba2..1870370c1 100644 --- a/src/routing/global-routing/global-router-interface.h +++ b/src/routing/global-routing/global-router-interface.h @@ -560,7 +560,7 @@ public: * * @see Object::QueryInterface () */ - static TypeId iid (void); + static TypeId GetTypeId (void); /** * @brief Create a Global Router class diff --git a/src/routing/olsr/olsr-agent-impl.cc b/src/routing/olsr/olsr-agent-impl.cc index 81910b3b9..78c99f8d8 100644 --- a/src/routing/olsr/olsr-agent-impl.cc +++ b/src/routing/olsr/olsr-agent-impl.cc @@ -151,7 +151,7 @@ NS_LOG_COMPONENT_DEFINE ("OlsrAgent"); NS_OBJECT_ENSURE_REGISTERED (AgentImpl); TypeId -AgentImpl::iid (void) +AgentImpl::GetTypeId (void) { static TypeId iid = TypeId ("OlsrAgentImpl") .SetParent () @@ -189,7 +189,7 @@ AgentImpl::AgentImpl (Ptr node) m_ipv4 = node->QueryInterface (); NS_ASSERT (m_ipv4); - Ptr socketFactory = node->QueryInterface (Udp::iid ()); + Ptr socketFactory = node->QueryInterface (Udp::GetTypeId ()); m_receiveSocket = socketFactory->CreateSocket (); if (m_receiveSocket->Bind (InetSocketAddress (OLSR_PORT_NUMBER))) diff --git a/src/routing/olsr/olsr-agent-impl.h b/src/routing/olsr/olsr-agent-impl.h index 750f998c6..08f264e10 100644 --- a/src/routing/olsr/olsr-agent-impl.h +++ b/src/routing/olsr/olsr-agent-impl.h @@ -49,7 +49,7 @@ namespace olsr { class AgentImpl : public Agent { public: - static TypeId iid (void); + static TypeId GetTypeId (void); AgentImpl (Ptr node); diff --git a/src/routing/olsr/olsr-agent.cc b/src/routing/olsr/olsr-agent.cc index df73b7c15..b5fa65de8 100644 --- a/src/routing/olsr/olsr-agent.cc +++ b/src/routing/olsr/olsr-agent.cc @@ -27,13 +27,13 @@ namespace olsr { static TypeIdDefaultValue g_defaultImpl = TypeIdDefaultValue ("OlsrAgentType", "The type of OlsrAgent implementation", - Agent::iid (), + Agent::GetTypeId (), "OlsrAgentImpl"); NS_OBJECT_ENSURE_REGISTERED (Agent); TypeId -Agent::iid (void) +Agent::GetTypeId (void) { static TypeId iid = TypeId ("OlsrAgent") .SetParent (); diff --git a/src/routing/olsr/olsr-agent.h b/src/routing/olsr/olsr-agent.h index 3a8a48c21..2ed2d9c7e 100644 --- a/src/routing/olsr/olsr-agent.h +++ b/src/routing/olsr/olsr-agent.h @@ -45,7 +45,7 @@ namespace olsr { class Agent : public Object { public: - static TypeId iid (void); + static TypeId GetTypeId (void); static Ptr CreateDefault (Ptr node);