From 696859e936d5efdf7d483cfc8b15a878de60897e Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 10 Apr 2008 11:50:08 -0700 Subject: [PATCH] add a few missing ns3:: prefixes in TypeId names. --- src/devices/wifi/propagation-loss-model.cc | 6 +++--- src/node/node-list.cc | 7 ++++--- src/simulator/scheduler.cc | 2 +- src/simulator/simulator.cc | 7 ++++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/devices/wifi/propagation-loss-model.cc b/src/devices/wifi/propagation-loss-model.cc index 038aa1221..0399cddee 100644 --- a/src/devices/wifi/propagation-loss-model.cc +++ b/src/devices/wifi/propagation-loss-model.cc @@ -52,7 +52,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel); TypeId RandomPropagationLossModel::GetTypeId (void) { - static TypeId tid = TypeId ("RandomPropagationLossModel") + static TypeId tid = TypeId ("ns3::RandomPropagationLossModel") .SetParent () .AddConstructor () .AddAttribute ("Variable", "XXX", @@ -82,7 +82,7 @@ NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel); TypeId FriisPropagationLossModel::GetTypeId (void) { - static TypeId tid = TypeId ("FriisPropagationLossModel") + static TypeId tid = TypeId ("ns3::FriisPropagationLossModel") .SetParent () .AddConstructor () .AddAttribute ("Lambda", @@ -196,7 +196,7 @@ NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel); TypeId LogDistancePropagationLossModel::GetTypeId (void) { - static TypeId tid = TypeId ("LogDistancePropagationLossModel") + static TypeId tid = TypeId ("ns3::LogDistancePropagationLossModel") .SetParent () .AddConstructor () .AddAttribute ("Exponent", diff --git a/src/node/node-list.cc b/src/node/node-list.cc index 6de1691d4..407127f06 100644 --- a/src/node/node-list.cc +++ b/src/node/node-list.cc @@ -30,9 +30,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("NodeList"); - /** - * The private node list used by the static-based API + * \brief private implementation detail of the NodeList API. */ class NodeListPriv : public Object { @@ -55,10 +54,12 @@ private: std::vector > m_nodes; }; +NS_OBJECT_ENSURE_REGISTERED (NodeListPriv); + TypeId NodeListPriv::GetTypeId (void) { - static TypeId tid = TypeId ("NodeListPriv") + static TypeId tid = TypeId ("ns3::NodeListPriv") .SetParent () .AddAttribute ("NodeList", "The list of all nodes created during the simulation.", ObjectVector (), diff --git a/src/simulator/scheduler.cc b/src/simulator/scheduler.cc index 8008772cd..0f4953836 100644 --- a/src/simulator/scheduler.cc +++ b/src/simulator/scheduler.cc @@ -29,7 +29,7 @@ Scheduler::~Scheduler () TypeId Scheduler::GetTypeId (void) { - static TypeId tid = TypeId ("Scheduler") + static TypeId tid = TypeId ("ns3::Scheduler") .SetParent () ; return tid; diff --git a/src/simulator/simulator.cc b/src/simulator/simulator.cc index 0d7a12f8c..55c8f4e19 100644 --- a/src/simulator/simulator.cc +++ b/src/simulator/simulator.cc @@ -50,6 +50,9 @@ std::cout << "SIMU TRACE " << x << std::endl; namespace ns3 { +/** + * \brief private implementation detail of the Simulator API. + */ class SimulatorPrivate : public Object { public: @@ -100,11 +103,13 @@ private: int m_unscheduledEvents; }; +NS_OBJECT_ENSURE_REGISTERED (SimulatorPrivate); + TypeId SimulatorPrivate::GetTypeId (void) { - static TypeId tid = TypeId ("SimulatorPrivate") + static TypeId tid = TypeId ("ns3::SimulatorPrivate") .SetParent () .AddConstructor () .AddAttribute ("Scheduler",