diff --git a/src/antenna/model/antenna-model.cc b/src/antenna/model/antenna-model.cc index 5edfb81ca..491ea00f6 100644 --- a/src/antenna/model/antenna-model.cc +++ b/src/antenna/model/antenna-model.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("AntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AntennaModel); +NS_OBJECT_ENSURE_REGISTERED (AntennaModel) + ; AntennaModel::AntennaModel () @@ -39,7 +40,7 @@ AntennaModel::~AntennaModel () { } -TypeId +TypeId AntennaModel::GetTypeId () { static TypeId tid = TypeId ("ns3::AntennaModel") diff --git a/src/antenna/model/cosine-antenna-model.cc b/src/antenna/model/cosine-antenna-model.cc index a283091c0..e7c8959ad 100644 --- a/src/antenna/model/cosine-antenna-model.cc +++ b/src/antenna/model/cosine-antenna-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel); +NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel) + ; TypeId diff --git a/src/antenna/model/isotropic-antenna-model.cc b/src/antenna/model/isotropic-antenna-model.cc index e06ab3dd9..129af8030 100644 --- a/src/antenna/model/isotropic-antenna-model.cc +++ b/src/antenna/model/isotropic-antenna-model.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel); +NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel) + ; TypeId diff --git a/src/antenna/model/parabolic-antenna-model.cc b/src/antenna/model/parabolic-antenna-model.cc index 92c3af275..79c8bde20 100644 --- a/src/antenna/model/parabolic-antenna-model.cc +++ b/src/antenna/model/parabolic-antenna-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel); +NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel) + ; TypeId diff --git a/src/aodv/model/aodv-packet.cc b/src/aodv/model/aodv-packet.cc index 885976c70..9f4b5e16d 100644 --- a/src/aodv/model/aodv-packet.cc +++ b/src/aodv/model/aodv-packet.cc @@ -34,7 +34,8 @@ namespace ns3 namespace aodv { -NS_OBJECT_ENSURE_REGISTERED (TypeHeader); +NS_OBJECT_ENSURE_REGISTERED (TypeHeader) + ; TypeHeader::TypeHeader (MessageType t) : m_type (t), m_valid (true) @@ -146,7 +147,8 @@ RreqHeader::RreqHeader (uint8_t flags, uint8_t reserved, uint8_t hopCount, uint3 { } -NS_OBJECT_ENSURE_REGISTERED (RreqHeader); +NS_OBJECT_ENSURE_REGISTERED (RreqHeader) + ; TypeId RreqHeader::GetTypeId () @@ -285,7 +287,8 @@ RrepHeader::RrepHeader (uint8_t prefixSize, uint8_t hopCount, Ipv4Address dst, m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ()); } -NS_OBJECT_ENSURE_REGISTERED (RrepHeader); +NS_OBJECT_ENSURE_REGISTERED (RrepHeader) + ; TypeId RrepHeader::GetTypeId () @@ -427,7 +430,9 @@ RrepAckHeader::RrepAckHeader () : { } -NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader); +NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader) + ; + TypeId RrepAckHeader::GetTypeId () { @@ -492,7 +497,8 @@ RerrHeader::RerrHeader () : { } -NS_OBJECT_ENSURE_REGISTERED (RerrHeader); +NS_OBJECT_ENSURE_REGISTERED (RerrHeader) + ; TypeId RerrHeader::GetTypeId () diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc index 8e9b8780f..d8ed93a8a 100644 --- a/src/aodv/model/aodv-routing-protocol.cc +++ b/src/aodv/model/aodv-routing-protocol.cc @@ -48,7 +48,8 @@ namespace ns3 { namespace aodv { -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) + ; /// UDP Port for AODV control traffic const uint32_t RoutingProtocol::AODV_PORT = 654; @@ -111,7 +112,8 @@ private: int32_t m_oif; }; -NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag); +NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag) + ; //----------------------------------------------------------------------------- diff --git a/src/applications/model/application-packet-probe.cc b/src/applications/model/application-packet-probe.cc index 6e1613799..8f6a5ea6b 100644 --- a/src/applications/model/application-packet-probe.cc +++ b/src/applications/model/application-packet-probe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe); +NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe) + ; TypeId ApplicationPacketProbe::GetTypeId () diff --git a/src/applications/model/bulk-send-application.cc b/src/applications/model/bulk-send-application.cc index 03637c531..ac92ca2a0 100644 --- a/src/applications/model/bulk-send-application.cc +++ b/src/applications/model/bulk-send-application.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("BulkSendApplication"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication); +NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication) + ; TypeId BulkSendApplication::GetTypeId (void) diff --git a/src/applications/model/onoff-application.cc b/src/applications/model/onoff-application.cc index 158c4dcb6..c6414d702 100644 --- a/src/applications/model/onoff-application.cc +++ b/src/applications/model/onoff-application.cc @@ -46,7 +46,8 @@ NS_LOG_COMPONENT_DEFINE ("OnOffApplication"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OnOffApplication); +NS_OBJECT_ENSURE_REGISTERED (OnOffApplication) + ; TypeId OnOffApplication::GetTypeId (void) diff --git a/src/applications/model/packet-sink.cc b/src/applications/model/packet-sink.cc index 168a684be..68215b967 100644 --- a/src/applications/model/packet-sink.cc +++ b/src/applications/model/packet-sink.cc @@ -35,7 +35,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("PacketSink"); -NS_OBJECT_ENSURE_REGISTERED (PacketSink); +NS_OBJECT_ENSURE_REGISTERED (PacketSink) + ; TypeId PacketSink::GetTypeId (void) diff --git a/src/applications/model/ping6.cc b/src/applications/model/ping6.cc index c9a120407..674b87567 100644 --- a/src/applications/model/ping6.cc +++ b/src/applications/model/ping6.cc @@ -40,7 +40,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("Ping6Application"); -NS_OBJECT_ENSURE_REGISTERED (Ping6); +NS_OBJECT_ENSURE_REGISTERED (Ping6) + ; TypeId Ping6::GetTypeId () { diff --git a/src/applications/model/radvd.cc b/src/applications/model/radvd.cc index c7eee39bf..a2a91c7c8 100644 --- a/src/applications/model/radvd.cc +++ b/src/applications/model/radvd.cc @@ -42,7 +42,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("RadvdApplication"); -NS_OBJECT_ENSURE_REGISTERED (Radvd); +NS_OBJECT_ENSURE_REGISTERED (Radvd) + ; TypeId Radvd::GetTypeId () { diff --git a/src/applications/model/seq-ts-header.cc b/src/applications/model/seq-ts-header.cc index 437dfbd7e..45ec8acdf 100644 --- a/src/applications/model/seq-ts-header.cc +++ b/src/applications/model/seq-ts-header.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("SeqTsHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader); +NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader) + ; SeqTsHeader::SeqTsHeader () : m_seq (0), diff --git a/src/applications/model/udp-client.cc b/src/applications/model/udp-client.cc index 06c711cec..8ef1940c9 100644 --- a/src/applications/model/udp-client.cc +++ b/src/applications/model/udp-client.cc @@ -36,7 +36,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpClient"); -NS_OBJECT_ENSURE_REGISTERED (UdpClient); +NS_OBJECT_ENSURE_REGISTERED (UdpClient) + ; TypeId UdpClient::GetTypeId (void) diff --git a/src/applications/model/udp-echo-client.cc b/src/applications/model/udp-echo-client.cc index 29b3f85d5..c276cd776 100644 --- a/src/applications/model/udp-echo-client.cc +++ b/src/applications/model/udp-echo-client.cc @@ -32,7 +32,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication"); -NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient) + ; TypeId UdpEchoClient::GetTypeId (void) diff --git a/src/applications/model/udp-echo-server.cc b/src/applications/model/udp-echo-server.cc index f02d3d1a4..6e37263c4 100644 --- a/src/applications/model/udp-echo-server.cc +++ b/src/applications/model/udp-echo-server.cc @@ -35,7 +35,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication"); -NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer) + ; TypeId UdpEchoServer::GetTypeId (void) diff --git a/src/applications/model/udp-server.cc b/src/applications/model/udp-server.cc index 4655844d6..4afec9a12 100644 --- a/src/applications/model/udp-server.cc +++ b/src/applications/model/udp-server.cc @@ -37,7 +37,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpServer"); -NS_OBJECT_ENSURE_REGISTERED (UdpServer); +NS_OBJECT_ENSURE_REGISTERED (UdpServer) + ; TypeId diff --git a/src/applications/model/udp-trace-client.cc b/src/applications/model/udp-trace-client.cc index fa155ffc9..00bf9f202 100644 --- a/src/applications/model/udp-trace-client.cc +++ b/src/applications/model/udp-trace-client.cc @@ -38,7 +38,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpTraceClient"); -NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient); +NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient) + ; struct UdpTraceClient::TraceEntry UdpTraceClient::g_defaultEntries[] = { { 0, 534, 'I'}, diff --git a/src/applications/model/v4ping.cc b/src/applications/model/v4ping.cc index 35f93aa41..9b3c8c48f 100644 --- a/src/applications/model/v4ping.cc +++ b/src/applications/model/v4ping.cc @@ -28,7 +28,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("V4Ping"); -NS_OBJECT_ENSURE_REGISTERED (V4Ping); +NS_OBJECT_ENSURE_REGISTERED (V4Ping) + ; TypeId V4Ping::GetTypeId (void) diff --git a/src/bridge/model/bridge-channel.cc b/src/bridge/model/bridge-channel.cc index a1a1b97a5..6f8e014f5 100644 --- a/src/bridge/model/bridge-channel.cc +++ b/src/bridge/model/bridge-channel.cc @@ -23,7 +23,8 @@ NS_LOG_COMPONENT_DEFINE ("BridgeChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BridgeChannel); +NS_OBJECT_ENSURE_REGISTERED (BridgeChannel) + ; TypeId BridgeChannel::GetTypeId (void) diff --git a/src/bridge/model/bridge-net-device.cc b/src/bridge/model/bridge-net-device.cc index 47de15667..05f41372d 100644 --- a/src/bridge/model/bridge-net-device.cc +++ b/src/bridge/model/bridge-net-device.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("BridgeNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice); +NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice) + ; TypeId diff --git a/src/buildings/helper/building-allocator.cc b/src/buildings/helper/building-allocator.cc index 8d02c0c78..3a5e711ca 100644 --- a/src/buildings/helper/building-allocator.cc +++ b/src/buildings/helper/building-allocator.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("BuildingAllocator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator); +NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator) + ; GridBuildingAllocator::GridBuildingAllocator () : m_current (0) diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc index c89f89e27..e5e9cbd97 100644 --- a/src/buildings/helper/building-position-allocator.cc +++ b/src/buildings/helper/building-position-allocator.cc @@ -37,7 +37,8 @@ NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator) + ; RandomBuildingPositionAllocator::RandomBuildingPositionAllocator () @@ -104,7 +105,8 @@ RandomBuildingPositionAllocator::AssignStreams (int64_t stream) } -NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator) + ; RandomRoomPositionAllocator::RandomRoomPositionAllocator () @@ -192,7 +194,8 @@ RandomRoomPositionAllocator::AssignStreams (int64_t stream) -NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator) + ; SameRoomPositionAllocator::SameRoomPositionAllocator () { diff --git a/src/buildings/model/building-list.cc b/src/buildings/model/building-list.cc index 063870de3..04ab30ca6 100644 --- a/src/buildings/model/building-list.cc +++ b/src/buildings/model/building-list.cc @@ -57,7 +57,8 @@ private: std::vector > m_buildings; }; -NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv); +NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv) + ; TypeId BuildingListPriv::GetTypeId (void) diff --git a/src/buildings/model/building.cc b/src/buildings/model/building.cc index 3200ccc75..ae00da418 100644 --- a/src/buildings/model/building.cc +++ b/src/buildings/model/building.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("Building"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Building); +NS_OBJECT_ENSURE_REGISTERED (Building) + ; TypeId Building::GetTypeId (void) diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc index b5c78ec05..bc1639fe9 100644 --- a/src/buildings/model/buildings-propagation-loss-model.cc +++ b/src/buildings/model/buildings-propagation-loss-model.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("BuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel) + ; BuildingsPropagationLossModel::ShadowingLoss::ShadowingLoss () { diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc index 0d441c08b..d1ce0fd96 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc +++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc @@ -41,7 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("HybridBuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel) + ; diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.cc b/src/buildings/model/itu-r-1238-propagation-loss-model.cc index fcc739c66..46b4cc51c 100644 --- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc +++ b/src/buildings/model/itu-r-1238-propagation-loss-model.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel) + ; TypeId diff --git a/src/buildings/model/mobility-building-info.cc b/src/buildings/model/mobility-building-info.cc index 001c83c5a..d228c928c 100644 --- a/src/buildings/model/mobility-building-info.cc +++ b/src/buildings/model/mobility-building-info.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo); +NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo) + ; TypeId MobilityBuildingInfo::GetTypeId (void) diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc index 85eb8daf1..3ff096022 100644 --- a/src/buildings/model/oh-buildings-propagation-loss-model.cc +++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("OhBuildingsPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel) + ; diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc index 5608fff81..5f221c087 100644 --- a/src/click/model/ipv4-click-routing.cc +++ b/src/click/model/ipv4-click-routing.cc @@ -45,7 +45,8 @@ namespace ns3 { #define INTERFACE_ID_FIRST 1 #define INTERFACE_ID_FIRST_DROP 33 -NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv4ClickRouting) + ; std::map < simclick_node_t *, Ptr > Ipv4ClickRouting::m_clickInstanceFromSimNode; diff --git a/src/click/model/ipv4-l3-click-protocol.cc b/src/click/model/ipv4-l3-click-protocol.cc index 5c5a7e5de..8dc13a2f6 100644 --- a/src/click/model/ipv4-l3-click-protocol.cc +++ b/src/click/model/ipv4-l3-click-protocol.cc @@ -44,7 +44,8 @@ namespace ns3 { const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800; -NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol); +NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol) + ; TypeId Ipv4L3ClickProtocol::GetTypeId (void) diff --git a/src/config-store/examples/config-store-save.cc b/src/config-store/examples/config-store-save.cc index 33a8a9b6c..c28765e8f 100644 --- a/src/config-store/examples/config-store-save.cc +++ b/src/config-store/examples/config-store-save.cc @@ -22,7 +22,8 @@ public: int16_t m_int16; }; -NS_OBJECT_ENSURE_REGISTERED (A); +NS_OBJECT_ENSURE_REGISTERED (A) + ; // Assign a new default value to A::TestInt16 (-5) // Configure a TestInt16 value for a special instance of A (to -3) diff --git a/src/config-store/model/config-store.cc b/src/config-store/model/config-store.cc index 79821b1d3..7c35093d4 100644 --- a/src/config-store/model/config-store.cc +++ b/src/config-store/model/config-store.cc @@ -23,7 +23,8 @@ NS_LOG_COMPONENT_DEFINE ("ConfigStore"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConfigStore); +NS_OBJECT_ENSURE_REGISTERED (ConfigStore) + ; TypeId ConfigStore::GetTypeId (void) diff --git a/src/core/model/calendar-scheduler.cc b/src/core/model/calendar-scheduler.cc index ccfe59ce8..8bc57b25a 100644 --- a/src/core/model/calendar-scheduler.cc +++ b/src/core/model/calendar-scheduler.cc @@ -30,7 +30,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("CalendarScheduler"); -NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler); +NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler) + ; TypeId CalendarScheduler::GetTypeId (void) diff --git a/src/core/model/default-simulator-impl.cc b/src/core/model/default-simulator-impl.cc index bada92fa2..2cfa22b94 100644 --- a/src/core/model/default-simulator-impl.cc +++ b/src/core/model/default-simulator-impl.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("DefaultSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl); +NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl) + ; TypeId DefaultSimulatorImpl::GetTypeId (void) diff --git a/src/core/model/heap-scheduler.cc b/src/core/model/heap-scheduler.cc index ac946c920..7ca222758 100644 --- a/src/core/model/heap-scheduler.cc +++ b/src/core/model/heap-scheduler.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("HeapScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HeapScheduler); +NS_OBJECT_ENSURE_REGISTERED (HeapScheduler) + ; TypeId HeapScheduler::GetTypeId (void) diff --git a/src/core/model/list-scheduler.cc b/src/core/model/list-scheduler.cc index f4a9d2bf0..4107566b6 100644 --- a/src/core/model/list-scheduler.cc +++ b/src/core/model/list-scheduler.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("ListScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ListScheduler); +NS_OBJECT_ENSURE_REGISTERED (ListScheduler) + ; TypeId ListScheduler::GetTypeId (void) diff --git a/src/core/model/map-scheduler.cc b/src/core/model/map-scheduler.cc index 2df704524..01431adeb 100644 --- a/src/core/model/map-scheduler.cc +++ b/src/core/model/map-scheduler.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("MapScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MapScheduler); +NS_OBJECT_ENSURE_REGISTERED (MapScheduler) + ; TypeId MapScheduler::GetTypeId (void) diff --git a/src/core/model/object-base.cc b/src/core/model/object-base.cc index 470189684..6adbdb3ef 100644 --- a/src/core/model/object-base.cc +++ b/src/core/model/object-base.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("ObjectBase"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ObjectBase); +NS_OBJECT_ENSURE_REGISTERED (ObjectBase) + ; static TypeId GetObjectIid (void) diff --git a/src/core/model/object-base.h b/src/core/model/object-base.h index 02daa9c94..83a00a615 100644 --- a/src/core/model/object-base.h +++ b/src/core/model/object-base.h @@ -30,6 +30,19 @@ * * This macro should be invoked once for every class which * defines a new GetTypeId method. + * + * Given a class Foo, the .cc implementation should begin + * + * \code + * NS_OBJECT_ENSURE_REGISTERED (Foo) + * ; + * \endcode + * + * If the class is in a namespace, then the macro call should also be + * in the namespace. + * + * Note the closing ';' is not on the same line; this prevents + * Doxygen from spuriously warning that the macro invocation is undocumented. */ #define NS_OBJECT_ENSURE_REGISTERED(type) \ static struct X ## type ## RegistrationClass \ diff --git a/src/core/model/object.cc b/src/core/model/object.cc index fcd633242..f159e2311 100644 --- a/src/core/model/object.cc +++ b/src/core/model/object.cc @@ -41,7 +41,8 @@ namespace ns3 { * The Object implementation *********************************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Object); +NS_OBJECT_ENSURE_REGISTERED (Object) + ; Object::AggregateIterator::AggregateIterator () : m_object (0), diff --git a/src/core/model/random-variable-stream.cc b/src/core/model/random-variable-stream.cc index 51ca7f111..730741811 100644 --- a/src/core/model/random-variable-stream.cc +++ b/src/core/model/random-variable-stream.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("RandomVariableStream"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream); +NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream) + ; TypeId RandomVariableStream::GetTypeId (void) @@ -130,7 +131,8 @@ RandomVariableStream::Peek(void) const return m_rng; } -NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable) + ; TypeId UniformRandomVariable::GetTypeId (void) @@ -200,7 +202,8 @@ UniformRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_min, m_max + 1); } -NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable) + ; TypeId ConstantRandomVariable::GetTypeId (void) @@ -254,7 +257,8 @@ ConstantRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_constant); } -NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable) + ; TypeId SequentialRandomVariable::GetTypeId (void) @@ -353,7 +357,8 @@ SequentialRandomVariable::GetInteger (void) return (uint32_t)GetValue (); } -NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable) + ; TypeId ExponentialRandomVariable::GetTypeId (void) @@ -434,7 +439,8 @@ ExponentialRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable) + ; TypeId ParetoRandomVariable::GetTypeId (void) @@ -529,7 +535,8 @@ ParetoRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_shape, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable) + ; TypeId WeibullRandomVariable::GetTypeId (void) @@ -622,7 +629,8 @@ WeibullRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_scale, m_shape, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(NormalRandomVariable) + ; const double NormalRandomVariable::INFINITE_VALUE = 1e307; @@ -741,7 +749,8 @@ NormalRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_variance, m_bound); } -NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable) + ; TypeId LogNormalRandomVariable::GetTypeId (void) @@ -860,7 +869,8 @@ LogNormalRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mu, m_sigma); } -NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable) + ; TypeId GammaRandomVariable::GetTypeId (void) @@ -1035,7 +1045,8 @@ GammaRandomVariable::GetNormalValue (double mean, double variance, double bound) } } -NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable) + ; TypeId ErlangRandomVariable::GetTypeId (void) @@ -1146,7 +1157,8 @@ ErlangRandomVariable::GetExponentialValue (double mean, double bound) } } -NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable) + ; TypeId TriangularRandomVariable::GetTypeId (void) @@ -1240,7 +1252,8 @@ TriangularRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_mean, m_min, m_max); } -NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable) + ; TypeId ZipfRandomVariable::GetTypeId (void) @@ -1330,7 +1343,8 @@ ZipfRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_n, m_alpha); } -NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable) + ; TypeId ZetaRandomVariable::GetTypeId (void) @@ -1413,7 +1427,8 @@ ZetaRandomVariable::GetInteger (void) return (uint32_t)GetValue (m_alpha); } -NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable) + ; TypeId DeterministicRandomVariable::GetTypeId (void) @@ -1485,7 +1500,8 @@ DeterministicRandomVariable::GetInteger (void) return (uint32_t)GetValue (); } -NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable); +NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable) + ; // ValueCDF methods EmpiricalRandomVariable::ValueCDF::ValueCDF () diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index abce3fd0a..f570bfdc5 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl); +NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl) + ; TypeId RealtimeSimulatorImpl::GetTypeId (void) diff --git a/src/core/model/scheduler.cc b/src/core/model/scheduler.cc index ca4f1234c..a69a5fcac 100644 --- a/src/core/model/scheduler.cc +++ b/src/core/model/scheduler.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("Scheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Scheduler); +NS_OBJECT_ENSURE_REGISTERED (Scheduler) + ; Scheduler::~Scheduler () { diff --git a/src/core/model/synchronizer.cc b/src/core/model/synchronizer.cc index 5f808d6d1..d5668e39a 100644 --- a/src/core/model/synchronizer.cc +++ b/src/core/model/synchronizer.cc @@ -23,7 +23,8 @@ NS_LOG_COMPONENT_DEFINE ("Synchronizer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Synchronizer); +NS_OBJECT_ENSURE_REGISTERED (Synchronizer) + ; TypeId Synchronizer::GetTypeId (void) diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index ae985edfe..b38a59efa 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -72,7 +72,8 @@ public: Derived () {} }; -NS_OBJECT_ENSURE_REGISTERED (Derived); +NS_OBJECT_ENSURE_REGISTERED (Derived) + ; class AttributeObjectTest : public Object { @@ -263,7 +264,8 @@ private: Time m_timeWithBounds; }; -NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest); +NS_OBJECT_ENSURE_REGISTERED (AttributeObjectTest) + ; // =========================================================================== // Test case template used for generic Attribute Value types -- used to make diff --git a/src/core/test/object-test-suite.cc b/src/core/test/object-test-suite.cc index 9b1d1446c..a3d798f29 100644 --- a/src/core/test/object-test-suite.cc +++ b/src/core/test/object-test-suite.cc @@ -89,10 +89,14 @@ public: } }; -NS_OBJECT_ENSURE_REGISTERED (BaseA); -NS_OBJECT_ENSURE_REGISTERED (DerivedA); -NS_OBJECT_ENSURE_REGISTERED (BaseB); -NS_OBJECT_ENSURE_REGISTERED (DerivedB); +NS_OBJECT_ENSURE_REGISTERED (BaseA) + ; +NS_OBJECT_ENSURE_REGISTERED (DerivedA) + ; +NS_OBJECT_ENSURE_REGISTERED (BaseB) + ; +NS_OBJECT_ENSURE_REGISTERED (DerivedB) + ; } // namespace anonymous diff --git a/src/csma/model/csma-channel.cc b/src/csma/model/csma-channel.cc index a95fbe436..53bc96c79 100644 --- a/src/csma/model/csma-channel.cc +++ b/src/csma/model/csma-channel.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("CsmaChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CsmaChannel); +NS_OBJECT_ENSURE_REGISTERED (CsmaChannel) + ; TypeId CsmaChannel::GetTypeId (void) diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc index b7119d465..5a4bcc93c 100644 --- a/src/csma/model/csma-net-device.cc +++ b/src/csma/model/csma-net-device.cc @@ -37,7 +37,8 @@ NS_LOG_COMPONENT_DEFINE ("CsmaNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice); +NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice) + ; TypeId CsmaNetDevice::GetTypeId (void) diff --git a/src/dsdv/model/dsdv-packet.cc b/src/dsdv/model/dsdv-packet.cc index dc5569374..6cea8d024 100644 --- a/src/dsdv/model/dsdv-packet.cc +++ b/src/dsdv/model/dsdv-packet.cc @@ -34,7 +34,8 @@ namespace ns3 { namespace dsdv { -NS_OBJECT_ENSURE_REGISTERED (DsdvHeader); +NS_OBJECT_ENSURE_REGISTERED (DsdvHeader) + ; DsdvHeader::DsdvHeader (Ipv4Address dst, uint32_t hopCount, uint32_t dstSeqNo) : m_dst (dst), m_hopCount (hopCount), diff --git a/src/dsdv/model/dsdv-routing-protocol.cc b/src/dsdv/model/dsdv-routing-protocol.cc index bb98f481c..57b6aba76 100644 --- a/src/dsdv/model/dsdv-routing-protocol.cc +++ b/src/dsdv/model/dsdv-routing-protocol.cc @@ -44,7 +44,8 @@ NS_LOG_COMPONENT_DEFINE ("DsdvRoutingProtocol"); namespace ns3 { namespace dsdv { -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) + ; /// UDP Port for DSDV control traffic const uint32_t RoutingProtocol::DSDV_PORT = 269; diff --git a/src/dsr/model/dsr-fs-header.cc b/src/dsr/model/dsr-fs-header.cc index 73de37669..59f481140 100644 --- a/src/dsr/model/dsr-fs-header.cc +++ b/src/dsr/model/dsr-fs-header.cc @@ -39,7 +39,8 @@ namespace dsr { NS_LOG_COMPONENT_DEFINE ("DsrFsHeader"); -NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader) + ; TypeId DsrFsHeader::GetTypeId () { @@ -258,7 +259,8 @@ Buffer DsrOptionField::GetDsrOptionBuffer () return m_optionData; } -NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader) + ; TypeId DsrRoutingHeader::GetTypeId () { diff --git a/src/dsr/model/dsr-gratuitous-reply-table.cc b/src/dsr/model/dsr-gratuitous-reply-table.cc index 572cfbcf5..3b468df6a 100644 --- a/src/dsr/model/dsr-gratuitous-reply-table.cc +++ b/src/dsr/model/dsr-gratuitous-reply-table.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("DsrGraReplyTable"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (GraReply); +NS_OBJECT_ENSURE_REGISTERED (GraReply) + ; TypeId GraReply::GetTypeId () { diff --git a/src/dsr/model/dsr-network-queue.cc b/src/dsr/model/dsr-network-queue.cc index 26274435e..9b2982bca 100644 --- a/src/dsr/model/dsr-network-queue.cc +++ b/src/dsr/model/dsr-network-queue.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("DsrNetworkQueue"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue); +NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue) + ; TypeId DsrNetworkQueue::GetTypeID (void) diff --git a/src/dsr/model/dsr-option-header.cc b/src/dsr/model/dsr-option-header.cc index 9f44e1e5b..97548065a 100644 --- a/src/dsr/model/dsr-option-header.cc +++ b/src/dsr/model/dsr-option-header.cc @@ -42,7 +42,8 @@ namespace ns3 { namespace dsr { NS_LOG_COMPONENT_DEFINE ("DsrOptionHeader"); -NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader) + ; TypeId DsrOptionHeader::GetTypeId () { @@ -130,7 +131,8 @@ DsrOptionHeader::Alignment DsrOptionHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header) + ; TypeId DsrOptionPad1Header::GetTypeId () { @@ -181,7 +183,8 @@ uint32_t DsrOptionPad1Header::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader) + ; TypeId DsrOptionPadnHeader::GetTypeId () { @@ -241,7 +244,8 @@ uint32_t DsrOptionPadnHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader) + ; TypeId DsrOptionRreqHeader::GetTypeId () { @@ -388,7 +392,8 @@ DsrOptionHeader::Alignment DsrOptionRreqHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader) + ; TypeId DsrOptionRrepHeader::GetTypeId () { @@ -509,7 +514,8 @@ DsrOptionHeader::Alignment DsrOptionRrepHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader) + ; TypeId DsrOptionSRHeader::GetTypeId () { @@ -651,7 +657,8 @@ DsrOptionHeader::Alignment DsrOptionSRHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader) + ; TypeId DsrOptionRerrHeader::GetTypeId () { @@ -779,7 +786,8 @@ DsrOptionHeader::Alignment DsrOptionRerrHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader) + ; TypeId DsrOptionRerrUnreachHeader::GetTypeId () { @@ -907,7 +915,8 @@ DsrOptionHeader::Alignment DsrOptionRerrUnreachHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader) + ; TypeId DsrOptionRerrUnsupportHeader::GetTypeId () { @@ -1025,7 +1034,8 @@ DsrOptionHeader::Alignment DsrOptionRerrUnsupportHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader) + ; TypeId DsrOptionAckReqHeader::GetTypeId () { @@ -1100,7 +1110,8 @@ DsrOptionHeader::Alignment DsrOptionAckReqHeader::GetAlignment () const return retVal; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader) + ; TypeId DsrOptionAckHeader::GetTypeId () { diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc index 758a9ebef..d3c4e1a8e 100644 --- a/src/dsr/model/dsr-options.cc +++ b/src/dsr/model/dsr-options.cc @@ -65,7 +65,8 @@ NS_LOG_COMPONENT_DEFINE ("DsrOptions"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrOptions); +NS_OBJECT_ENSURE_REGISTERED (DsrOptions) + ; TypeId DsrOptions::GetTypeId () { @@ -371,7 +372,8 @@ Ptr DsrOptions::GetNodeWithAddress (Ipv4Address ipv4Address) return 0; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1) + ; TypeId DsrOptionPad1::GetTypeId () { @@ -411,7 +413,8 @@ uint8_t DsrOptionPad1::Process (Ptr packet, Ptr dsrP, Ipv4Addres return pad1Header.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn) + ; TypeId DsrOptionPadn::GetTypeId () { @@ -451,7 +454,8 @@ uint8_t DsrOptionPadn::Process (Ptr packet, Ptr dsrP, Ipv4Addres return padnHeader.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq) + ; TypeId DsrOptionRreq::GetTypeId () { @@ -949,7 +953,8 @@ uint8_t DsrOptionRreq::Process (Ptr packet, Ptr dsrP, Ipv4Addres //unreachable: return rreq.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep) + ; TypeId DsrOptionRrep::GetTypeId () { @@ -1149,7 +1154,8 @@ uint8_t DsrOptionRrep::Process (Ptr packet, Ptr dsrP, Ipv4Addres return rrep.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR) + ; TypeId DsrOptionSR::GetTypeId () { @@ -1389,7 +1395,8 @@ uint8_t DsrOptionSR::Process (Ptr packet, Ptr dsrP, Ipv4Address return sourceRoute.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr) + ; TypeId DsrOptionRerr::GetTypeId () { @@ -1568,7 +1575,8 @@ uint8_t DsrOptionRerr::DoSendError (Ptr p, DsrOptionRerrUnreachHeader &r return serializedSize; } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq) + ; TypeId DsrOptionAckReq::GetTypeId () { @@ -1623,7 +1631,8 @@ uint8_t DsrOptionAckReq::Process (Ptr packet, Ptr dsrP, Ipv4Addr return ackReq.GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck); +NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck) + ; TypeId DsrOptionAck::GetTypeId () { diff --git a/src/dsr/model/dsr-passive-buff.cc b/src/dsr/model/dsr-passive-buff.cc index af3b2516f..1b9cd6a59 100644 --- a/src/dsr/model/dsr-passive-buff.cc +++ b/src/dsr/model/dsr-passive-buff.cc @@ -41,7 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("PassiveBuffer"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer); +NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer) + ; TypeId PassiveBuffer::GetTypeId () { diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc index e6c62744b..e9fee481a 100644 --- a/src/dsr/model/dsr-rcache.cc +++ b/src/dsr/model/dsr-rcache.cc @@ -131,7 +131,8 @@ RouteCacheEntry::Print (std::ostream & os) const << "\t"; } -NS_OBJECT_ENSURE_REGISTERED (RouteCache); +NS_OBJECT_ENSURE_REGISTERED (RouteCache) + ; TypeId RouteCache::GetTypeId () { diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index 552f5735c..3bd409eec 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -79,7 +79,8 @@ NS_LOG_COMPONENT_DEFINE ("DsrRouting"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (DsrRouting); +NS_OBJECT_ENSURE_REGISTERED (DsrRouting) + ; /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t DsrRouting::PROT_NUMBER = 48; diff --git a/src/dsr/model/dsr-rreq-table.cc b/src/dsr/model/dsr-rreq-table.cc index 362292639..a8c77922f 100644 --- a/src/dsr/model/dsr-rreq-table.cc +++ b/src/dsr/model/dsr-rreq-table.cc @@ -39,7 +39,8 @@ NS_LOG_COMPONENT_DEFINE ("RreqTable"); namespace ns3 { namespace dsr { -NS_OBJECT_ENSURE_REGISTERED (RreqTable); +NS_OBJECT_ENSURE_REGISTERED (RreqTable) + ; TypeId RreqTable::GetTypeId () { diff --git a/src/emu/model/emu-net-device.cc b/src/emu/model/emu-net-device.cc index b82051f55..f364261e8 100644 --- a/src/emu/model/emu-net-device.cc +++ b/src/emu/model/emu-net-device.cc @@ -55,7 +55,8 @@ NS_LOG_COMPONENT_DEFINE ("EmuNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice); +NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice) + ; #define EMU_MAGIC 65867 diff --git a/src/energy/model/basic-energy-source.cc b/src/energy/model/basic-energy-source.cc index cc3400412..3a6d3e0c9 100644 --- a/src/energy/model/basic-energy-source.cc +++ b/src/energy/model/basic-energy-source.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("BasicEnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource); +NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource) + ; TypeId BasicEnergySource::GetTypeId (void) diff --git a/src/energy/model/device-energy-model.cc b/src/energy/model/device-energy-model.cc index 5b8d4a81e..11662b23a 100644 --- a/src/energy/model/device-energy-model.cc +++ b/src/energy/model/device-energy-model.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("DeviceEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel); +NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel) + ; TypeId DeviceEnergyModel::GetTypeId (void) diff --git a/src/energy/model/energy-source.cc b/src/energy/model/energy-source.cc index 4608b1e94..6210b453d 100644 --- a/src/energy/model/energy-source.cc +++ b/src/energy/model/energy-source.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("EnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EnergySource); +NS_OBJECT_ENSURE_REGISTERED (EnergySource) + ; TypeId EnergySource::GetTypeId (void) diff --git a/src/energy/model/li-ion-energy-source.cc b/src/energy/model/li-ion-energy-source.cc index 3fb9b4ef3..61dd10769 100644 --- a/src/energy/model/li-ion-energy-source.cc +++ b/src/energy/model/li-ion-energy-source.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("LiIonEnergySource"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource); +NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource) + ; TypeId LiIonEnergySource::GetTypeId (void) diff --git a/src/energy/model/rv-battery-model.cc b/src/energy/model/rv-battery-model.cc index a26ec8720..b0ae8d96c 100644 --- a/src/energy/model/rv-battery-model.cc +++ b/src/energy/model/rv-battery-model.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("RvBatteryModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel); +NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel) + ; TypeId RvBatteryModel::GetTypeId (void) diff --git a/src/energy/model/simple-device-energy-model.cc b/src/energy/model/simple-device-energy-model.cc index edefb05ae..e6da60df7 100644 --- a/src/energy/model/simple-device-energy-model.cc +++ b/src/energy/model/simple-device-energy-model.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("SimpleDeviceEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel); +NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel) + ; TypeId SimpleDeviceEnergyModel::GetTypeId (void) diff --git a/src/energy/model/wifi-radio-energy-model.cc b/src/energy/model/wifi-radio-energy-model.cc index fa3479842..71a54168d 100644 --- a/src/energy/model/wifi-radio-energy-model.cc +++ b/src/energy/model/wifi-radio-energy-model.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("WifiRadioEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel); +NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel) + ; TypeId WifiRadioEnergyModel::GetTypeId (void) diff --git a/src/fd-net-device/model/fd-net-device.cc b/src/fd-net-device/model/fd-net-device.cc index acf47ab21..b7551fc31 100644 --- a/src/fd-net-device/model/fd-net-device.cc +++ b/src/fd-net-device/model/fd-net-device.cc @@ -74,7 +74,8 @@ FdReader::Data FdNetDeviceFdReader::DoRead (void) return FdReader::Data (buf, len); } -NS_OBJECT_ENSURE_REGISTERED (FdNetDevice); +NS_OBJECT_ENSURE_REGISTERED (FdNetDevice) + ; TypeId FdNetDevice::GetTypeId (void) diff --git a/src/flow-monitor/model/flow-monitor.cc b/src/flow-monitor/model/flow-monitor.cc index ab8e39625..0590bd1ff 100644 --- a/src/flow-monitor/model/flow-monitor.cc +++ b/src/flow-monitor/model/flow-monitor.cc @@ -33,7 +33,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("FlowMonitor"); -NS_OBJECT_ENSURE_REGISTERED (FlowMonitor); +NS_OBJECT_ENSURE_REGISTERED (FlowMonitor) + ; TypeId diff --git a/src/internet/model/arp-cache.cc b/src/internet/model/arp-cache.cc index 7a9f8ab28..1cf1b92e8 100644 --- a/src/internet/model/arp-cache.cc +++ b/src/internet/model/arp-cache.cc @@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("ArpCache"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ArpCache); +NS_OBJECT_ENSURE_REGISTERED (ArpCache) + ; TypeId ArpCache::GetTypeId (void) diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc index 21ca72f20..e7da992ee 100644 --- a/src/internet/model/arp-header.cc +++ b/src/internet/model/arp-header.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("ArpHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ArpHeader); +NS_OBJECT_ENSURE_REGISTERED (ArpHeader) + ; void ArpHeader::SetRequest (Address sourceHardwareAddress, diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc index 715e6a193..949eaa070 100644 --- a/src/internet/model/arp-l3-protocol.cc +++ b/src/internet/model/arp-l3-protocol.cc @@ -38,7 +38,8 @@ namespace ns3 { const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806; -NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol); +NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol) + ; TypeId ArpL3Protocol::GetTypeId (void) diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index 7fc245016..cdc9d6d35 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -504,7 +504,8 @@ std::ostream& operator<< (std::ostream& os, GlobalRoutingLSA& lsa) // // --------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GlobalRouter); +NS_OBJECT_ENSURE_REGISTERED (GlobalRouter) + ; TypeId GlobalRouter::GetTypeId (void) diff --git a/src/internet/model/icmpv4-l4-protocol.cc b/src/internet/model/icmpv4-l4-protocol.cc index c2989e889..b2032a28d 100644 --- a/src/internet/model/icmpv4-l4-protocol.cc +++ b/src/internet/model/icmpv4-l4-protocol.cc @@ -13,7 +13,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol"); -NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol); +NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol) + ; // see rfc 792 const uint8_t Icmpv4L4Protocol::PROT_NUMBER = 1; diff --git a/src/internet/model/icmpv4.cc b/src/internet/model/icmpv4.cc index c157535a5..a78f7e8ce 100644 --- a/src/internet/model/icmpv4.cc +++ b/src/internet/model/icmpv4.cc @@ -30,7 +30,8 @@ namespace ns3 { * Icmpv4Header ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header); +NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header) + ; TypeId Icmpv4Header::GetTypeId (void) @@ -133,7 +134,8 @@ Icmpv4Header::GetCode (void) const * Icmpv4Echo ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo); +NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo) + ; void Icmpv4Echo::SetIdentifier (uint16_t id) @@ -270,7 +272,8 @@ Icmpv4Echo::Print (std::ostream &os) const * Icmpv4DestinationUnreachable ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable); +NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable) + ; TypeId Icmpv4DestinationUnreachable::GetTypeId (void) @@ -393,7 +396,8 @@ Icmpv4DestinationUnreachable::Print (std::ostream &os) const * Icmpv4TimeExceeded ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded); +NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded) + ; TypeId Icmpv4TimeExceeded::GetTypeId (void) diff --git a/src/internet/model/icmpv6-header.cc b/src/internet/model/icmpv6-header.cc index e5b702cb2..9466a277b 100644 --- a/src/internet/model/icmpv6-header.cc +++ b/src/internet/model/icmpv6-header.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Icmpv6Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header) + ; TypeId Icmpv6Header::GetTypeId () { @@ -172,7 +173,8 @@ void Icmpv6Header::CalculatePseudoHeaderChecksum (Ipv6Address src, Ipv6Address d m_checksum = ~(it.CalculateIpChecksum (40)); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS) + ; Icmpv6NS::Icmpv6NS () { @@ -294,7 +296,8 @@ uint32_t Icmpv6NS::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA) + ; TypeId Icmpv6NA::GetTypeId () { @@ -477,7 +480,8 @@ uint32_t Icmpv6NA::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA) + ; TypeId Icmpv6RA::GetTypeId () { @@ -696,7 +700,8 @@ uint32_t Icmpv6RA::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS) + ; TypeId Icmpv6RS::GetTypeId () { @@ -786,7 +791,8 @@ uint32_t Icmpv6RS::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection) + ; TypeId Icmpv6Redirection::GetTypeId () { @@ -916,7 +922,8 @@ uint32_t Icmpv6Redirection::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo) + ; TypeId Icmpv6Echo::GetTypeId () { @@ -1033,7 +1040,8 @@ uint32_t Icmpv6Echo::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable) + ; TypeId Icmpv6DestinationUnreachable::GetTypeId () { @@ -1130,7 +1138,8 @@ uint32_t Icmpv6DestinationUnreachable::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig) + ; TypeId Icmpv6TooBig::GetTypeId () { @@ -1240,7 +1249,8 @@ uint32_t Icmpv6TooBig::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded) + ; TypeId Icmpv6TimeExceeded::GetTypeId () { @@ -1339,7 +1349,8 @@ uint32_t Icmpv6TimeExceeded::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError) + ; TypeId Icmpv6ParameterError::GetTypeId () { @@ -1449,7 +1460,8 @@ uint32_t Icmpv6ParameterError::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader) + ; TypeId Icmpv6OptionHeader::GetTypeId () { @@ -1527,7 +1539,8 @@ void Icmpv6OptionHeader::Serialize (Buffer::Iterator start) const NS_LOG_FUNCTION (this << &start); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu) + ; TypeId Icmpv6OptionMtu::GetTypeId () { @@ -1623,7 +1636,8 @@ uint32_t Icmpv6OptionMtu::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation) + ; TypeId Icmpv6OptionPrefixInformation::GetTypeId () { @@ -1796,7 +1810,8 @@ uint32_t Icmpv6OptionPrefixInformation::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress) + ; TypeId Icmpv6OptionLinkLayerAddress::GetTypeId () { @@ -1903,7 +1918,8 @@ uint32_t Icmpv6OptionLinkLayerAddress::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected) + ; TypeId Icmpv6OptionRedirected::GetTypeId () { diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index 15ad476a1..a1dbb9fc0 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -39,7 +39,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol); +NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol) + ; NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol"); diff --git a/src/internet/model/ip-l4-protocol.cc b/src/internet/model/ip-l4-protocol.cc index 252406ed8..5af5469ed 100644 --- a/src/internet/model/ip-l4-protocol.cc +++ b/src/internet/model/ip-l4-protocol.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("IpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol); +NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol) + ; TypeId IpL4Protocol::GetTypeId (void) diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc index e7d7b80c7..f87f8b7cf 100644 --- a/src/internet/model/ipv4-global-routing.cc +++ b/src/internet/model/ipv4-global-routing.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4GlobalRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting) + ; TypeId Ipv4GlobalRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc index d033ab058..c131eb86e 100644 --- a/src/internet/model/ipv4-header.cc +++ b/src/internet/model/ipv4-header.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4Header); +NS_OBJECT_ENSURE_REGISTERED (Ipv4Header) + ; Ipv4Header::Ipv4Header () : m_calcChecksum (false), diff --git a/src/internet/model/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc index c924707e7..89da2e6c8 100644 --- a/src/internet/model/ipv4-interface.cc +++ b/src/internet/model/ipv4-interface.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4Interface"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface); +NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface) + ; TypeId Ipv4Interface::GetTypeId (void) diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index 25fadc939..ed2fa26b2 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -46,7 +46,8 @@ namespace ns3 { const uint16_t Ipv4L3Protocol::PROT_NUMBER = 0x0800; -NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol); +NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol) + ; TypeId Ipv4L3Protocol::GetTypeId (void) diff --git a/src/internet/model/ipv4-list-routing.cc b/src/internet/model/ipv4-list-routing.cc index 7ada35f27..113065316 100644 --- a/src/internet/model/ipv4-list-routing.cc +++ b/src/internet/model/ipv4-list-routing.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4ListRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting) + ; TypeId Ipv4ListRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4-packet-probe.cc b/src/internet/model/ipv4-packet-probe.cc index d59f55a47..6b01fa8f3 100644 --- a/src/internet/model/ipv4-packet-probe.cc +++ b/src/internet/model/ipv4-packet-probe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe); +NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe) + ; TypeId Ipv4PacketProbe::GetTypeId () diff --git a/src/internet/model/ipv4-raw-socket-factory.cc b/src/internet/model/ipv4-raw-socket-factory.cc index 02bfc8a5a..036539947 100644 --- a/src/internet/model/ipv4-raw-socket-factory.cc +++ b/src/internet/model/ipv4-raw-socket-factory.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RawSocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory); +NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory) + ; TypeId Ipv4RawSocketFactory::GetTypeId (void) { diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc index 397a1276b..b47dab22c 100644 --- a/src/internet/model/ipv4-raw-socket-impl.cc +++ b/src/internet/model/ipv4-raw-socket-impl.cc @@ -17,7 +17,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RawSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl); +NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl) + ; TypeId Ipv4RawSocketImpl::GetTypeId (void) diff --git a/src/internet/model/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc index 4a9a542f7..423e8778a 100644 --- a/src/internet/model/ipv4-routing-protocol.cc +++ b/src/internet/model/ipv4-routing-protocol.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4RoutingProtocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol) + ; TypeId Ipv4RoutingProtocol::GetTypeId (void) { diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc index 15e648905..7cdaa4b5f 100644 --- a/src/internet/model/ipv4-static-routing.cc +++ b/src/internet/model/ipv4-static-routing.cc @@ -40,7 +40,8 @@ using std::make_pair; namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting) + ; TypeId Ipv4StaticRouting::GetTypeId (void) diff --git a/src/internet/model/ipv4.cc b/src/internet/model/ipv4.cc index f0e03e2fa..aa3cc638a 100644 --- a/src/internet/model/ipv4.cc +++ b/src/internet/model/ipv4.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4); +NS_OBJECT_ENSURE_REGISTERED (Ipv4) + ; TypeId Ipv4::GetTypeId (void) diff --git a/src/internet/model/ipv6-extension-demux.cc b/src/internet/model/ipv6-extension-demux.cc index 04688ae17..ed5c58272 100644 --- a/src/internet/model/ipv6-extension-demux.cc +++ b/src/internet/model/ipv6-extension-demux.cc @@ -28,7 +28,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux) + ; TypeId Ipv6ExtensionDemux::GetTypeId () { diff --git a/src/internet/model/ipv6-extension-header.cc b/src/internet/model/ipv6-extension-header.cc index ac1ac6959..6a28bc57c 100644 --- a/src/internet/model/ipv6-extension-header.cc +++ b/src/internet/model/ipv6-extension-header.cc @@ -28,7 +28,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader) + ; TypeId Ipv6ExtensionHeader::GetTypeId () { @@ -199,7 +200,8 @@ Buffer OptionField::GetOptionBuffer () } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader) + ; TypeId Ipv6ExtensionHopByHopHeader::GetTypeId () { @@ -254,7 +256,8 @@ uint32_t Ipv6ExtensionHopByHopHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader) + ; TypeId Ipv6ExtensionDestinationHeader::GetTypeId () { @@ -309,7 +312,8 @@ uint32_t Ipv6ExtensionDestinationHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader) + ; TypeId Ipv6ExtensionFragmentHeader::GetTypeId () { @@ -400,7 +404,8 @@ uint32_t Ipv6ExtensionFragmentHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader) + ; TypeId Ipv6ExtensionRoutingHeader::GetTypeId () { @@ -479,7 +484,8 @@ uint32_t Ipv6ExtensionRoutingHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader) + ; TypeId Ipv6ExtensionLooseRoutingHeader::GetTypeId () { @@ -586,7 +592,8 @@ uint32_t Ipv6ExtensionLooseRoutingHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader) + ; TypeId Ipv6ExtensionESPHeader::GetTypeId () { @@ -632,7 +639,8 @@ uint32_t Ipv6ExtensionESPHeader::Deserialize (Buffer::Iterator start) return 0; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader) + ; TypeId Ipv6ExtensionAHHeader::GetTypeId () { diff --git a/src/internet/model/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc index b22b720eb..3f592d759 100755 --- a/src/internet/model/ipv6-extension.cc +++ b/src/internet/model/ipv6-extension.cc @@ -44,7 +44,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Extension"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension); +NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension) + ; TypeId Ipv6Extension::GetTypeId () { @@ -182,7 +183,8 @@ Ipv6Extension::AssignStreams (int64_t stream) return 1; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop) + ; TypeId Ipv6ExtensionHopByHop::GetTypeId () { @@ -234,7 +236,8 @@ uint8_t Ipv6ExtensionHopByHop::Process (Ptr& packet, uint8_t offset, Ipv } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination) + ; TypeId Ipv6ExtensionDestination::GetTypeId () { @@ -286,7 +289,8 @@ uint8_t Ipv6ExtensionDestination::Process (Ptr& packet, uint8_t offset, } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment) + ; TypeId Ipv6ExtensionFragment::GetTypeId () { @@ -704,7 +708,8 @@ void Ipv6ExtensionFragment::Fragments::CancelTimeout () } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting) + ; TypeId Ipv6ExtensionRouting::GetTypeId () { @@ -789,7 +794,8 @@ uint8_t Ipv6ExtensionRouting::Process (Ptr& packet, uint8_t offset, Ipv6 } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux) + ; TypeId Ipv6ExtensionRoutingDemux::GetTypeId () { @@ -851,7 +857,8 @@ void Ipv6ExtensionRoutingDemux::Remove (Ptr extensionRouti } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting) + ; TypeId Ipv6ExtensionLooseRouting::GetTypeId () { @@ -1004,7 +1011,8 @@ uint8_t Ipv6ExtensionLooseRouting::Process (Ptr& packet, uint8_t offset, } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP) + ; TypeId Ipv6ExtensionESP::GetTypeId () { @@ -1042,7 +1050,8 @@ uint8_t Ipv6ExtensionESP::Process (Ptr& packet, uint8_t offset, Ipv6Head } -NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH) + ; TypeId Ipv6ExtensionAH::GetTypeId () { diff --git a/src/internet/model/ipv6-header.cc b/src/internet/model/ipv6-header.cc index a7ea7a1a2..58583f350 100644 --- a/src/internet/model/ipv6-header.cc +++ b/src/internet/model/ipv6-header.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Header); +NS_OBJECT_ENSURE_REGISTERED (Ipv6Header) + ; Ipv6Header::Ipv6Header () : m_version (6), diff --git a/src/internet/model/ipv6-interface.cc b/src/internet/model/ipv6-interface.cc index 5469b01a7..bf8f4b7b2 100644 --- a/src/internet/model/ipv6-interface.cc +++ b/src/internet/model/ipv6-interface.cc @@ -36,7 +36,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("Ipv6Interface"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface); +NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface) + ; TypeId Ipv6Interface::GetTypeId () { diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc index 6d073fd1e..c42089c09 100644 --- a/src/internet/model/ipv6-l3-protocol.cc +++ b/src/internet/model/ipv6-l3-protocol.cc @@ -49,7 +49,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol); +NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol) + ; NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol"); diff --git a/src/internet/model/ipv6-list-routing.cc b/src/internet/model/ipv6-list-routing.cc index 89a0e69bb..a3bd421c0 100644 --- a/src/internet/model/ipv6-list-routing.cc +++ b/src/internet/model/ipv6-list-routing.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6ListRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting) + ; TypeId Ipv6ListRouting::GetTypeId (void) diff --git a/src/internet/model/ipv6-option-demux.cc b/src/internet/model/ipv6-option-demux.cc index b23dcffd6..becab0f7e 100644 --- a/src/internet/model/ipv6-option-demux.cc +++ b/src/internet/model/ipv6-option-demux.cc @@ -28,7 +28,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux) + ; TypeId Ipv6OptionDemux::GetTypeId () { diff --git a/src/internet/model/ipv6-option-header.cc b/src/internet/model/ipv6-option-header.cc index d43a4db9b..5404fd75f 100644 --- a/src/internet/model/ipv6-option-header.cc +++ b/src/internet/model/ipv6-option-header.cc @@ -28,7 +28,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader) + ; TypeId Ipv6OptionHeader::GetTypeId () { @@ -116,7 +117,8 @@ Ipv6OptionHeader::Alignment Ipv6OptionHeader::GetAlignment () const return (Alignment){ 1,0}; } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header) + ; TypeId Ipv6OptionPad1Header::GetTypeId () { @@ -167,7 +169,8 @@ uint32_t Ipv6OptionPad1Header::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader) + ; TypeId Ipv6OptionPadnHeader::GetTypeId () { @@ -227,7 +230,8 @@ uint32_t Ipv6OptionPadnHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader) + ; TypeId Ipv6OptionJumbogramHeader::GetTypeId () { @@ -298,7 +302,8 @@ Ipv6OptionHeader::Alignment Ipv6OptionJumbogramHeader::GetAlignment () const return (Alignment){ 4,2}; //4n+2 } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader) + ; TypeId Ipv6OptionRouterAlertHeader::GetTypeId () { diff --git a/src/internet/model/ipv6-option.cc b/src/internet/model/ipv6-option.cc index 9a530d384..521fb229d 100644 --- a/src/internet/model/ipv6-option.cc +++ b/src/internet/model/ipv6-option.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6Option"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6Option); +NS_OBJECT_ENSURE_REGISTERED (Ipv6Option) + ; TypeId Ipv6Option::GetTypeId () { @@ -55,7 +56,8 @@ void Ipv6Option::SetNode (Ptr node) } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1) + ; TypeId Ipv6OptionPad1::GetTypeId () { @@ -99,7 +101,8 @@ uint8_t Ipv6OptionPad1::Process (Ptr packet, uint8_t offset, Ipv6Header } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn) + ; TypeId Ipv6OptionPadn::GetTypeId () { @@ -143,7 +146,8 @@ uint8_t Ipv6OptionPadn::Process (Ptr packet, uint8_t offset, Ipv6Header } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram) + ; TypeId Ipv6OptionJumbogram::GetTypeId () { @@ -187,7 +191,8 @@ uint8_t Ipv6OptionJumbogram::Process (Ptr packet, uint8_t offset, Ipv6He } -NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert); +NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert) + ; TypeId Ipv6OptionRouterAlert::GetTypeId () { diff --git a/src/internet/model/ipv6-packet-probe.cc b/src/internet/model/ipv6-packet-probe.cc index bd301c94a..131e07260 100644 --- a/src/internet/model/ipv6-packet-probe.cc +++ b/src/internet/model/ipv6-packet-probe.cc @@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe); +NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe) + ; TypeId Ipv6PacketProbe::GetTypeId () diff --git a/src/internet/model/ipv6-pmtu-cache.cc b/src/internet/model/ipv6-pmtu-cache.cc index aba06ba9d..788f79aa8 100644 --- a/src/internet/model/ipv6-pmtu-cache.cc +++ b/src/internet/model/ipv6-pmtu-cache.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv6PmtuCache"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache); +NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache) + ; TypeId Ipv6PmtuCache::GetTypeId () { diff --git a/src/internet/model/ipv6-raw-socket-factory.cc b/src/internet/model/ipv6-raw-socket-factory.cc index cc0e9d85c..ee4bfeb9b 100644 --- a/src/internet/model/ipv6-raw-socket-factory.cc +++ b/src/internet/model/ipv6-raw-socket-factory.cc @@ -24,7 +24,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory); +NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory) + ; TypeId Ipv6RawSocketFactory::GetTypeId () { diff --git a/src/internet/model/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc index 482dd7ebc..600911a95 100644 --- a/src/internet/model/ipv6-raw-socket-impl.cc +++ b/src/internet/model/ipv6-raw-socket-impl.cc @@ -41,7 +41,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl); +NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl) + ; TypeId Ipv6RawSocketImpl::GetTypeId () { diff --git a/src/internet/model/ipv6-routing-protocol.cc b/src/internet/model/ipv6-routing-protocol.cc index 88cd22f07..7dd6ff440 100644 --- a/src/internet/model/ipv6-routing-protocol.cc +++ b/src/internet/model/ipv6-routing-protocol.cc @@ -26,7 +26,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol) + ; TypeId Ipv6RoutingProtocol::GetTypeId () { diff --git a/src/internet/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc index 9a6b98576..b8f038dcd 100644 --- a/src/internet/model/ipv6-static-routing.cc +++ b/src/internet/model/ipv6-static-routing.cc @@ -32,7 +32,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting"); -NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting) + ; TypeId Ipv6StaticRouting::GetTypeId () { diff --git a/src/internet/model/ipv6.cc b/src/internet/model/ipv6.cc index 6e3bab17a..dcd0fb669 100644 --- a/src/internet/model/ipv6.cc +++ b/src/internet/model/ipv6.cc @@ -29,7 +29,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv6); +NS_OBJECT_ENSURE_REGISTERED (Ipv6) + ; TypeId Ipv6::GetTypeId (void) { diff --git a/src/internet/model/loopback-net-device.cc b/src/internet/model/loopback-net-device.cc index 69fde8fef..ab8fdb316 100644 --- a/src/internet/model/loopback-net-device.cc +++ b/src/internet/model/loopback-net-device.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("LoopbackNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice); +NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice) + ; TypeId LoopbackNetDevice::GetTypeId (void) diff --git a/src/internet/model/ndisc-cache.cc b/src/internet/model/ndisc-cache.cc index 55cc44272..6cb53fb80 100644 --- a/src/internet/model/ndisc-cache.cc +++ b/src/internet/model/ndisc-cache.cc @@ -32,7 +32,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("NdiscCache"); -NS_OBJECT_ENSURE_REGISTERED (NdiscCache); +NS_OBJECT_ENSURE_REGISTERED (NdiscCache) + ; TypeId NdiscCache::GetTypeId () { diff --git a/src/internet/model/nsc-sysctl.cc b/src/internet/model/nsc-sysctl.cc index fd3b96c75..751429321 100644 --- a/src/internet/model/nsc-sysctl.cc +++ b/src/internet/model/nsc-sysctl.cc @@ -142,7 +142,8 @@ Ns3NscStack::Set (std::string name, std::string value) } } -NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack); +NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack) + ; TypeId Ns3NscStack::Ns3NscStack::GetTypeId (void) diff --git a/src/internet/model/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc index dec8a4e20..9ca490b45 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.cc +++ b/src/internet/model/nsc-tcp-l4-protocol.cc @@ -49,7 +49,8 @@ NS_LOG_COMPONENT_DEFINE ("NscTcpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol); +NS_OBJECT_ENSURE_REGISTERED (NscTcpL4Protocol) + ; /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t NscTcpL4Protocol::PROT_NUMBER = 6; diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc index a4a69ec2d..6e9a34877 100644 --- a/src/internet/model/nsc-tcp-socket-impl.cc +++ b/src/internet/model/nsc-tcp-socket-impl.cc @@ -47,7 +47,8 @@ NS_LOG_COMPONENT_DEFINE ("NscTcpSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl); +NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl) + ; TypeId NscTcpSocketImpl::GetTypeId () diff --git a/src/internet/model/rtt-estimator.cc b/src/internet/model/rtt-estimator.cc index e2fa1dc88..3242e4cff 100644 --- a/src/internet/model/rtt-estimator.cc +++ b/src/internet/model/rtt-estimator.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("RttEstimator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RttEstimator); +NS_OBJECT_ENSURE_REGISTERED (RttEstimator) + ; TypeId RttEstimator::GetTypeId (void) @@ -231,7 +232,8 @@ void RttEstimator::Reset () //----------------------------------------------------------------------------- // Mean-Deviation Estimator -NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation); +NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation) + ; TypeId RttMeanDeviation::GetTypeId (void) diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc index cedc7bc62..19ae994d3 100644 --- a/src/internet/model/tcp-header.cc +++ b/src/internet/model/tcp-header.cc @@ -26,7 +26,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpHeader); +NS_OBJECT_ENSURE_REGISTERED (TcpHeader) + ; TcpHeader::TcpHeader () : m_sourcePort (0), diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc index 6dc45bbf8..a71fb491e 100644 --- a/src/internet/model/tcp-l4-protocol.cc +++ b/src/internet/model/tcp-l4-protocol.cc @@ -51,7 +51,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol); +NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol) + ; //TcpL4Protocol stuff---------------------------------------------------------- diff --git a/src/internet/model/tcp-newreno.cc b/src/internet/model/tcp-newreno.cc index d7eb61e7c..62adcd6e0 100644 --- a/src/internet/model/tcp-newreno.cc +++ b/src/internet/model/tcp-newreno.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpNewReno"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpNewReno); +NS_OBJECT_ENSURE_REGISTERED (TcpNewReno) + ; TypeId TcpNewReno::GetTypeId (void) diff --git a/src/internet/model/tcp-reno.cc b/src/internet/model/tcp-reno.cc index 7fb55f724..ae33b5171 100644 --- a/src/internet/model/tcp-reno.cc +++ b/src/internet/model/tcp-reno.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpReno"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpReno); +NS_OBJECT_ENSURE_REGISTERED (TcpReno) + ; TypeId TcpReno::GetTypeId (void) diff --git a/src/internet/model/tcp-rfc793.cc b/src/internet/model/tcp-rfc793.cc index 0ff780e12..a7125e20e 100644 --- a/src/internet/model/tcp-rfc793.cc +++ b/src/internet/model/tcp-rfc793.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpRfc793"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpRfc793); +NS_OBJECT_ENSURE_REGISTERED (TcpRfc793) + ; TypeId TcpRfc793::GetTypeId (void) diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index 8958a8d42..8588750bc 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -54,7 +54,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpSocketBase"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase); +NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase) + ; TypeId TcpSocketBase::GetTypeId (void) diff --git a/src/internet/model/tcp-socket-factory.cc b/src/internet/model/tcp-socket-factory.cc index ca1ae25b8..db35e8b78 100644 --- a/src/internet/model/tcp-socket-factory.cc +++ b/src/internet/model/tcp-socket-factory.cc @@ -23,7 +23,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory); +NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory) + ; TypeId TcpSocketFactory::GetTypeId (void) diff --git a/src/internet/model/tcp-socket.cc b/src/internet/model/tcp-socket.cc index 2963ffc9b..e230d7ca0 100644 --- a/src/internet/model/tcp-socket.cc +++ b/src/internet/model/tcp-socket.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpSocket); +NS_OBJECT_ENSURE_REGISTERED (TcpSocket) + ; const char* const TcpSocket::TcpStateName[LAST_STATE] = { "CLOSED", "LISTEN", "SYN_SENT", "SYN_RCVD", "ESTABLISHED", "CLOSE_WAIT", "LAST_ACK", "FIN_WAIT_1", "FIN_WAIT_2", "CLOSING", "TIME_WAIT" }; diff --git a/src/internet/model/tcp-tahoe.cc b/src/internet/model/tcp-tahoe.cc index 59d6c282b..be7fce210 100644 --- a/src/internet/model/tcp-tahoe.cc +++ b/src/internet/model/tcp-tahoe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpTahoe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TcpTahoe); +NS_OBJECT_ENSURE_REGISTERED (TcpTahoe) + ; TypeId TcpTahoe::GetTypeId (void) diff --git a/src/internet/model/tcp-westwood.cc b/src/internet/model/tcp-westwood.cc index 7ab31a28d..49eae1d67 100644 --- a/src/internet/model/tcp-westwood.cc +++ b/src/internet/model/tcp-westwood.cc @@ -46,7 +46,8 @@ NS_LOG_COMPONENT_DEFINE("TcpWestwood"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED(TcpWestwood); +NS_OBJECT_ENSURE_REGISTERED(TcpWestwood) + ; TypeId TcpWestwood::GetTypeId (void) diff --git a/src/internet/model/udp-header.cc b/src/internet/model/udp-header.cc index fae039030..01eacc7ca 100644 --- a/src/internet/model/udp-header.cc +++ b/src/internet/model/udp-header.cc @@ -23,7 +23,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpHeader); +NS_OBJECT_ENSURE_REGISTERED (UdpHeader) + ; /* The magic values below are used only for debugging. * They can be used to easily detect memory corruption diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc index 1fef98b70..98b7d9783 100644 --- a/src/internet/model/udp-l4-protocol.cc +++ b/src/internet/model/udp-l4-protocol.cc @@ -44,7 +44,8 @@ NS_LOG_COMPONENT_DEFINE ("UdpL4Protocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol); +NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol) + ; /* see http://www.iana.org/assignments/protocol-numbers */ const uint8_t UdpL4Protocol::PROT_NUMBER = 17; diff --git a/src/internet/model/udp-socket-factory.cc b/src/internet/model/udp-socket-factory.cc index 1d00324d9..59cbe7451 100644 --- a/src/internet/model/udp-socket-factory.cc +++ b/src/internet/model/udp-socket-factory.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory); +NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory) + ; TypeId UdpSocketFactory::GetTypeId (void) { diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index 50e269ab1..c7501880f 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -42,7 +42,8 @@ NS_LOG_COMPONENT_DEFINE ("UdpSocketImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl); +NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl) + ; static const uint32_t MAX_IPV4_UDP_DATAGRAM_SIZE = 65507; diff --git a/src/internet/model/udp-socket.cc b/src/internet/model/udp-socket.cc index a544151b9..e593e1b7b 100644 --- a/src/internet/model/udp-socket.cc +++ b/src/internet/model/udp-socket.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("UdpSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UdpSocket); +NS_OBJECT_ENSURE_REGISTERED (UdpSocket) + ; TypeId UdpSocket::GetTypeId (void) diff --git a/src/internet/test/error-channel.cc b/src/internet/test/error-channel.cc index 9721beac8..69d4107b7 100644 --- a/src/internet/test/error-channel.cc +++ b/src/internet/test/error-channel.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("ErrorChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorChannel); +NS_OBJECT_ENSURE_REGISTERED (ErrorChannel) + ; TypeId ErrorChannel::GetTypeId (void) @@ -104,7 +105,8 @@ ErrorChannel::GetDevice (uint32_t i) const return m_devices[i]; } -NS_OBJECT_ENSURE_REGISTERED (ErrorModel); +NS_OBJECT_ENSURE_REGISTERED (ErrorModel) + ; TypeId BinaryErrorModel::GetTypeId (void) { diff --git a/src/internet/test/error-net-device.cc b/src/internet/test/error-net-device.cc index bf959f36e..649f7aaf6 100644 --- a/src/internet/test/error-net-device.cc +++ b/src/internet/test/error-net-device.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("ErrorNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorNetDevice); +NS_OBJECT_ENSURE_REGISTERED (ErrorNetDevice) + ; TypeId ErrorNetDevice::GetTypeId (void) diff --git a/src/lte/helper/epc-helper.cc b/src/lte/helper/epc-helper.cc index 9793dfb07..9ef251057 100644 --- a/src/lte/helper/epc-helper.cc +++ b/src/lte/helper/epc-helper.cc @@ -44,7 +44,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("EpcHelper"); -NS_OBJECT_ENSURE_REGISTERED (EpcHelper); +NS_OBJECT_ENSURE_REGISTERED (EpcHelper) + ; EpcHelper::EpcHelper () diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index 744f71ca2..f5c1c0de3 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -65,7 +65,8 @@ NS_LOG_COMPONENT_DEFINE ("LteHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteHelper); +NS_OBJECT_ENSURE_REGISTERED (LteHelper) + ; LteHelper::LteHelper (void) : m_fadingStreamsAssigned (false), diff --git a/src/lte/helper/lte-hex-grid-enb-topology-helper.cc b/src/lte/helper/lte-hex-grid-enb-topology-helper.cc index 41788b5ba..785e37698 100644 --- a/src/lte/helper/lte-hex-grid-enb-topology-helper.cc +++ b/src/lte/helper/lte-hex-grid-enb-topology-helper.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("LteHexGridEnbTopologyHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper); +NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper) + ; LteHexGridEnbTopologyHelper::LteHexGridEnbTopologyHelper () { diff --git a/src/lte/helper/mac-stats-calculator.cc b/src/lte/helper/mac-stats-calculator.cc index 8efd5d928..337c4bc40 100644 --- a/src/lte/helper/mac-stats-calculator.cc +++ b/src/lte/helper/mac-stats-calculator.cc @@ -27,7 +27,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator); +NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator) + ; MacStatsCalculator::MacStatsCalculator () : m_dlFirstWrite (true), diff --git a/src/lte/helper/phy-rx-stats-calculator.cc b/src/lte/helper/phy-rx-stats-calculator.cc index 908b7b5ab..3f1f0f389 100644 --- a/src/lte/helper/phy-rx-stats-calculator.cc +++ b/src/lte/helper/phy-rx-stats-calculator.cc @@ -29,7 +29,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator); +NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator) + ; PhyRxStatsCalculator::PhyRxStatsCalculator () : m_dlRxFirstWrite (true), diff --git a/src/lte/helper/phy-stats-calculator.cc b/src/lte/helper/phy-stats-calculator.cc index 15fdf32a6..84a98a92b 100644 --- a/src/lte/helper/phy-stats-calculator.cc +++ b/src/lte/helper/phy-stats-calculator.cc @@ -27,7 +27,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator); +NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator) + ; PhyStatsCalculator::PhyStatsCalculator () : m_RsrpSinrFirstWrite (true), diff --git a/src/lte/helper/phy-tx-stats-calculator.cc b/src/lte/helper/phy-tx-stats-calculator.cc index 4c7c43c8c..f38c73299 100644 --- a/src/lte/helper/phy-tx-stats-calculator.cc +++ b/src/lte/helper/phy-tx-stats-calculator.cc @@ -29,7 +29,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator); +NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator) + ; PhyTxStatsCalculator::PhyTxStatsCalculator () : m_dlTxFirstWrite (true), diff --git a/src/lte/helper/radio-bearer-stats-calculator.cc b/src/lte/helper/radio-bearer-stats-calculator.cc index bb536bd6b..eccffc27e 100644 --- a/src/lte/helper/radio-bearer-stats-calculator.cc +++ b/src/lte/helper/radio-bearer-stats-calculator.cc @@ -31,7 +31,8 @@ namespace ns3 NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator"); -NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator); +NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator) + ; RadioBearerStatsCalculator::RadioBearerStatsCalculator () : m_firstWrite (true), diff --git a/src/lte/helper/radio-environment-map-helper.cc b/src/lte/helper/radio-environment-map-helper.cc index 3a691c9bf..8eb4611c1 100644 --- a/src/lte/helper/radio-environment-map-helper.cc +++ b/src/lte/helper/radio-environment-map-helper.cc @@ -46,7 +46,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper); +NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper) + ; RadioEnvironmentMapHelper::RadioEnvironmentMapHelper () { diff --git a/src/lte/model/epc-gtpu-header.cc b/src/lte/model/epc-gtpu-header.cc index 5f8e496bf..e4cd29f90 100644 --- a/src/lte/model/epc-gtpu-header.cc +++ b/src/lte/model/epc-gtpu-header.cc @@ -30,7 +30,8 @@ namespace ns3 { * GTP-U-v1 Header ********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (GtpuHeader); +NS_OBJECT_ENSURE_REGISTERED (GtpuHeader) + ; TypeId GtpuHeader::GetTypeId (void) diff --git a/src/lte/model/epc-mme.cc b/src/lte/model/epc-mme.cc index e6da9f4b4..223f6904a 100644 --- a/src/lte/model/epc-mme.cc +++ b/src/lte/model/epc-mme.cc @@ -33,7 +33,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpcMme); +NS_OBJECT_ENSURE_REGISTERED (EpcMme) + ; EpcMme::EpcMme () : m_s11SapSgw (0) diff --git a/src/lte/model/epc-ue-nas.cc b/src/lte/model/epc-ue-nas.cc index 1828fd5c8..b832c9906 100644 --- a/src/lte/model/epc-ue-nas.cc +++ b/src/lte/model/epc-ue-nas.cc @@ -52,7 +52,8 @@ std::string ToString (EpcUeNas::State s) -NS_OBJECT_ENSURE_REGISTERED (EpcUeNas); +NS_OBJECT_ENSURE_REGISTERED (EpcUeNas) + ; EpcUeNas::EpcUeNas () : m_state (OFF), diff --git a/src/lte/model/epc-x2-header.cc b/src/lte/model/epc-x2-header.cc index 5a4b60820..ef3861349 100644 --- a/src/lte/model/epc-x2-header.cc +++ b/src/lte/model/epc-x2-header.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("EpcX2Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpcX2Header); +NS_OBJECT_ENSURE_REGISTERED (EpcX2Header) + ; EpcX2Header::EpcX2Header () : m_messageType (0xfa), @@ -145,7 +146,8 @@ EpcX2Header::SetNumberOfIes (uint32_t numberOfIes) ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader) + ; EpcX2HandoverRequestHeader::EpcX2HandoverRequestHeader () : m_numberOfIes (1 + 1 + 1 + 1), @@ -433,7 +435,8 @@ EpcX2HandoverRequestHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader) + ; EpcX2HandoverRequestAckHeader::EpcX2HandoverRequestAckHeader () : m_numberOfIes (1 + 1 + 1 + 1), @@ -658,7 +661,8 @@ EpcX2HandoverRequestAckHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader) + ; EpcX2HandoverPreparationFailureHeader::EpcX2HandoverPreparationFailureHeader () : m_numberOfIes (1 + 1 + 1), @@ -783,7 +787,8 @@ EpcX2HandoverPreparationFailureHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader) + ; EpcX2SnStatusTransferHeader::EpcX2SnStatusTransferHeader () : m_numberOfIes (3), @@ -975,7 +980,8 @@ EpcX2SnStatusTransferHeader::GetNumberOfIes () const ///////////////////////////////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader) + ; EpcX2UeContextReleaseHeader::EpcX2UeContextReleaseHeader () : m_numberOfIes (1 + 1), @@ -1082,7 +1088,8 @@ EpcX2UeContextReleaseHeader::GetNumberOfIes () const ///////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader) + ; EpcX2LoadInformationHeader::EpcX2LoadInformationHeader () : m_numberOfIes (1), @@ -1306,7 +1313,8 @@ EpcX2LoadInformationHeader::GetNumberOfIes () const //////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader); +NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader) + ; EpcX2ResourceStatusUpdateHeader::EpcX2ResourceStatusUpdateHeader () : m_numberOfIes (3), diff --git a/src/lte/model/epc-x2.cc b/src/lte/model/epc-x2.cc index 1790d9de8..3fbb8e959 100644 --- a/src/lte/model/epc-x2.cc +++ b/src/lte/model/epc-x2.cc @@ -80,7 +80,8 @@ X2CellInfo::operator= (const X2CellInfo& value) /////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (EpcX2); +NS_OBJECT_ENSURE_REGISTERED (EpcX2) + ; EpcX2::EpcX2 () : m_x2cUdpPort (4444), diff --git a/src/lte/model/eps-bearer-tag.cc b/src/lte/model/eps-bearer-tag.cc index 84ecd38ce..03f168aab 100644 --- a/src/lte/model/eps-bearer-tag.cc +++ b/src/lte/model/eps-bearer-tag.cc @@ -26,7 +26,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag); +NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag) + ; TypeId EpsBearerTag::GetTypeId (void) diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index 98fd4119c..8c246d4b3 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -43,7 +43,8 @@ int FdBetType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler) + ; diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index ce3c461a5..ab846da1d 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -43,7 +43,8 @@ int FdMtType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler) + ; diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 9bfd95b68..b10bba5cd 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -44,7 +44,8 @@ int FdTbfqType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler) + ; diff --git a/src/lte/model/ff-mac-scheduler.cc b/src/lte/model/ff-mac-scheduler.cc index d03988772..e3f0c6d21 100644 --- a/src/lte/model/ff-mac-scheduler.cc +++ b/src/lte/model/ff-mac-scheduler.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("FfMacScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler) + ; FfMacScheduler::FfMacScheduler () diff --git a/src/lte/model/lte-amc.cc b/src/lte/model/lte-amc.cc index e1ac950b8..21eae6286 100644 --- a/src/lte/model/lte-amc.cc +++ b/src/lte/model/lte-amc.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("LteAmc"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteAmc); +NS_OBJECT_ENSURE_REGISTERED (LteAmc) + ; // from 3GPP R1-081483 "Conveying MCS and TB size via PDCCH" // file TBS_support.xls diff --git a/src/lte/model/lte-asn1-header.cc b/src/lte/model/lte-asn1-header.cc index 1b6eafc21..a2c3c0e05 100644 --- a/src/lte/model/lte-asn1-header.cc +++ b/src/lte/model/lte-asn1-header.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("Asn1Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Asn1Header); +NS_OBJECT_ENSURE_REGISTERED (Asn1Header) + ; TypeId Asn1Header::GetTypeId (void) diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index 4529df243..f4f2235df 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteEnbMac); +NS_OBJECT_ENSURE_REGISTERED (LteEnbMac) + ; diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc index 944b99b51..9392f5085 100644 --- a/src/lte/model/lte-enb-net-device.cc +++ b/src/lte/model/lte-enb-net-device.cc @@ -48,7 +48,8 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice); +NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice) + ; TypeId LteEnbNetDevice::GetTypeId (void) { diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index 4c67a716e..cc20ba6b6 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -49,7 +49,8 @@ NS_LOG_COMPONENT_DEFINE ("LteEnbPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy); +NS_OBJECT_ENSURE_REGISTERED (LteEnbPhy) + ; // duration of the data part of a subframe in DL // = 0.001 / 14 * 11 (fixed to 11 symbols) -1ns as margin to avoid overlapping simulator events diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index 54817c74b..7ed132343 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -120,7 +120,8 @@ std::string ToString (UeManager::State s) } -NS_OBJECT_ENSURE_REGISTERED (UeManager); +NS_OBJECT_ENSURE_REGISTERED (UeManager) + ; UeManager::UeManager () @@ -1219,7 +1220,8 @@ UeManager::SwitchToState (State newState) // eNB RRC methods /////////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc); +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc) + ; LteEnbRrc::LteEnbRrc () : m_x2SapProvider (0), diff --git a/src/lte/model/lte-harq-phy.cc b/src/lte/model/lte-harq-phy.cc index 4e515e946..ddb0575c9 100644 --- a/src/lte/model/lte-harq-phy.cc +++ b/src/lte/model/lte-harq-phy.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("LteHarqPhy"); namespace ns3 { -//NS_OBJECT_ENSURE_REGISTERED (LteHarqPhy); +//NS_OBJECT_ENSURE_REGISTERED (LteHarqPhy) +// ; LteHarqPhy::LteHarqPhy () diff --git a/src/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc index 095a34b69..b6a6261b4 100644 --- a/src/lte/model/lte-net-device.cc +++ b/src/lte/model/lte-net-device.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("LteNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice); +NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice) + ; //////////////////////////////// // LteNetDevice diff --git a/src/lte/model/lte-pdcp-header.cc b/src/lte/model/lte-pdcp-header.cc index f8e3190e2..43922c99e 100644 --- a/src/lte/model/lte-pdcp-header.cc +++ b/src/lte/model/lte-pdcp-header.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("LtePdcpHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader); +NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader) + ; LtePdcpHeader::LtePdcpHeader () : m_dcBit (0xff), diff --git a/src/lte/model/lte-pdcp-tag.cc b/src/lte/model/lte-pdcp-tag.cc index 2182872d4..10f170b23 100644 --- a/src/lte/model/lte-pdcp-tag.cc +++ b/src/lte/model/lte-pdcp-tag.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PdcpTag); +NS_OBJECT_ENSURE_REGISTERED (PdcpTag) + ; PdcpTag::PdcpTag () : m_senderTimestamp (Seconds (0)) diff --git a/src/lte/model/lte-pdcp.cc b/src/lte/model/lte-pdcp.cc index 7087d9968..b391bef0e 100644 --- a/src/lte/model/lte-pdcp.cc +++ b/src/lte/model/lte-pdcp.cc @@ -61,7 +61,8 @@ LtePdcpSpecificLteRlcSapUser::ReceivePdcpPdu (Ptr p) /////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LtePdcp); +NS_OBJECT_ENSURE_REGISTERED (LtePdcp) + ; LtePdcp::LtePdcp () : m_pdcpSapUser (0), diff --git a/src/lte/model/lte-phy-tag.cc b/src/lte/model/lte-phy-tag.cc index 0ec581f62..d72d63b76 100644 --- a/src/lte/model/lte-phy-tag.cc +++ b/src/lte/model/lte-phy-tag.cc @@ -26,7 +26,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePhyTag); +NS_OBJECT_ENSURE_REGISTERED (LtePhyTag) + ; TypeId LtePhyTag::GetTypeId (void) diff --git a/src/lte/model/lte-phy.cc b/src/lte/model/lte-phy.cc index 10fb5be2c..9c2e9b950 100644 --- a/src/lte/model/lte-phy.cc +++ b/src/lte/model/lte-phy.cc @@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("LtePhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LtePhy); +NS_OBJECT_ENSURE_REGISTERED (LtePhy) + ; LtePhy::LtePhy () diff --git a/src/lte/model/lte-radio-bearer-info.cc b/src/lte/model/lte-radio-bearer-info.cc index dd7f08d0b..db91dfe50 100644 --- a/src/lte/model/lte-radio-bearer-info.cc +++ b/src/lte/model/lte-radio-bearer-info.cc @@ -29,7 +29,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo); +NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo) + ; LteRadioBearerInfo::LteRadioBearerInfo (void) { diff --git a/src/lte/model/lte-radio-bearer-tag.cc b/src/lte/model/lte-radio-bearer-tag.cc index 9d8905f64..6cf314185 100644 --- a/src/lte/model/lte-radio-bearer-tag.cc +++ b/src/lte/model/lte-radio-bearer-tag.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag); +NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag) + ; TypeId LteRadioBearerTag::GetTypeId (void) diff --git a/src/lte/model/lte-rlc-am-header.cc b/src/lte/model/lte-rlc-am-header.cc index e382a3f8a..d61033b1c 100644 --- a/src/lte/model/lte-rlc-am-header.cc +++ b/src/lte/model/lte-rlc-am-header.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcAmHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader); +NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader) + ; LteRlcAmHeader::LteRlcAmHeader () : m_headerLength (0), diff --git a/src/lte/model/lte-rlc-am.cc b/src/lte/model/lte-rlc-am.cc index 5d05e49ae..1ee1ad512 100644 --- a/src/lte/model/lte-rlc-am.cc +++ b/src/lte/model/lte-rlc-am.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcAm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcAm); +NS_OBJECT_ENSURE_REGISTERED (LteRlcAm) + ; LteRlcAm::LteRlcAm () { diff --git a/src/lte/model/lte-rlc-header.cc b/src/lte/model/lte-rlc-header.cc index d34729c5a..5d5ca00ea 100644 --- a/src/lte/model/lte-rlc-header.cc +++ b/src/lte/model/lte-rlc-header.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader); +NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader) + ; LteRlcHeader::LteRlcHeader () : m_headerLength (0), diff --git a/src/lte/model/lte-rlc-sdu-status-tag.cc b/src/lte/model/lte-rlc-sdu-status-tag.cc index 930d44469..85aa2db06 100644 --- a/src/lte/model/lte-rlc-sdu-status-tag.cc +++ b/src/lte/model/lte-rlc-sdu-status-tag.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag); +NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag) + ; LteRlcSduStatusTag::LteRlcSduStatusTag () { diff --git a/src/lte/model/lte-rlc-tag.cc b/src/lte/model/lte-rlc-tag.cc index bc8084ff4..f917b579d 100644 --- a/src/lte/model/lte-rlc-tag.cc +++ b/src/lte/model/lte-rlc-tag.cc @@ -24,7 +24,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RlcTag); +NS_OBJECT_ENSURE_REGISTERED (RlcTag) + ; RlcTag::RlcTag () : m_senderTimestamp (Seconds (0)) diff --git a/src/lte/model/lte-rlc-tm.cc b/src/lte/model/lte-rlc-tm.cc index c8eb6ac28..6a2eea0ea 100644 --- a/src/lte/model/lte-rlc-tm.cc +++ b/src/lte/model/lte-rlc-tm.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcTm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcTm); +NS_OBJECT_ENSURE_REGISTERED (LteRlcTm) + ; LteRlcTm::LteRlcTm () : m_maxTxBufferSize (0), diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc index 97adde8de..f57b95e03 100644 --- a/src/lte/model/lte-rlc-um.cc +++ b/src/lte/model/lte-rlc-um.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("LteRlcUm"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteRlcUm); +NS_OBJECT_ENSURE_REGISTERED (LteRlcUm) + ; LteRlcUm::LteRlcUm () : m_maxTxBufferSize (10 * 1024), diff --git a/src/lte/model/lte-rlc.cc b/src/lte/model/lte-rlc.cc index e87180f41..d7e9e1a85 100644 --- a/src/lte/model/lte-rlc.cc +++ b/src/lte/model/lte-rlc.cc @@ -81,7 +81,8 @@ LteRlcSpecificLteMacSapUser::ReceivePdu (Ptr p) /////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteRlc); +NS_OBJECT_ENSURE_REGISTERED (LteRlc) + ; LteRlc::LteRlc () : m_rlcSapUser (0), @@ -167,7 +168,8 @@ LteRlc::GetLteMacSapUser () //////////////////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteRlcSm); +NS_OBJECT_ENSURE_REGISTERED (LteRlcSm) + ; LteRlcSm::LteRlcSm () { diff --git a/src/lte/model/lte-rrc-protocol-ideal.cc b/src/lte/model/lte-rrc-protocol-ideal.cc index f74cd2eaa..9b790b655 100644 --- a/src/lte/model/lte-rrc-protocol-ideal.cc +++ b/src/lte/model/lte-rrc-protocol-ideal.cc @@ -39,7 +39,8 @@ namespace ns3 { const Time RRC_IDEAL_MSG_DELAY = MilliSeconds (0); -NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal); +NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal) + ; LteUeRrcProtocolIdeal::LteUeRrcProtocolIdeal () : m_ueRrcSapProvider (0), @@ -206,7 +207,8 @@ LteUeRrcProtocolIdeal::SetEnbRrcSapProvider () } -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal); +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal) + ; LteEnbRrcProtocolIdeal::LteEnbRrcProtocolIdeal () : m_enbRrcSapProvider (0) diff --git a/src/lte/model/lte-rrc-protocol-real.cc b/src/lte/model/lte-rrc-protocol-real.cc index f623984d9..13c9674e9 100644 --- a/src/lte/model/lte-rrc-protocol-real.cc +++ b/src/lte/model/lte-rrc-protocol-real.cc @@ -40,7 +40,8 @@ namespace ns3 { const Time RRC_REAL_MSG_DELAY = MilliSeconds (0); -NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal); +NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal) + ; LteUeRrcProtocolReal::LteUeRrcProtocolReal () : m_ueRrcSapProvider (0), @@ -350,7 +351,8 @@ LteUeRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters } } -NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal); +NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal) + ; LteEnbRrcProtocolReal::LteEnbRrcProtocolReal () : m_enbRrcSapProvider (0) diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index ffe119dac..11e023f68 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -110,7 +110,8 @@ operator < (const TbId_t& a, const TbId_t& b) return ( (a.m_rnti < b.m_rnti) || ( (a.m_rnti == b.m_rnti) && (a.m_layer < b.m_layer) ) ); } -NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy); +NS_OBJECT_ENSURE_REGISTERED (LteSpectrumPhy) + ; LteSpectrumPhy::LteSpectrumPhy () : m_state (IDLE), diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc index f2599565e..e006ecbf8 100644 --- a/src/lte/model/lte-ue-mac.cc +++ b/src/lte/model/lte-ue-mac.cc @@ -41,7 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("LteUeMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteUeMac); +NS_OBJECT_ENSURE_REGISTERED (LteUeMac) + ; /////////////////////////////////////////////////////////// diff --git a/src/lte/model/lte-ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc index 351dd90e4..a473d7790 100644 --- a/src/lte/model/lte-ue-net-device.cc +++ b/src/lte/model/lte-ue-net-device.cc @@ -48,7 +48,8 @@ NS_LOG_COMPONENT_DEFINE ("LteUeNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice); +NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice) + ; TypeId LteUeNetDevice::GetTypeId (void) diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index a11b9a4df..fda1c26c2 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -118,7 +118,8 @@ std::string ToString (LteUePhy::State s) } -NS_OBJECT_ENSURE_REGISTERED (LteUePhy); +NS_OBJECT_ENSURE_REGISTERED (LteUePhy) + ; LteUePhy::LteUePhy () diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc index 8f300c123..e8c714b8c 100644 --- a/src/lte/model/lte-ue-rrc.cc +++ b/src/lte/model/lte-ue-rrc.cc @@ -115,7 +115,8 @@ std::string ToString (LteUeRrc::State s) // ue RRC methods ///////////////////////////// -NS_OBJECT_ENSURE_REGISTERED (LteUeRrc); +NS_OBJECT_ENSURE_REGISTERED (LteUeRrc) + ; LteUeRrc::LteUeRrc () diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index c81bdacd9..95f14ff27 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -42,7 +42,8 @@ int PfType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler) + ; diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index f4f7052e3..f4dd03533 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -46,7 +46,8 @@ int PssType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler) + ; diff --git a/src/lte/model/rem-spectrum-phy.cc b/src/lte/model/rem-spectrum-phy.cc index 6080355fc..38fc9fc0a 100644 --- a/src/lte/model/rem-spectrum-phy.cc +++ b/src/lte/model/rem-spectrum-phy.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("RemSpectrumPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy); +NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy) + ; RemSpectrumPhy::RemSpectrumPhy () : m_mobility (0), diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 9a3808f1e..476e8c113 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -46,7 +46,8 @@ int Type0AllocationRbg[4] = { -NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler) + ; class RrSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index 7b6a589b1..4605ed2d8 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -43,7 +43,8 @@ int TdBetType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler) + ; diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc index df87180be..3dd27b6d2 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.cc +++ b/src/lte/model/tdmt-ff-mac-scheduler.cc @@ -43,7 +43,8 @@ int TdMtType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler) + ; diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index d1e63f035..ea9a56ea4 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -44,7 +44,8 @@ int TdTbfqType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler) + ; diff --git a/src/lte/model/trace-fading-loss-model.cc b/src/lte/model/trace-fading-loss-model.cc index 6d6cdbb88..eb08dbb5a 100644 --- a/src/lte/model/trace-fading-loss-model.cc +++ b/src/lte/model/trace-fading-loss-model.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("TraceFadingLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel); +NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel) + ; diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 995b4fad1..989c04815 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -43,7 +43,8 @@ int TtaType0AllocationRbg[4] = { }; // see table 7.1.6.1-1 of 36.213 -NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler); +NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler) + ; diff --git a/src/lte/test/lte-simple-helper.cc b/src/lte/test/lte-simple-helper.cc index 1fc3786e2..ec40e02d9 100644 --- a/src/lte/test/lte-simple-helper.cc +++ b/src/lte/test/lte-simple-helper.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("LteSimpleHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper); +NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper) + ; LteSimpleHelper::LteSimpleHelper (void) { diff --git a/src/lte/test/lte-simple-net-device.cc b/src/lte/test/lte-simple-net-device.cc index b9b69fc58..b505d77ec 100644 --- a/src/lte/test/lte-simple-net-device.cc +++ b/src/lte/test/lte-simple-net-device.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("LteSimpleNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice); +NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice) + ; TypeId LteSimpleNetDevice::GetTypeId (void) diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc index 144abc5cb..2194ba373 100644 --- a/src/lte/test/lte-test-entities.cc +++ b/src/lte/test/lte-test-entities.cc @@ -608,7 +608,8 @@ LteTestMac::Receive (Ptr nd, Ptr p, uint16_t protocol, -NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc); +NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc) + ; EpcTestRrc::EpcTestRrc () : m_s1SapProvider (0) diff --git a/src/lte/test/lte-test-ue-phy.cc b/src/lte/test/lte-test-ue-phy.cc index 1194c635d..8a790548a 100644 --- a/src/lte/test/lte-test-ue-phy.cc +++ b/src/lte/test/lte-test-ue-phy.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("LteTestUePhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy); +NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy) + ; LteTestUePhy::LteTestUePhy () { diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc index 80e0f98b7..16bd91854 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.cc +++ b/src/mesh/helper/dot11s/dot11s-installer.cc @@ -25,7 +25,9 @@ namespace ns3 { using namespace dot11s; -NS_OBJECT_ENSURE_REGISTERED (Dot11sStack); +NS_OBJECT_ENSURE_REGISTERED (Dot11sStack) + ; + TypeId Dot11sStack::GetTypeId () { diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc index f3d617522..0bc3a6760 100644 --- a/src/mesh/helper/flame/flame-installer.cc +++ b/src/mesh/helper/flame/flame-installer.cc @@ -26,7 +26,9 @@ namespace ns3 { using namespace flame; -NS_OBJECT_ENSURE_REGISTERED (FlameStack); +NS_OBJECT_ENSURE_REGISTERED (FlameStack) + ; + TypeId FlameStack::GetTypeId () { diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc index 3c4c54038..b46efdb7f 100644 --- a/src/mesh/model/dot11s/airtime-metric.cc +++ b/src/mesh/model/dot11s/airtime-metric.cc @@ -25,7 +25,9 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator); +NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator) + ; + TypeId AirtimeLinkMetricCalculator::GetTypeId () { diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc index 801c9d0f7..e580f468e 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.cc +++ b/src/mesh/model/dot11s/hwmp-protocol.cc @@ -41,7 +41,9 @@ NS_LOG_COMPONENT_DEFINE ("HwmpProtocol"); namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol); +NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol) + ; + TypeId HwmpProtocol::GetTypeId () { diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc index e02cfda0b..7528728c1 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.cc +++ b/src/mesh/model/dot11s/hwmp-rtable.cc @@ -31,7 +31,8 @@ namespace dot11s { NS_LOG_COMPONENT_DEFINE ("HwmpRtable"); -NS_OBJECT_ENSURE_REGISTERED (HwmpRtable); +NS_OBJECT_ENSURE_REGISTERED (HwmpRtable) + ; TypeId HwmpRtable::GetTypeId () diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc index 88fe7fd06..d45108fab 100644 --- a/src/mesh/model/dot11s/hwmp-tag.cc +++ b/src/mesh/model/dot11s/hwmp-tag.cc @@ -23,7 +23,9 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (HwmpTag); +NS_OBJECT_ENSURE_REGISTERED (HwmpTag) + ; + //Class HwmpTag: HwmpTag::HwmpTag () : m_address (Mac48Address::GetBroadcast ()), m_ttl (0), m_metric (0), m_seqno (0) diff --git a/src/mesh/model/dot11s/peer-link-frame.cc b/src/mesh/model/dot11s/peer-link-frame.cc index 3ae8e4102..cd4489ae8 100644 --- a/src/mesh/model/dot11s/peer-link-frame.cc +++ b/src/mesh/model/dot11s/peer-link-frame.cc @@ -26,7 +26,8 @@ namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart); +NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart) + ; PeerLinkFrameStart::PeerLinkFrameStart () : m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (), diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc index e6eeec17f..736c52161 100644 --- a/src/mesh/model/dot11s/peer-link.cc +++ b/src/mesh/model/dot11s/peer-link.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Dot11sPeerManagementProtocol"); namespace ns3 { namespace dot11s { -NS_OBJECT_ENSURE_REGISTERED ( PeerLink); +NS_OBJECT_ENSURE_REGISTERED ( PeerLink) + ; TypeId PeerLink::GetTypeId () diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc index 9ae96b3a0..2e2e892c8 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.cc +++ b/src/mesh/model/dot11s/peer-management-protocol.cc @@ -39,7 +39,8 @@ namespace dot11s { /*************************************************** * PeerManager ***************************************************/ -NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol); +NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol) + ; TypeId PeerManagementProtocol::GetTypeId (void) diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc index af7b48637..26e070226 100644 --- a/src/mesh/model/flame/flame-header.cc +++ b/src/mesh/model/flame/flame-header.cc @@ -26,7 +26,8 @@ namespace ns3 { namespace flame { -NS_OBJECT_ENSURE_REGISTERED (FlameHeader); +NS_OBJECT_ENSURE_REGISTERED (FlameHeader) + ; FlameHeader::FlameHeader () : m_cost (0), m_seqno (0), m_origDst (Mac48Address ()), m_origSrc (Mac48Address ()) diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc index b1f821041..55da861ba 100644 --- a/src/mesh/model/flame/flame-protocol.cc +++ b/src/mesh/model/flame/flame-protocol.cc @@ -38,8 +38,10 @@ namespace flame { //----------------------------------------------------------------------------- // FlameTag //----------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (FlameTag); -NS_OBJECT_ENSURE_REGISTERED (FlameProtocol); +NS_OBJECT_ENSURE_REGISTERED (FlameTag) + ; +NS_OBJECT_ENSURE_REGISTERED (FlameProtocol) + ; TypeId FlameTag::GetTypeId () diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc index 92d585d92..b84e09e69 100644 --- a/src/mesh/model/flame/flame-rtable.cc +++ b/src/mesh/model/flame/flame-rtable.cc @@ -28,7 +28,8 @@ namespace flame { NS_LOG_COMPONENT_DEFINE ("FlameRtable"); -NS_OBJECT_ENSURE_REGISTERED (FlameRtable); +NS_OBJECT_ENSURE_REGISTERED (FlameRtable) + ; TypeId FlameRtable::GetTypeId () diff --git a/src/mesh/model/mesh-l2-routing-protocol.cc b/src/mesh/model/mesh-l2-routing-protocol.cc index 953a49c3a..78dbd7e3c 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.cc +++ b/src/mesh/model/mesh-l2-routing-protocol.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("MeshL2RoutingProtocol"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol) + ; TypeId MeshL2RoutingProtocol::GetTypeId (void) diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc index 2628d2725..b9270710c 100644 --- a/src/mesh/model/mesh-point-device.cc +++ b/src/mesh/model/mesh-point-device.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("MeshPointDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice); +NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice) + ; TypeId MeshPointDevice::GetTypeId () diff --git a/src/mesh/model/mesh-wifi-interface-mac.cc b/src/mesh/model/mesh-wifi-interface-mac.cc index 6109410d6..0643ed64f 100644 --- a/src/mesh/model/mesh-wifi-interface-mac.cc +++ b/src/mesh/model/mesh-wifi-interface-mac.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("MeshWifiInterfaceMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac); +NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac) + ; TypeId MeshWifiInterfaceMac::GetTypeId () diff --git a/src/mobility/model/constant-acceleration-mobility-model.cc b/src/mobility/model/constant-acceleration-mobility-model.cc index 6b123944a..20f339c49 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.cc +++ b/src/mobility/model/constant-acceleration-mobility-model.cc @@ -20,7 +20,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel) + ; TypeId ConstantAccelerationMobilityModel::GetTypeId (void) { diff --git a/src/mobility/model/constant-position-mobility-model.cc b/src/mobility/model/constant-position-mobility-model.cc index 72a000a3b..10b94e537 100644 --- a/src/mobility/model/constant-position-mobility-model.cc +++ b/src/mobility/model/constant-position-mobility-model.cc @@ -21,7 +21,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel) + ; TypeId ConstantPositionMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/constant-velocity-mobility-model.cc b/src/mobility/model/constant-velocity-mobility-model.cc index 7a92bb00c..e76bed7d6 100644 --- a/src/mobility/model/constant-velocity-mobility-model.cc +++ b/src/mobility/model/constant-velocity-mobility-model.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel) + ; TypeId ConstantVelocityMobilityModel::GetTypeId (void) { diff --git a/src/mobility/model/gauss-markov-mobility-model.cc b/src/mobility/model/gauss-markov-mobility-model.cc index 897cefcf2..1be75357f 100644 --- a/src/mobility/model/gauss-markov-mobility-model.cc +++ b/src/mobility/model/gauss-markov-mobility-model.cc @@ -27,7 +27,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel) + ; TypeId GaussMarkovMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/hierarchical-mobility-model.cc b/src/mobility/model/hierarchical-mobility-model.cc index 6382e9eee..6771d872a 100644 --- a/src/mobility/model/hierarchical-mobility-model.cc +++ b/src/mobility/model/hierarchical-mobility-model.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel) + ; TypeId HierarchicalMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/mobility-model.cc b/src/mobility/model/mobility-model.cc index 6aebe590a..08022e56d 100644 --- a/src/mobility/model/mobility-model.cc +++ b/src/mobility/model/mobility-model.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MobilityModel); +NS_OBJECT_ENSURE_REGISTERED (MobilityModel) + ; TypeId MobilityModel::GetTypeId (void) diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc index 9582b6b6d..a02eb8b2a 100644 --- a/src/mobility/model/position-allocator.cc +++ b/src/mobility/model/position-allocator.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("PositionAllocator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (PositionAllocator) + ; TypeId PositionAllocator::GetTypeId (void) @@ -48,7 +49,8 @@ PositionAllocator::~PositionAllocator () { } -NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator) + ; TypeId ListPositionAllocator::GetTypeId (void) @@ -85,7 +87,8 @@ ListPositionAllocator::AssignStreams (int64_t stream) return 0; } -NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator) + ; TypeId GridPositionAllocator::GetTypeId (void) @@ -213,7 +216,8 @@ GridPositionAllocator::AssignStreams (int64_t stream) return 0; } -NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator) + ; TypeId RandomRectanglePositionAllocator::GetTypeId (void) @@ -269,7 +273,8 @@ RandomRectanglePositionAllocator::AssignStreams (int64_t stream) return 2; } -NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator) + ; TypeId RandomBoxPositionAllocator::GetTypeId (void) @@ -337,7 +342,8 @@ RandomBoxPositionAllocator::AssignStreams (int64_t stream) return 3; } -NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator) + ; TypeId RandomDiscPositionAllocator::GetTypeId (void) @@ -418,7 +424,8 @@ RandomDiscPositionAllocator::AssignStreams (int64_t stream) -NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator); +NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator) + ; TypeId UniformDiscPositionAllocator::GetTypeId (void) diff --git a/src/mobility/model/random-direction-2d-mobility-model.cc b/src/mobility/model/random-direction-2d-mobility-model.cc index 43d11b670..87a2588c2 100644 --- a/src/mobility/model/random-direction-2d-mobility-model.cc +++ b/src/mobility/model/random-direction-2d-mobility-model.cc @@ -31,7 +31,8 @@ namespace ns3 { const double RandomDirection2dMobilityModel::PI = 3.14159265358979323846; -NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel) + ; TypeId diff --git a/src/mobility/model/random-walk-2d-mobility-model.cc b/src/mobility/model/random-walk-2d-mobility-model.cc index 4e696abb8..f76efe765 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.cc +++ b/src/mobility/model/random-walk-2d-mobility-model.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("RandomWalk2d"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel) + ; TypeId RandomWalk2dMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/random-waypoint-mobility-model.cc b/src/mobility/model/random-waypoint-mobility-model.cc index 566fba6ea..a5aa30662 100644 --- a/src/mobility/model/random-waypoint-mobility-model.cc +++ b/src/mobility/model/random-waypoint-mobility-model.cc @@ -27,7 +27,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel) + ; TypeId RandomWaypointMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc index 7b7483966..30f604761 100644 --- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc +++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel) + ; TypeId SteadyStateRandomWaypointMobilityModel::GetTypeId (void) diff --git a/src/mobility/model/waypoint-mobility-model.cc b/src/mobility/model/waypoint-mobility-model.cc index 58f734ac2..8275f0fca 100644 --- a/src/mobility/model/waypoint-mobility-model.cc +++ b/src/mobility/model/waypoint-mobility-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("WaypointMobilityModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel); +NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel) + ; TypeId diff --git a/src/mpi/model/distributed-simulator-impl.cc b/src/mpi/model/distributed-simulator-impl.cc index 66160df8b..d1384c777 100644 --- a/src/mpi/model/distributed-simulator-impl.cc +++ b/src/mpi/model/distributed-simulator-impl.cc @@ -39,7 +39,8 @@ NS_LOG_COMPONENT_DEFINE ("DistributedSimulatorImpl"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl); +NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl) + ; LbtsMessage::~LbtsMessage () { diff --git a/src/network/model/application.cc b/src/network/model/application.cc index 98719e6ec..f6b38ab11 100644 --- a/src/network/model/application.cc +++ b/src/network/model/application.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Application"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Application); +NS_OBJECT_ENSURE_REGISTERED (Application) + ; // Application Methods diff --git a/src/network/model/channel-list.cc b/src/network/model/channel-list.cc index 9be42c470..0ad507dda 100644 --- a/src/network/model/channel-list.cc +++ b/src/network/model/channel-list.cc @@ -55,7 +55,8 @@ private: std::vector > m_channels; }; -NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv); +NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv) + ; TypeId ChannelListPriv::GetTypeId (void) diff --git a/src/network/model/channel.cc b/src/network/model/channel.cc index 15f7c716b..59674429e 100644 --- a/src/network/model/channel.cc +++ b/src/network/model/channel.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("Channel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Channel); +NS_OBJECT_ENSURE_REGISTERED (Channel) + ; TypeId Channel::GetTypeId (void) diff --git a/src/network/model/chunk.cc b/src/network/model/chunk.cc index 6081f0edb..3b2443b9c 100644 --- a/src/network/model/chunk.cc +++ b/src/network/model/chunk.cc @@ -2,7 +2,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Chunk); +NS_OBJECT_ENSURE_REGISTERED (Chunk) + ; TypeId Chunk::GetTypeId (void) diff --git a/src/network/model/header.cc b/src/network/model/header.cc index 39840a736..8ad2aa764 100644 --- a/src/network/model/header.cc +++ b/src/network/model/header.cc @@ -5,7 +5,8 @@ NS_LOG_COMPONENT_DEFINE ("Header"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Header); +NS_OBJECT_ENSURE_REGISTERED (Header) + ; Header::~Header () { diff --git a/src/network/model/net-device.cc b/src/network/model/net-device.cc index 7fdca4123..effc9f2f6 100644 --- a/src/network/model/net-device.cc +++ b/src/network/model/net-device.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("NetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NetDevice); +NS_OBJECT_ENSURE_REGISTERED (NetDevice) + ; TypeId NetDevice::GetTypeId (void) { diff --git a/src/network/model/node-list.cc b/src/network/model/node-list.cc index 87060e834..b99dcfc6c 100644 --- a/src/network/model/node-list.cc +++ b/src/network/model/node-list.cc @@ -56,7 +56,8 @@ private: std::vector > m_nodes; }; -NS_OBJECT_ENSURE_REGISTERED (NodeListPriv); +NS_OBJECT_ENSURE_REGISTERED (NodeListPriv) + ; TypeId NodeListPriv::GetTypeId (void) diff --git a/src/network/model/node.cc b/src/network/model/node.cc index 8feec8f7b..194e2902d 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("Node"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Node); +NS_OBJECT_ENSURE_REGISTERED (Node) + ; GlobalValue g_checksumEnabled = GlobalValue ("ChecksumEnabled", "A global switch to enable all checksums for all protocols", diff --git a/src/network/model/socket-factory.cc b/src/network/model/socket-factory.cc index 9c234e7ea..d05dba8cb 100644 --- a/src/network/model/socket-factory.cc +++ b/src/network/model/socket-factory.cc @@ -24,7 +24,8 @@ NS_LOG_COMPONENT_DEFINE ("SocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SocketFactory); +NS_OBJECT_ENSURE_REGISTERED (SocketFactory) + ; TypeId SocketFactory::GetTypeId (void) { diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc index 41503d5b8..5dcd7cb5f 100644 --- a/src/network/model/socket.cc +++ b/src/network/model/socket.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Socket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Socket); +NS_OBJECT_ENSURE_REGISTERED (Socket) + ; TypeId Socket::GetTypeId (void) @@ -532,7 +533,8 @@ SocketAddressTag::GetAddress (void) const return m_address; } -NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag); +NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag) + ; TypeId SocketAddressTag::GetTypeId (void) @@ -592,7 +594,8 @@ SocketIpTtlTag::GetTtl (void) const return m_ttl; } -NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag); +NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag) + ; TypeId SocketIpTtlTag::GetTypeId (void) @@ -650,7 +653,8 @@ SocketIpv6HopLimitTag::GetHopLimit (void) const return m_hopLimit; } -NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag); +NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag) + ; TypeId SocketIpv6HopLimitTag::GetTypeId (void) @@ -711,7 +715,8 @@ SocketSetDontFragmentTag::IsEnabled (void) const return m_dontFragment; } -NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag); +NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag) + ; TypeId SocketSetDontFragmentTag::GetTypeId (void) diff --git a/src/network/model/tag.cc b/src/network/model/tag.cc index 2de97178b..e12fb1fad 100644 --- a/src/network/model/tag.cc +++ b/src/network/model/tag.cc @@ -21,7 +21,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Tag); +NS_OBJECT_ENSURE_REGISTERED (Tag) + ; TypeId Tag::GetTypeId (void) diff --git a/src/network/model/trailer.cc b/src/network/model/trailer.cc index e66486e45..a2ca456cc 100644 --- a/src/network/model/trailer.cc +++ b/src/network/model/trailer.cc @@ -5,7 +5,8 @@ NS_LOG_COMPONENT_DEFINE ("Trailer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Trailer); +NS_OBJECT_ENSURE_REGISTERED (Trailer) + ; Trailer::~Trailer () { diff --git a/src/network/utils/drop-tail-queue.cc b/src/network/utils/drop-tail-queue.cc index 95218c500..65157ecc4 100644 --- a/src/network/utils/drop-tail-queue.cc +++ b/src/network/utils/drop-tail-queue.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("DropTailQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); +NS_OBJECT_ENSURE_REGISTERED (DropTailQueue) + ; TypeId DropTailQueue::GetTypeId (void) { diff --git a/src/network/utils/error-model.cc b/src/network/utils/error-model.cc index 86010e6ed..5d792fbd4 100644 --- a/src/network/utils/error-model.cc +++ b/src/network/utils/error-model.cc @@ -77,7 +77,8 @@ NS_LOG_COMPONENT_DEFINE ("ErrorModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorModel); +NS_OBJECT_ENSURE_REGISTERED (ErrorModel) + ; TypeId ErrorModel::GetTypeId (void) { @@ -145,7 +146,8 @@ ErrorModel::IsEnabled (void) const // RateErrorModel // -NS_OBJECT_ENSURE_REGISTERED (RateErrorModel); +NS_OBJECT_ENSURE_REGISTERED (RateErrorModel) + ; TypeId RateErrorModel::GetTypeId (void) { @@ -284,7 +286,8 @@ RateErrorModel::DoReset (void) // BurstErrorModel // -NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel); +NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel) + ; TypeId BurstErrorModel::GetTypeId (void) { @@ -412,7 +415,8 @@ BurstErrorModel::DoReset (void) // ListErrorModel // -NS_OBJECT_ENSURE_REGISTERED (ListErrorModel); +NS_OBJECT_ENSURE_REGISTERED (ListErrorModel) + ; TypeId ListErrorModel::GetTypeId (void) { @@ -481,7 +485,8 @@ ListErrorModel::DoReset (void) // ReceiveListErrorModel // -NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel); +NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel) + ; TypeId ReceiveListErrorModel::GetTypeId (void) { diff --git a/src/network/utils/ethernet-header.cc b/src/network/utils/ethernet-header.cc index 783baf06c..d4d12e052 100644 --- a/src/network/utils/ethernet-header.cc +++ b/src/network/utils/ethernet-header.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("EthernetHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EthernetHeader); +NS_OBJECT_ENSURE_REGISTERED (EthernetHeader) + ; EthernetHeader::EthernetHeader (bool hasPreamble) : m_enPreambleSfd (hasPreamble), diff --git a/src/network/utils/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc index 88db49881..df769f832 100644 --- a/src/network/utils/ethernet-trailer.cc +++ b/src/network/utils/ethernet-trailer.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("EthernetTrailer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer); +NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer) + ; EthernetTrailer::EthernetTrailer () : m_calcFcs (false), diff --git a/src/network/utils/flow-id-tag.cc b/src/network/utils/flow-id-tag.cc index 04dfb8b81..083dc69b9 100644 --- a/src/network/utils/flow-id-tag.cc +++ b/src/network/utils/flow-id-tag.cc @@ -24,7 +24,8 @@ NS_LOG_COMPONENT_DEFINE ("FlowIdTag"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FlowIdTag); +NS_OBJECT_ENSURE_REGISTERED (FlowIdTag) + ; TypeId FlowIdTag::GetTypeId (void) diff --git a/src/network/utils/llc-snap-header.cc b/src/network/utils/llc-snap-header.cc index 1638b4b6d..9e7637fc9 100644 --- a/src/network/utils/llc-snap-header.cc +++ b/src/network/utils/llc-snap-header.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("LlcSnalHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader); +NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader) + ; LlcSnapHeader::LlcSnapHeader () { diff --git a/src/network/utils/packet-burst.cc b/src/network/utils/packet-burst.cc index 4785fd913..c0d6e1a80 100644 --- a/src/network/utils/packet-burst.cc +++ b/src/network/utils/packet-burst.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("PacketBurst"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketBurst); +NS_OBJECT_ENSURE_REGISTERED (PacketBurst) + ; TypeId PacketBurst::GetTypeId (void) diff --git a/src/network/utils/packet-probe.cc b/src/network/utils/packet-probe.cc index 2d6de134d..a05752b8c 100644 --- a/src/network/utils/packet-probe.cc +++ b/src/network/utils/packet-probe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("PacketProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketProbe); +NS_OBJECT_ENSURE_REGISTERED (PacketProbe) + ; TypeId PacketProbe::GetTypeId () diff --git a/src/network/utils/packet-socket-factory.cc b/src/network/utils/packet-socket-factory.cc index 908e69da9..269eb574b 100644 --- a/src/network/utils/packet-socket-factory.cc +++ b/src/network/utils/packet-socket-factory.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("PacketSocketFactory"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory); +NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory) + ; TypeId PacketSocketFactory::GetTypeId (void) diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc index b8d81edc8..32a6832cf 100644 --- a/src/network/utils/packet-socket.cc +++ b/src/network/utils/packet-socket.cc @@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("PacketSocket"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PacketSocket); +NS_OBJECT_ENSURE_REGISTERED (PacketSocket) + ; TypeId PacketSocket::GetTypeId (void) @@ -536,7 +537,8 @@ PacketSocketTag::GetDestAddress (void) const return m_destAddr; } -NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag); +NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag) + ; TypeId PacketSocketTag::GetTypeId (void) @@ -599,7 +601,8 @@ DeviceNameTag::GetDeviceName (void) const return m_deviceName; } -NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag); +NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag) + ; TypeId DeviceNameTag::GetTypeId (void) diff --git a/src/network/utils/packetbb.cc b/src/network/utils/packetbb.cc index 23914076f..5e0706027 100644 --- a/src/network/utils/packetbb.cc +++ b/src/network/utils/packetbb.cc @@ -58,7 +58,8 @@ static const uint8_t TIS_MULTIVALUE = 0x04; namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PbbPacket); +NS_OBJECT_ENSURE_REGISTERED (PbbPacket) + ; PbbTlvBlock::PbbTlvBlock (void) { diff --git a/src/network/utils/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc index 542287c61..18c8b6aed 100644 --- a/src/network/utils/pcap-file-wrapper.cc +++ b/src/network/utils/pcap-file-wrapper.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("PcapFileWrapper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper); +NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper) + ; TypeId PcapFileWrapper::GetTypeId (void) diff --git a/src/network/utils/queue.cc b/src/network/utils/queue.cc index 26711f37d..b39419b3d 100644 --- a/src/network/utils/queue.cc +++ b/src/network/utils/queue.cc @@ -24,7 +24,8 @@ NS_LOG_COMPONENT_DEFINE ("Queue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Queue); +NS_OBJECT_ENSURE_REGISTERED (Queue) + ; TypeId Queue::GetTypeId (void) diff --git a/src/network/utils/radiotap-header.cc b/src/network/utils/radiotap-header.cc index 839bf6d56..b7f74e679 100644 --- a/src/network/utils/radiotap-header.cc +++ b/src/network/utils/radiotap-header.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("RadiotapHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader); +NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader) + ; RadiotapHeader::RadiotapHeader() : m_length (8), diff --git a/src/network/utils/red-queue.cc b/src/network/utils/red-queue.cc index 4e7774223..955c6063f 100644 --- a/src/network/utils/red-queue.cc +++ b/src/network/utils/red-queue.cc @@ -69,7 +69,8 @@ NS_LOG_COMPONENT_DEFINE ("RedQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RedQueue); +NS_OBJECT_ENSURE_REGISTERED (RedQueue) + ; TypeId RedQueue::GetTypeId (void) { diff --git a/src/network/utils/simple-channel.cc b/src/network/utils/simple-channel.cc index f0dc1eb65..0437ee5d4 100644 --- a/src/network/utils/simple-channel.cc +++ b/src/network/utils/simple-channel.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("SimpleChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleChannel); +NS_OBJECT_ENSURE_REGISTERED (SimpleChannel) + ; TypeId SimpleChannel::GetTypeId (void) diff --git a/src/network/utils/simple-net-device.cc b/src/network/utils/simple-net-device.cc index eb8dc6b76..29c4a2e63 100644 --- a/src/network/utils/simple-net-device.cc +++ b/src/network/utils/simple-net-device.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("SimpleNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice); +NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice) + ; TypeId SimpleNetDevice::GetTypeId (void) diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc index 8706c51a0..defabee5a 100644 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc +++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("Ipv4NixVectorRouting"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting); +NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting) + ; TypeId Ipv4NixVectorRouting::GetTypeId (void) diff --git a/src/olsr/model/olsr-header.cc b/src/olsr/model/olsr-header.cc index fa5db6eff..67cb1cc24 100644 --- a/src/olsr/model/olsr-header.cc +++ b/src/olsr/model/olsr-header.cc @@ -96,7 +96,8 @@ EmfToSeconds (uint8_t olsrFormat) // ---------------- OLSR Packet ------------------------------- -NS_OBJECT_ENSURE_REGISTERED (PacketHeader); +NS_OBJECT_ENSURE_REGISTERED (PacketHeader) + ; PacketHeader::PacketHeader () { @@ -153,7 +154,8 @@ PacketHeader::Deserialize (Buffer::Iterator start) // ---------------- OLSR Message ------------------------------- -NS_OBJECT_ENSURE_REGISTERED (MessageHeader); +NS_OBJECT_ENSURE_REGISTERED (MessageHeader) + ; MessageHeader::MessageHeader () : m_messageType (MessageHeader::MessageType (0)) diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index 532553b7b..3cec9f420 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -146,7 +146,8 @@ NS_LOG_COMPONENT_DEFINE ("OlsrRoutingProtocol"); /********** OLSR class **********/ -NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol); +NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol) + ; TypeId RoutingProtocol::GetTypeId (void) diff --git a/src/openflow/model/openflow-switch-net-device.cc b/src/openflow/model/openflow-switch-net-device.cc index 62b6ef737..aa6ce8524 100644 --- a/src/openflow/model/openflow-switch-net-device.cc +++ b/src/openflow/model/openflow-switch-net-device.cc @@ -23,7 +23,8 @@ NS_LOG_COMPONENT_DEFINE ("OpenFlowSwitchNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice); +NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice) + ; const char * OpenFlowSwitchNetDevice::GetManufacturerDescription () diff --git a/src/point-to-point/model/point-to-point-channel.cc b/src/point-to-point/model/point-to-point-channel.cc index d6a69386a..c70f4e42b 100644 --- a/src/point-to-point/model/point-to-point-channel.cc +++ b/src/point-to-point/model/point-to-point-channel.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel); +NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel) + ; TypeId PointToPointChannel::GetTypeId (void) diff --git a/src/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc index ca81c53de..0c3a5908e 100644 --- a/src/point-to-point/model/point-to-point-net-device.cc +++ b/src/point-to-point/model/point-to-point-net-device.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice); +NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice) + ; TypeId PointToPointNetDevice::GetTypeId (void) diff --git a/src/point-to-point/model/point-to-point-remote-channel.cc b/src/point-to-point/model/point-to-point-remote-channel.cc index 4c982ac67..f6aa96aa0 100644 --- a/src/point-to-point/model/point-to-point-remote-channel.cc +++ b/src/point-to-point/model/point-to-point-remote-channel.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointRemoteChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel); +NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel) + ; TypeId PointToPointRemoteChannel::GetTypeId (void) diff --git a/src/point-to-point/model/ppp-header.cc b/src/point-to-point/model/ppp-header.cc index 4650fb069..9c8af8d46 100644 --- a/src/point-to-point/model/ppp-header.cc +++ b/src/point-to-point/model/ppp-header.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("PppHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PppHeader); +NS_OBJECT_ENSURE_REGISTERED (PppHeader) + ; PppHeader::PppHeader () { diff --git a/src/propagation/model/cost231-propagation-loss-model.cc b/src/propagation/model/cost231-propagation-loss-model.cc index 2ba8c5256..3eb144c86 100644 --- a/src/propagation/model/cost231-propagation-loss-model.cc +++ b/src/propagation/model/cost231-propagation-loss-model.cc @@ -30,7 +30,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel"); -NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel) + ; TypeId Cost231PropagationLossModel::GetTypeId (void) diff --git a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc index 9064c5f8e..4b1ae4e04 100644 --- a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel) + ; TypeId ItuR1411LosPropagationLossModel::GetTypeId (void) diff --git a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc index b5867679c..a27c70e77 100644 --- a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel) + ; TypeId diff --git a/src/propagation/model/jakes-process.cc b/src/propagation/model/jakes-process.cc index 3012df5a7..afea8c3c1 100644 --- a/src/propagation/model/jakes-process.cc +++ b/src/propagation/model/jakes-process.cc @@ -43,7 +43,8 @@ JakesProcess::Oscillator::GetValueAt (Time at) const return (m_amplitude * std::cos (at.GetSeconds () * m_omega + m_phase)); } -NS_OBJECT_ENSURE_REGISTERED (JakesProcess); +NS_OBJECT_ENSURE_REGISTERED (JakesProcess) + ; TypeId JakesProcess::GetTypeId () diff --git a/src/propagation/model/jakes-propagation-loss-model.cc b/src/propagation/model/jakes-propagation-loss-model.cc index eba42c84a..f49596f6a 100644 --- a/src/propagation/model/jakes-propagation-loss-model.cc +++ b/src/propagation/model/jakes-propagation-loss-model.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("Jakes"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel) + ; const double JakesPropagationLossModel::PI = 3.14159265358979323846; diff --git a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc index eb3e5710d..f0ce146c8 100644 --- a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc +++ b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel) + ; TypeId diff --git a/src/propagation/model/okumura-hata-propagation-loss-model.cc b/src/propagation/model/okumura-hata-propagation-loss-model.cc index e6c5c7b18..5e50172f2 100644 --- a/src/propagation/model/okumura-hata-propagation-loss-model.cc +++ b/src/propagation/model/okumura-hata-propagation-loss-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel) + ; TypeId diff --git a/src/propagation/model/propagation-delay-model.cc b/src/propagation/model/propagation-delay-model.cc index e920b6a57..2d90dbba3 100644 --- a/src/propagation/model/propagation-delay-model.cc +++ b/src/propagation/model/propagation-delay-model.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel); +NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel) + ; TypeId PropagationDelayModel::GetTypeId (void) @@ -48,7 +49,8 @@ PropagationDelayModel::AssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel); +NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel) + ; TypeId RandomPropagationDelayModel::GetTypeId (void) @@ -84,7 +86,8 @@ RandomPropagationDelayModel::DoAssignStreams (int64_t stream) return 1; } -NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel); +NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel) + ; TypeId ConstantSpeedPropagationDelayModel::GetTypeId (void) diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc index f52c66a06..6c82da988 100644 --- a/src/propagation/model/propagation-loss-model.cc +++ b/src/propagation/model/propagation-loss-model.cc @@ -36,7 +36,8 @@ namespace ns3 { // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel) + ; TypeId PropagationLossModel::GetTypeId (void) @@ -95,7 +96,8 @@ PropagationLossModel::AssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel) + ; TypeId RandomPropagationLossModel::GetTypeId (void) @@ -138,7 +140,8 @@ RandomPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel) + ; const double FriisPropagationLossModel::PI = 3.14159265358979323846; @@ -275,7 +278,8 @@ FriisPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // // -- Two-Ray Ground Model ported from NS-2 -- tomhewer@mac.com -- Nov09 // -NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel) + ; const double TwoRayGroundPropagationLossModel::PI = 3.14159265358979323846; @@ -449,7 +453,8 @@ TwoRayGroundPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel) + ; TypeId LogDistancePropagationLossModel::GetTypeId (void) @@ -537,7 +542,8 @@ LogDistancePropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel) + ; TypeId ThreeLogDistancePropagationLossModel::GetTypeId (void) @@ -638,7 +644,8 @@ ThreeLogDistancePropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel) + ; TypeId NakagamiPropagationLossModel::GetTypeId (void) @@ -752,7 +759,8 @@ NakagamiPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel); +NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel) + ; TypeId FixedRssLossModel::GetTypeId (void) @@ -798,7 +806,8 @@ FixedRssLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel) + ; TypeId MatrixPropagationLossModel::GetTypeId (void) @@ -877,7 +886,8 @@ MatrixPropagationLossModel::DoAssignStreams (int64_t stream) // ------------------------------------------------------------------------- // -NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel) + ; TypeId RangePropagationLossModel::GetTypeId (void) diff --git a/src/spectrum/model/aloha-noack-mac-header.cc b/src/spectrum/model/aloha-noack-mac-header.cc index 0fa11df62..acae75f88 100644 --- a/src/spectrum/model/aloha-noack-mac-header.cc +++ b/src/spectrum/model/aloha-noack-mac-header.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("AlohaNoackMacHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader); +NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader) + ; TypeId AlohaNoackMacHeader::GetTypeId (void) diff --git a/src/spectrum/model/aloha-noack-net-device.cc b/src/spectrum/model/aloha-noack-net-device.cc index c7ecbcc28..0d46c83af 100644 --- a/src/spectrum/model/aloha-noack-net-device.cc +++ b/src/spectrum/model/aloha-noack-net-device.cc @@ -55,7 +55,8 @@ std::ostream& operator<< (std::ostream& os, AlohaNoackNetDevice::State state) } -NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice); +NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice) + ; TypeId AlohaNoackNetDevice::GetTypeId (void) diff --git a/src/spectrum/model/constant-spectrum-propagation-loss.cc b/src/spectrum/model/constant-spectrum-propagation-loss.cc index f100bd0ab..e2a92954e 100644 --- a/src/spectrum/model/constant-spectrum-propagation-loss.cc +++ b/src/spectrum/model/constant-spectrum-propagation-loss.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("ConstantSpectrumPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel) + ; ConstantSpectrumPropagationLossModel::ConstantSpectrumPropagationLossModel () { diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.cc b/src/spectrum/model/friis-spectrum-propagation-loss.cc index 12a2ca709..9eaa6a7a4 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.cc +++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel) + ; FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel () diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc index d377b8794..e0db0011a 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.cc +++ b/src/spectrum/model/half-duplex-ideal-phy.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("HalfDuplexIdealPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy); +NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy) + ; HalfDuplexIdealPhy::HalfDuplexIdealPhy () : m_mobility (0), diff --git a/src/spectrum/model/multi-model-spectrum-channel.cc b/src/spectrum/model/multi-model-spectrum-channel.cc index da4125ad5..66fd2c415 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.cc +++ b/src/spectrum/model/multi-model-spectrum-channel.cc @@ -45,7 +45,8 @@ NS_LOG_COMPONENT_DEFINE ("MultiModelSpectrumChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel); +NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel) + ; std::ostream& operator<< (std::ostream& lhs, TxSpectrumModelInfoMap_t& rhs) diff --git a/src/spectrum/model/non-communicating-net-device.cc b/src/spectrum/model/non-communicating-net-device.cc index 1ce3508a8..f705c498b 100644 --- a/src/spectrum/model/non-communicating-net-device.cc +++ b/src/spectrum/model/non-communicating-net-device.cc @@ -36,7 +36,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice); +NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice) + ; TypeId NonCommunicatingNetDevice::GetTypeId (void) diff --git a/src/spectrum/model/single-model-spectrum-channel.cc b/src/spectrum/model/single-model-spectrum-channel.cc index 0c6141154..f2f9779df 100644 --- a/src/spectrum/model/single-model-spectrum-channel.cc +++ b/src/spectrum/model/single-model-spectrum-channel.cc @@ -44,7 +44,8 @@ NS_LOG_COMPONENT_DEFINE ("SingleModelSpectrumChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel); +NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel) + ; SingleModelSpectrumChannel::SingleModelSpectrumChannel () { diff --git a/src/spectrum/model/spectrum-analyzer.cc b/src/spectrum/model/spectrum-analyzer.cc index 661f046fc..76138d3da 100644 --- a/src/spectrum/model/spectrum-analyzer.cc +++ b/src/spectrum/model/spectrum-analyzer.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumAnalyzer"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer); +NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer) + ; SpectrumAnalyzer::SpectrumAnalyzer () : m_mobility (0), diff --git a/src/spectrum/model/spectrum-channel.cc b/src/spectrum/model/spectrum-channel.cc index c82c65638..5e8432a36 100644 --- a/src/spectrum/model/spectrum-channel.cc +++ b/src/spectrum/model/spectrum-channel.cc @@ -24,7 +24,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel); +NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel) + ; TypeId SpectrumChannel::GetTypeId (void) diff --git a/src/spectrum/model/spectrum-phy.cc b/src/spectrum/model/spectrum-phy.cc index 1f8f473d8..47b8cc0b8 100644 --- a/src/spectrum/model/spectrum-phy.cc +++ b/src/spectrum/model/spectrum-phy.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy); +NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy) + ; TypeId diff --git a/src/spectrum/model/spectrum-propagation-loss-model.cc b/src/spectrum/model/spectrum-propagation-loss-model.cc index 3bbb371de..529ca68c1 100644 --- a/src/spectrum/model/spectrum-propagation-loss-model.cc +++ b/src/spectrum/model/spectrum-propagation-loss-model.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("SpectrumPropagationLossModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel); +NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel) + ; SpectrumPropagationLossModel::SpectrumPropagationLossModel () : m_next (0) diff --git a/src/spectrum/model/waveform-generator.cc b/src/spectrum/model/waveform-generator.cc index 3d02bc6e0..a1bf5548a 100644 --- a/src/spectrum/model/waveform-generator.cc +++ b/src/spectrum/model/waveform-generator.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("WaveformGenerator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator); +NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator) + ; WaveformGenerator::WaveformGenerator () : m_mobility (0), diff --git a/src/stats/examples/double-probe-example.cc b/src/stats/examples/double-probe-example.cc index 511286ac5..4a6a73795 100644 --- a/src/stats/examples/double-probe-example.cc +++ b/src/stats/examples/double-probe-example.cc @@ -50,7 +50,8 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter); +NS_OBJECT_ENSURE_REGISTERED (Emitter) + ; TypeId Emitter::GetTypeId (void) diff --git a/src/stats/examples/file-helper-example.cc b/src/stats/examples/file-helper-example.cc index 1d4d4880e..e3337ff42 100644 --- a/src/stats/examples/file-helper-example.cc +++ b/src/stats/examples/file-helper-example.cc @@ -53,7 +53,8 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter); +NS_OBJECT_ENSURE_REGISTERED (Emitter) + ; TypeId Emitter::GetTypeId (void) diff --git a/src/stats/examples/gnuplot-helper-example.cc b/src/stats/examples/gnuplot-helper-example.cc index 397f9d2cf..c53bdc4ff 100644 --- a/src/stats/examples/gnuplot-helper-example.cc +++ b/src/stats/examples/gnuplot-helper-example.cc @@ -53,7 +53,8 @@ private: }; -NS_OBJECT_ENSURE_REGISTERED (Emitter); +NS_OBJECT_ENSURE_REGISTERED (Emitter) + ; TypeId Emitter::GetTypeId (void) diff --git a/src/stats/model/boolean-probe.cc b/src/stats/model/boolean-probe.cc index d27b50271..8ef1274b3 100644 --- a/src/stats/model/boolean-probe.cc +++ b/src/stats/model/boolean-probe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("BooleanProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BooleanProbe); +NS_OBJECT_ENSURE_REGISTERED (BooleanProbe) + ; TypeId BooleanProbe::GetTypeId () diff --git a/src/stats/model/data-collection-object.cc b/src/stats/model/data-collection-object.cc index 3c26492fc..1ed381adf 100644 --- a/src/stats/model/data-collection-object.cc +++ b/src/stats/model/data-collection-object.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("DataCollectionObject"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject); +NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject) + ; TypeId DataCollectionObject::GetTypeId (void) diff --git a/src/stats/model/double-probe.cc b/src/stats/model/double-probe.cc index b3ff59191..ad4f89394 100644 --- a/src/stats/model/double-probe.cc +++ b/src/stats/model/double-probe.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("DoubleProbe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (DoubleProbe); +NS_OBJECT_ENSURE_REGISTERED (DoubleProbe) + ; TypeId DoubleProbe::GetTypeId () diff --git a/src/stats/model/file-aggregator.cc b/src/stats/model/file-aggregator.cc index 4a3743560..c091aae9b 100644 --- a/src/stats/model/file-aggregator.cc +++ b/src/stats/model/file-aggregator.cc @@ -30,7 +30,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("FileAggregator"); -NS_OBJECT_ENSURE_REGISTERED (FileAggregator); +NS_OBJECT_ENSURE_REGISTERED (FileAggregator) + ; TypeId FileAggregator::GetTypeId () diff --git a/src/stats/model/gnuplot-aggregator.cc b/src/stats/model/gnuplot-aggregator.cc index a580404ca..7e0003021 100644 --- a/src/stats/model/gnuplot-aggregator.cc +++ b/src/stats/model/gnuplot-aggregator.cc @@ -29,7 +29,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator"); -NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator); +NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator) + ; TypeId GnuplotAggregator::GetTypeId () diff --git a/src/stats/model/probe.cc b/src/stats/model/probe.cc index 260ca0314..4d3d85f3d 100644 --- a/src/stats/model/probe.cc +++ b/src/stats/model/probe.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Probe); +NS_OBJECT_ENSURE_REGISTERED (Probe) + ; TypeId Probe::GetTypeId () diff --git a/src/stats/model/time-series-adaptor.cc b/src/stats/model/time-series-adaptor.cc index a1d787bfa..0f4d574f3 100644 --- a/src/stats/model/time-series-adaptor.cc +++ b/src/stats/model/time-series-adaptor.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("TimeSeriesAdaptor"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor); +NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor) + ; TypeId TimeSeriesAdaptor::GetTypeId (void) diff --git a/src/stats/model/uinteger-16-probe.cc b/src/stats/model/uinteger-16-probe.cc index 6e70e5ac3..d699646e6 100644 --- a/src/stats/model/uinteger-16-probe.cc +++ b/src/stats/model/uinteger-16-probe.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger16Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe); +NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe) + ; TypeId Uinteger16Probe::GetTypeId () diff --git a/src/stats/model/uinteger-32-probe.cc b/src/stats/model/uinteger-32-probe.cc index 28f9fdcff..275090f26 100644 --- a/src/stats/model/uinteger-32-probe.cc +++ b/src/stats/model/uinteger-32-probe.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger32Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe); +NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe) + ; TypeId Uinteger32Probe::GetTypeId () diff --git a/src/stats/model/uinteger-8-probe.cc b/src/stats/model/uinteger-8-probe.cc index 823af2847..77d5eea83 100644 --- a/src/stats/model/uinteger-8-probe.cc +++ b/src/stats/model/uinteger-8-probe.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("Uinteger8Probe"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe); +NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe) + ; TypeId Uinteger8Probe::GetTypeId () diff --git a/src/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc index 2fd2439af..83f9c9144 100644 --- a/src/tap-bridge/model/tap-bridge.cc +++ b/src/tap-bridge/model/tap-bridge.cc @@ -89,7 +89,8 @@ FdReader::Data TapBridgeFdReader::DoRead (void) #define TAP_MAGIC 95549 -NS_OBJECT_ENSURE_REGISTERED (TapBridge); +NS_OBJECT_ENSURE_REGISTERED (TapBridge) + ; TypeId TapBridge::GetTypeId (void) diff --git a/src/topology-read/model/inet-topology-reader.cc b/src/topology-read/model/inet-topology-reader.cc index 2f2e5bb69..e30a41713 100644 --- a/src/topology-read/model/inet-topology-reader.cc +++ b/src/topology-read/model/inet-topology-reader.cc @@ -32,7 +32,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("InetTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader); +NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader) + ; TypeId InetTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/orbis-topology-reader.cc b/src/topology-read/model/orbis-topology-reader.cc index 49fa60727..16ee8a8a1 100644 --- a/src/topology-read/model/orbis-topology-reader.cc +++ b/src/topology-read/model/orbis-topology-reader.cc @@ -32,7 +32,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader); +NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader) + ; TypeId OrbisTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/rocketfuel-topology-reader.cc b/src/topology-read/model/rocketfuel-topology-reader.cc index 2f302fa90..0cf7b2fb2 100644 --- a/src/topology-read/model/rocketfuel-topology-reader.cc +++ b/src/topology-read/model/rocketfuel-topology-reader.cc @@ -32,7 +32,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader); +NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader) + ; TypeId RocketfuelTopologyReader::GetTypeId (void) { diff --git a/src/topology-read/model/topology-reader.cc b/src/topology-read/model/topology-reader.cc index b531a6d98..e816eb4e8 100644 --- a/src/topology-read/model/topology-reader.cc +++ b/src/topology-read/model/topology-reader.cc @@ -28,7 +28,8 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("TopologyReader"); -NS_OBJECT_ENSURE_REGISTERED (TopologyReader); +NS_OBJECT_ENSURE_REGISTERED (TopologyReader) + ; TypeId TopologyReader::GetTypeId (void) { diff --git a/src/uan/model/acoustic-modem-energy-model.cc b/src/uan/model/acoustic-modem-energy-model.cc index da226c847..cfe872cdc 100644 --- a/src/uan/model/acoustic-modem-energy-model.cc +++ b/src/uan/model/acoustic-modem-energy-model.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("AcousticModemEnergyModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel); +NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel) + ; TypeId AcousticModemEnergyModel::GetTypeId (void) diff --git a/src/uan/model/uan-channel.cc b/src/uan/model/uan-channel.cc index f737313da..02da86d4c 100644 --- a/src/uan/model/uan-channel.cc +++ b/src/uan/model/uan-channel.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("UanChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanChannel); +NS_OBJECT_ENSURE_REGISTERED (UanChannel) + ; TypeId UanChannel::GetTypeId () diff --git a/src/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc index 461ee8b39..a28f65cce 100644 --- a/src/uan/model/uan-header-common.cc +++ b/src/uan/model/uan-header-common.cc @@ -23,7 +23,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon) + ; UanHeaderCommon::UanHeaderCommon () { diff --git a/src/uan/model/uan-header-rc.cc b/src/uan/model/uan-header-rc.cc index 14b9af783..0ff19bb0f 100644 --- a/src/uan/model/uan-header-rc.cc +++ b/src/uan/model/uan-header-rc.cc @@ -25,11 +25,16 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData); -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts); -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal); -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts); -NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck); +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcData) + ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcRts) + ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCtsGlobal) + ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcCts) + ; +NS_OBJECT_ENSURE_REGISTERED (UanHeaderRcAck) + ; UanHeaderRcData::UanHeaderRcData () : Header (), diff --git a/src/uan/model/uan-mac-aloha.cc b/src/uan/model/uan-mac-aloha.cc index ff0a677be..49b290450 100644 --- a/src/uan/model/uan-mac-aloha.cc +++ b/src/uan/model/uan-mac-aloha.cc @@ -32,7 +32,8 @@ NS_LOG_COMPONENT_DEFINE ("UanMacAloha"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacAloha); +NS_OBJECT_ENSURE_REGISTERED (UanMacAloha) + ; UanMacAloha::UanMacAloha () : UanMac (), diff --git a/src/uan/model/uan-mac-cw.cc b/src/uan/model/uan-mac-cw.cc index fca6ba551..d9a61be24 100644 --- a/src/uan/model/uan-mac-cw.cc +++ b/src/uan/model/uan-mac-cw.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("UanMacCw"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacCw); +NS_OBJECT_ENSURE_REGISTERED (UanMacCw) + ; UanMacCw::UanMacCw () : UanMac (), diff --git a/src/uan/model/uan-mac-rc-gw.cc b/src/uan/model/uan-mac-rc-gw.cc index 9f998905a..765668441 100644 --- a/src/uan/model/uan-mac-rc-gw.cc +++ b/src/uan/model/uan-mac-rc-gw.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("UanMacRcGw"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw); +NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw) + ; bool operator < (UanAddress &a, UanAddress &b) diff --git a/src/uan/model/uan-mac-rc.cc b/src/uan/model/uan-mac-rc.cc index a57ae2abb..1ea57e0a8 100644 --- a/src/uan/model/uan-mac-rc.cc +++ b/src/uan/model/uan-mac-rc.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("UanMacRc"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMacRc); +NS_OBJECT_ENSURE_REGISTERED (UanMacRc) + ; Reservation::Reservation () : m_length (0), diff --git a/src/uan/model/uan-mac.cc b/src/uan/model/uan-mac.cc index d57add264..f9dd40216 100644 --- a/src/uan/model/uan-mac.cc +++ b/src/uan/model/uan-mac.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanMac); +NS_OBJECT_ENSURE_REGISTERED (UanMac) + ; TypeId UanMac::GetTypeId (void) { diff --git a/src/uan/model/uan-net-device.cc b/src/uan/model/uan-net-device.cc index 65dcb61ae..aa937379e 100644 --- a/src/uan/model/uan-net-device.cc +++ b/src/uan/model/uan-net-device.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("UanNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNetDevice); +NS_OBJECT_ENSURE_REGISTERED (UanNetDevice) + ; UanNetDevice::UanNetDevice () : NetDevice (), diff --git a/src/uan/model/uan-noise-model-default.cc b/src/uan/model/uan-noise-model-default.cc index d16a3ff9e..b0d301747 100644 --- a/src/uan/model/uan-noise-model-default.cc +++ b/src/uan/model/uan-noise-model-default.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault); +NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault) + ; UanNoiseModelDefault::UanNoiseModelDefault () { diff --git a/src/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc index dc5524a60..e58972bc9 100644 --- a/src/uan/model/uan-noise-model.cc +++ b/src/uan/model/uan-noise-model.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel); +NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel) + ; TypeId UanNoiseModel::GetTypeId (void) { diff --git a/src/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc index b2521ac9a..40d34a6a1 100644 --- a/src/uan/model/uan-phy-dual.cc +++ b/src/uan/model/uan-phy-dual.cc @@ -41,8 +41,10 @@ NS_LOG_COMPONENT_DEFINE ("UanPhyDual"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyDual); -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual); +NS_OBJECT_ENSURE_REGISTERED (UanPhyDual) + ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual) + ; UanPhyCalcSinrDual::UanPhyCalcSinrDual () { diff --git a/src/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc index 2b1920d63..737202c8a 100644 --- a/src/uan/model/uan-phy-gen.cc +++ b/src/uan/model/uan-phy-gen.cc @@ -40,11 +40,16 @@ NS_LOG_COMPONENT_DEFINE ("UanPhyGen"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyGen); -NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault); -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault); -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk); -NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem); +NS_OBJECT_ENSURE_REGISTERED (UanPhyGen) + ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyPerGenDefault) + ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDefault) + ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrFhFsk) + ; +NS_OBJECT_ENSURE_REGISTERED (UanPhyPerUmodem) + ; /*************** UanPhyCalcSinrDefault definition *****************/ diff --git a/src/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc index f3d4a970a..867ab3148 100644 --- a/src/uan/model/uan-phy.cc +++ b/src/uan/model/uan-phy.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr); +NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr) + ; TypeId UanPhyCalcSinr::GetTypeId (void) { @@ -43,7 +44,8 @@ UanPhyCalcSinr::DoDispose () Object::DoDispose (); } -NS_OBJECT_ENSURE_REGISTERED (UanPhyPer); +NS_OBJECT_ENSURE_REGISTERED (UanPhyPer) + ; TypeId UanPhyPer::GetTypeId (void) { @@ -64,7 +66,8 @@ UanPhyPer::DoDispose () Object::DoDispose (); } -NS_OBJECT_ENSURE_REGISTERED (UanPhy); +NS_OBJECT_ENSURE_REGISTERED (UanPhy) + ; TypeId UanPhy::GetTypeId (void) { diff --git a/src/uan/model/uan-prop-model-ideal.cc b/src/uan/model/uan-prop-model-ideal.cc index dbd7167a9..895f0b91a 100644 --- a/src/uan/model/uan-prop-model-ideal.cc +++ b/src/uan/model/uan-prop-model-ideal.cc @@ -24,7 +24,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal); +NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal) + ; UanPropModelIdeal::UanPropModelIdeal () { diff --git a/src/uan/model/uan-prop-model-thorp.cc b/src/uan/model/uan-prop-model-thorp.cc index c49b59f90..4ce38069d 100644 --- a/src/uan/model/uan-prop-model-thorp.cc +++ b/src/uan/model/uan-prop-model-thorp.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("UanPropModelThorp"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp); +NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp) + ; UanPropModelThorp::UanPropModelThorp () { diff --git a/src/uan/model/uan-prop-model.cc b/src/uan/model/uan-prop-model.cc index f2fd35116..0043406ab 100644 --- a/src/uan/model/uan-prop-model.cc +++ b/src/uan/model/uan-prop-model.cc @@ -336,7 +336,8 @@ UanPdp::CreateImpulsePdp (void) return pdp; } -NS_OBJECT_ENSURE_REGISTERED (UanPropModel); +NS_OBJECT_ENSURE_REGISTERED (UanPropModel) + ; TypeId UanPropModel::GetTypeId (void) { diff --git a/src/uan/model/uan-transducer-hd.cc b/src/uan/model/uan-transducer-hd.cc index 05a385a4d..fbccbcea5 100644 --- a/src/uan/model/uan-transducer-hd.cc +++ b/src/uan/model/uan-transducer-hd.cc @@ -31,7 +31,9 @@ NS_LOG_COMPONENT_DEFINE ("UanTransducerHd"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd); +NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd) + ; + UanTransducerHd::UanTransducerHd () : UanTransducer (), m_state (RX), diff --git a/src/uan/model/uan-transducer.cc b/src/uan/model/uan-transducer.cc index 8b6c4a996..faca20d51 100644 --- a/src/uan/model/uan-transducer.cc +++ b/src/uan/model/uan-transducer.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UanTransducer); +NS_OBJECT_ENSURE_REGISTERED (UanTransducer) + ; TypeId UanTransducer::GetTypeId (void) { diff --git a/src/virtual-net-device/model/virtual-net-device.cc b/src/virtual-net-device/model/virtual-net-device.cc index bbbc35515..f19bc602d 100644 --- a/src/virtual-net-device/model/virtual-net-device.cc +++ b/src/virtual-net-device/model/virtual-net-device.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("VirtualNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice); +NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice) + ; TypeId VirtualNetDevice::GetTypeId (void) diff --git a/src/visualizer/model/visual-simulator-impl.cc b/src/visualizer/model/visual-simulator-impl.cc index 3d501b356..124b65d96 100644 --- a/src/visualizer/model/visual-simulator-impl.cc +++ b/src/visualizer/model/visual-simulator-impl.cc @@ -28,7 +28,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl); +NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl) + ; namespace { diff --git a/src/wifi/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc index 4b1afe5a2..b8989e913 100644 --- a/src/wifi/helper/athstats-helper.cc +++ b/src/wifi/helper/athstats-helper.cc @@ -105,7 +105,8 @@ AthstatsHelper::EnableAthstats (std::string filename, NodeContainer n) -NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink); +NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink) + ; TypeId AthstatsWifiTraceSink::GetTypeId (void) diff --git a/src/wifi/model/aarf-wifi-manager.cc b/src/wifi/model/aarf-wifi-manager.cc index dc1f8059a..774a4a5ef 100644 --- a/src/wifi/model/aarf-wifi-manager.cc +++ b/src/wifi/model/aarf-wifi-manager.cc @@ -46,7 +46,8 @@ struct AarfWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager); +NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager) + ; TypeId AarfWifiManager::GetTypeId (void) diff --git a/src/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc index aa422cddb..2b1077a03 100644 --- a/src/wifi/model/aarfcd-wifi-manager.cc +++ b/src/wifi/model/aarfcd-wifi-manager.cc @@ -53,7 +53,8 @@ struct AarfcdWifiRemoteStation : public WifiRemoteStation bool m_haveASuccess; }; -NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager); +NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager) + ; TypeId AarfcdWifiManager::GetTypeId (void) diff --git a/src/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc index 6b66c0a33..332cc217a 100644 --- a/src/wifi/model/adhoc-wifi-mac.cc +++ b/src/wifi/model/adhoc-wifi-mac.cc @@ -40,7 +40,8 @@ NS_LOG_COMPONENT_DEFINE ("AdhocWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac); +NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac) + ; TypeId AdhocWifiMac::GetTypeId (void) diff --git a/src/wifi/model/amrr-wifi-manager.cc b/src/wifi/model/amrr-wifi-manager.cc index 6501a541a..11939a523 100644 --- a/src/wifi/model/amrr-wifi-manager.cc +++ b/src/wifi/model/amrr-wifi-manager.cc @@ -44,7 +44,8 @@ struct AmrrWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager); +NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager) + ; TypeId AmrrWifiManager::GetTypeId (void) diff --git a/src/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc index 62c9776e4..86c4ca9e5 100644 --- a/src/wifi/model/amsdu-subframe-header.cc +++ b/src/wifi/model/amsdu-subframe-header.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("AmsduSubframeHeader"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader); +NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader) + ; TypeId AmsduSubframeHeader::GetTypeId () diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 955ac9ef2..9455345f3 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -42,7 +42,8 @@ NS_LOG_COMPONENT_DEFINE ("ApWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ApWifiMac); +NS_OBJECT_ENSURE_REGISTERED (ApWifiMac) + ; TypeId ApWifiMac::GetTypeId (void) diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 548944bc9..945cc0940 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -44,7 +44,8 @@ struct ArfWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager); +NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager) + ; TypeId ArfWifiManager::GetTypeId (void) diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index 7d4c35b8b..65b3d5cdd 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -40,7 +40,8 @@ struct CaraWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager); +NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager) + ; TypeId CaraWifiManager::GetTypeId (void) diff --git a/src/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc index 7075ea779..968b7de26 100644 --- a/src/wifi/model/constant-rate-wifi-manager.cc +++ b/src/wifi/model/constant-rate-wifi-manager.cc @@ -30,7 +30,8 @@ NS_LOG_COMPONENT_DEFINE ("ConstantRateWifiManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager); +NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager) + ; TypeId ConstantRateWifiManager::GetTypeId (void) diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index bd37fc699..af82c5e66 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -30,7 +30,8 @@ namespace ns3 { * Block ack request ***********************************/ -NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader) + ; CtrlBAckRequestHeader::CtrlBAckRequestHeader () : m_barAckPolicy (false), @@ -278,7 +279,8 @@ CtrlBAckRequestHeader::IsMultiTid (void) const * Block ack response ***********************************/ -NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader); +NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader) + ; CtrlBAckResponseHeader::CtrlBAckResponseHeader () : m_baAckPolicy (false), diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc index 013a74e93..04b02a7b4 100644 --- a/src/wifi/model/dca-txop.cc +++ b/src/wifi/model/dca-txop.cc @@ -112,7 +112,8 @@ private: DcaTxop *m_txop; }; -NS_OBJECT_ENSURE_REGISTERED (DcaTxop); +NS_OBJECT_ENSURE_REGISTERED (DcaTxop) + ; TypeId DcaTxop::GetTypeId (void) diff --git a/src/wifi/model/dcf.cc b/src/wifi/model/dcf.cc index bfacb36c9..7a06521dc 100644 --- a/src/wifi/model/dcf.cc +++ b/src/wifi/model/dcf.cc @@ -25,7 +25,8 @@ NS_LOG_COMPONENT_DEFINE ("Dcf"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Dcf); +NS_OBJECT_ENSURE_REGISTERED (Dcf) + ; TypeId Dcf::GetTypeId (void) diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index c03bb40b8..c62089731 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -138,7 +138,8 @@ private: EdcaTxopN *m_txop; }; -NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN); +NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN) + ; TypeId EdcaTxopN::GetTypeId (void) diff --git a/src/wifi/model/error-rate-model.cc b/src/wifi/model/error-rate-model.cc index 8cc49a563..1be1d9dbf 100644 --- a/src/wifi/model/error-rate-model.cc +++ b/src/wifi/model/error-rate-model.cc @@ -21,7 +21,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel); +NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel) + ; TypeId ErrorRateModel::GetTypeId (void) { diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index 282f9d19d..743229daf 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -32,7 +32,8 @@ struct IdealWifiRemoteStation : public WifiRemoteStation double m_lastSnr; }; -NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager); +NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager) + ; TypeId IdealWifiManager::GetTypeId (void) diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc index 5ed5a8a80..f831c42dd 100644 --- a/src/wifi/model/mgt-headers.cc +++ b/src/wifi/model/mgt-headers.cc @@ -29,7 +29,8 @@ namespace ns3 { * Probe Request ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader) + ; MgtProbeRequestHeader::~MgtProbeRequestHeader () { @@ -122,7 +123,8 @@ MgtProbeRequestHeader::Deserialize (Buffer::Iterator start) * Probe Response ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader) + ; MgtProbeResponseHeader::MgtProbeResponseHeader () { @@ -255,7 +257,8 @@ MgtProbeResponseHeader::Deserialize (Buffer::Iterator start) * Assoc Request ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader) + ; MgtAssocRequestHeader::MgtAssocRequestHeader () : m_listenInterval (0) @@ -367,7 +370,8 @@ MgtAssocRequestHeader::Deserialize (Buffer::Iterator start) * Assoc Response ***********************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader) + ; MgtAssocResponseHeader::MgtAssocResponseHeader () : m_aid (0) @@ -633,7 +637,8 @@ WifiActionHeader::Deserialize (Buffer::Iterator start) * ADDBARequest ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader) + ; MgtAddBaRequestHeader::MgtAddBaRequestHeader () : m_dialogToken (1), @@ -809,7 +814,8 @@ MgtAddBaRequestHeader::SetParameterSet (uint16_t params) * ADDBAResponse ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader) + ; MgtAddBaResponseHeader::MgtAddBaResponseHeader () : m_dialogToken (1), @@ -975,7 +981,8 @@ MgtAddBaResponseHeader::SetParameterSet (uint16_t params) * DelBa ****************************************************/ -NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader); +NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader) + ; MgtDelBaHeader::MgtDelBaHeader () : m_reasonCode (1) diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index 5cc4a01fc..f4a1b0853 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -78,7 +78,8 @@ struct MinstrelWifiRemoteStation : public WifiRemoteStation bool m_initialized; ///< for initializing tables }; -NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager); +NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager) + ; TypeId MinstrelWifiManager::GetTypeId (void) diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index fb5eb2446..39ae73c04 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("MsduAggregator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MsduAggregator); +NS_OBJECT_ENSURE_REGISTERED (MsduAggregator) + ; TypeId MsduAggregator::GetTypeId (void) diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc index c77516506..9820c83c2 100644 --- a/src/wifi/model/msdu-standard-aggregator.cc +++ b/src/wifi/model/msdu-standard-aggregator.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("MsduStandardAggregator"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator); +NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator) + ; TypeId MsduStandardAggregator::GetTypeId (void) diff --git a/src/wifi/model/nist-error-rate-model.cc b/src/wifi/model/nist-error-rate-model.cc index 8d2378712..c7a699c1c 100644 --- a/src/wifi/model/nist-error-rate-model.cc +++ b/src/wifi/model/nist-error-rate-model.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("NistErrorRateModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel); +NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel) + ; TypeId NistErrorRateModel::GetTypeId (void) diff --git a/src/wifi/model/onoe-wifi-manager.cc b/src/wifi/model/onoe-wifi-manager.cc index c1495a437..3428f6ef6 100644 --- a/src/wifi/model/onoe-wifi-manager.cc +++ b/src/wifi/model/onoe-wifi-manager.cc @@ -42,7 +42,8 @@ struct OnoeWifiRemoteStation : public WifiRemoteStation }; -NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager); +NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager) + ; TypeId OnoeWifiManager::GetTypeId (void) diff --git a/src/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc index bbc2a4125..7d73fb0bb 100644 --- a/src/wifi/model/qos-tag.cc +++ b/src/wifi/model/qos-tag.cc @@ -23,7 +23,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (QosTag); +NS_OBJECT_ENSURE_REGISTERED (QosTag) + ; TypeId QosTag::GetTypeId (void) diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc index 7c1acdb4e..c81cddc4f 100644 --- a/src/wifi/model/regular-wifi-mac.cc +++ b/src/wifi/model/regular-wifi-mac.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("RegularWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac); +NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac) + ; RegularWifiMac::RegularWifiMac () { diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index 7f21e0c6e..d08342cb2 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -46,7 +46,8 @@ struct RraaWifiRemoteStation : public WifiRemoteStation uint32_t m_rate; }; -NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager); +NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager) + ; TypeId RraaWifiManager::GetTypeId (void) diff --git a/src/wifi/model/snr-tag.cc b/src/wifi/model/snr-tag.cc index 92ff352c0..dc86557e2 100644 --- a/src/wifi/model/snr-tag.cc +++ b/src/wifi/model/snr-tag.cc @@ -28,7 +28,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SnrTag); +NS_OBJECT_ENSURE_REGISTERED (SnrTag) + ; TypeId SnrTag::GetTypeId (void) diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index aafec75a8..53b80d67e 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -60,7 +60,8 @@ NS_LOG_COMPONENT_DEFINE ("StaWifiMac"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (StaWifiMac); +NS_OBJECT_ENSURE_REGISTERED (StaWifiMac) + ; TypeId StaWifiMac::GetTypeId (void) diff --git a/src/wifi/model/wifi-channel.cc b/src/wifi/model/wifi-channel.cc index 59295d842..7f0afc11e 100644 --- a/src/wifi/model/wifi-channel.cc +++ b/src/wifi/model/wifi-channel.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("WifiChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiChannel); +NS_OBJECT_ENSURE_REGISTERED (WifiChannel) + ; TypeId WifiChannel::GetTypeId (void) diff --git a/src/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc index d3d0079ac..8e4f86819 100644 --- a/src/wifi/model/wifi-information-element-vector.cc +++ b/src/wifi/model/wifi-information-element-vector.cc @@ -24,7 +24,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector); +NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector) + ; WifiInformationElementVector::WifiInformationElementVector () : m_maxSize (1500) diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc index 3902b7729..7482635f2 100644 --- a/src/wifi/model/wifi-mac-header.cc +++ b/src/wifi/model/wifi-mac-header.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader); +NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader) + ; enum { diff --git a/src/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc index d7575eeec..b2a668634 100644 --- a/src/wifi/model/wifi-mac-queue.cc +++ b/src/wifi/model/wifi-mac-queue.cc @@ -29,7 +29,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue); +NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue) + ; WifiMacQueue::Item::Item (Ptr packet, const WifiMacHeader &hdr, diff --git a/src/wifi/model/wifi-mac-trailer.cc b/src/wifi/model/wifi-mac-trailer.cc index bb4579e42..5ab88bd5b 100644 --- a/src/wifi/model/wifi-mac-trailer.cc +++ b/src/wifi/model/wifi-mac-trailer.cc @@ -22,7 +22,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer); +NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer) + ; WifiMacTrailer::WifiMacTrailer () { diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 831b72cf0..3250e145e 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -24,7 +24,9 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiMac); +NS_OBJECT_ENSURE_REGISTERED (WifiMac) + ; + Time WifiMac::GetDefaultMaxPropagationDelay (void) diff --git a/src/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc index 6e6dee136..abfecb931 100644 --- a/src/wifi/model/wifi-net-device.cc +++ b/src/wifi/model/wifi-net-device.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("WifiNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice); +NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice) + ; TypeId WifiNetDevice::GetTypeId (void) diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc index b90ef7708..faab3fc95 100644 --- a/src/wifi/model/wifi-phy-state-helper.cc +++ b/src/wifi/model/wifi-phy-state-helper.cc @@ -26,7 +26,8 @@ NS_LOG_COMPONENT_DEFINE ("WifiPhyStateHelper"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper); +NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper) + ; TypeId WifiPhyStateHelper::GetTypeId (void) diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 4d9b8ce4c..2c99e7d00 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -48,7 +48,8 @@ WifiPhyListener::~WifiPhyListener () * The actual WifiPhy class ****************************************************************/ -NS_OBJECT_ENSURE_REGISTERED (WifiPhy); +NS_OBJECT_ENSURE_REGISTERED (WifiPhy) + ; TypeId WifiPhy::GetTypeId (void) diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index 644dfa9be..ac43c7898 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -239,7 +239,8 @@ HighLatencyCtsToSelfTxVectorTag::Print (std::ostream &os) const namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager); +NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager) + ; TypeId WifiRemoteStationManager::GetTypeId (void) diff --git a/src/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc index bb168fbd7..e2be83a4b 100644 --- a/src/wifi/model/yans-error-rate-model.cc +++ b/src/wifi/model/yans-error-rate-model.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("YansErrorRateModel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel); +NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel) + ; TypeId YansErrorRateModel::GetTypeId (void) diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index 01842901d..28be0f8aa 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("YansWifiChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel); +NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel) + ; TypeId YansWifiChannel::GetTypeId (void) diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index ba34f6761..06d7fa48c 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -42,7 +42,8 @@ NS_LOG_COMPONENT_DEFINE ("YansWifiPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy); +NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy) + ; TypeId YansWifiPhy::GetTypeId (void) diff --git a/src/wimax/model/bandwidth-manager.cc b/src/wimax/model/bandwidth-manager.cc index 1772233e1..843fc4cac 100644 --- a/src/wimax/model/bandwidth-manager.cc +++ b/src/wimax/model/bandwidth-manager.cc @@ -37,7 +37,8 @@ NS_LOG_COMPONENT_DEFINE ("BandwidthManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BandwidthManager); +NS_OBJECT_ENSURE_REGISTERED (BandwidthManager) + ; TypeId BandwidthManager::GetTypeId (void) { diff --git a/src/wimax/model/bs-link-manager.cc b/src/wimax/model/bs-link-manager.cc index 9dc50231f..c24d4d217 100644 --- a/src/wimax/model/bs-link-manager.cc +++ b/src/wimax/model/bs-link-manager.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("BSLinkManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSLinkManager); +NS_OBJECT_ENSURE_REGISTERED (BSLinkManager) + ; TypeId BSLinkManager::GetTypeId (void) { diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc index 5d2ae5471..9a4e7e672 100644 --- a/src/wimax/model/bs-net-device.cc +++ b/src/wimax/model/bs-net-device.cc @@ -50,7 +50,8 @@ NS_LOG_COMPONENT_DEFINE ("BaseStationNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice); +NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice) + ; TypeId BaseStationNetDevice::GetTypeId (void) { diff --git a/src/wimax/model/bs-scheduler-rtps.cc b/src/wimax/model/bs-scheduler-rtps.cc index d3c6031e7..9f7e042fe 100644 --- a/src/wimax/model/bs-scheduler-rtps.cc +++ b/src/wimax/model/bs-scheduler-rtps.cc @@ -41,7 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("BSSchedulerRtps"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps); +NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps) + ; TypeId BSSchedulerRtps::GetTypeId (void) diff --git a/src/wimax/model/bs-scheduler-simple.cc b/src/wimax/model/bs-scheduler-simple.cc index 56c89e5df..c8069b4ae 100644 --- a/src/wimax/model/bs-scheduler-simple.cc +++ b/src/wimax/model/bs-scheduler-simple.cc @@ -39,7 +39,8 @@ NS_LOG_COMPONENT_DEFINE ("BSSchedulerSimple"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple); +NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple) + ; TypeId BSSchedulerSimple::GetTypeId (void) { diff --git a/src/wimax/model/bs-scheduler.cc b/src/wimax/model/bs-scheduler.cc index 9d4dd4302..5c343e594 100644 --- a/src/wimax/model/bs-scheduler.cc +++ b/src/wimax/model/bs-scheduler.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("BSScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BSScheduler); +NS_OBJECT_ENSURE_REGISTERED (BSScheduler) + ; TypeId BSScheduler::GetTypeId (void) diff --git a/src/wimax/model/bs-uplink-scheduler-mbqos.cc b/src/wimax/model/bs-uplink-scheduler-mbqos.cc index a81fb7cb9..45ea3c28f 100644 --- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc +++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc @@ -33,7 +33,8 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerMBQoS"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS); +NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS) + ; UplinkSchedulerMBQoS::UplinkSchedulerMBQoS () { diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.cc b/src/wimax/model/bs-uplink-scheduler-rtps.cc index e0a589b8b..a649081a7 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.cc +++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc @@ -36,7 +36,9 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerRtps"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps); +NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps) + ; + UplinkSchedulerRtps::UplinkSchedulerRtps () { diff --git a/src/wimax/model/bs-uplink-scheduler-simple.cc b/src/wimax/model/bs-uplink-scheduler-simple.cc index 22e44292c..8c73c87c6 100644 --- a/src/wimax/model/bs-uplink-scheduler-simple.cc +++ b/src/wimax/model/bs-uplink-scheduler-simple.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerSimple"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple); +NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple) + ; UplinkSchedulerSimple::UplinkSchedulerSimple (void) { diff --git a/src/wimax/model/bs-uplink-scheduler.cc b/src/wimax/model/bs-uplink-scheduler.cc index 855509b9c..33bddabe1 100644 --- a/src/wimax/model/bs-uplink-scheduler.cc +++ b/src/wimax/model/bs-uplink-scheduler.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("UplinkScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler); +NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler) + ; UplinkScheduler::UplinkScheduler (void) : m_bs (0), diff --git a/src/wimax/model/burst-profile-manager.cc b/src/wimax/model/burst-profile-manager.cc index 4bc4ebaaa..73d408608 100644 --- a/src/wimax/model/burst-profile-manager.cc +++ b/src/wimax/model/burst-profile-manager.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("BurstProfileManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager); +NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager) + ; TypeId BurstProfileManager::GetTypeId (void) { diff --git a/src/wimax/model/connection-manager.cc b/src/wimax/model/connection-manager.cc index 2cca97390..123490a5f 100644 --- a/src/wimax/model/connection-manager.cc +++ b/src/wimax/model/connection-manager.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("ConnectionManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ConnectionManager); +NS_OBJECT_ENSURE_REGISTERED (ConnectionManager) + ; TypeId ConnectionManager::GetTypeId (void) { diff --git a/src/wimax/model/dl-mac-messages.cc b/src/wimax/model/dl-mac-messages.cc index ae0fd6d51..56239ab05 100644 --- a/src/wimax/model/dl-mac-messages.cc +++ b/src/wimax/model/dl-mac-messages.cc @@ -312,7 +312,8 @@ OfdmDlBurstProfile::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (Dcd); +NS_OBJECT_ENSURE_REGISTERED (Dcd) + ; Dcd::Dcd (void) : m_reserved (0), @@ -544,7 +545,8 @@ OfdmDlMapIe::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DlMap); +NS_OBJECT_ENSURE_REGISTERED (DlMap) + ; DlMap::DlMap (void) : m_dcdCount (0), diff --git a/src/wimax/model/ipcs-classifier.cc b/src/wimax/model/ipcs-classifier.cc index 2eae1d756..a3398f8f1 100644 --- a/src/wimax/model/ipcs-classifier.cc +++ b/src/wimax/model/ipcs-classifier.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("IpcsClassifier"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier); +NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier) + ; TypeId IpcsClassifier::GetTypeId (void) { diff --git a/src/wimax/model/mac-messages.cc b/src/wimax/model/mac-messages.cc index 595081aac..3dffe6e35 100644 --- a/src/wimax/model/mac-messages.cc +++ b/src/wimax/model/mac-messages.cc @@ -29,7 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("MACMESSAGES"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType); +NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType) + ; ManagementMessageType::ManagementMessageType (void) : m_type (~0) @@ -106,7 +107,8 @@ ManagementMessageType::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (RngReq); +NS_OBJECT_ENSURE_REGISTERED (RngReq) + ; RngReq::RngReq (void) : m_reserved (0), @@ -220,7 +222,8 @@ RngReq::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (RngRsp); +NS_OBJECT_ENSURE_REGISTERED (RngRsp) + ; RngRsp::RngRsp (void) : m_reserved (0), @@ -497,7 +500,8 @@ RngRsp::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaReq); +NS_OBJECT_ENSURE_REGISTERED (DsaReq) + ; DsaReq::DsaReq (void) : m_transactionId (0), @@ -631,7 +635,8 @@ DsaReq::SetServiceFlow (ServiceFlow sf) // ---------------------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaRsp); +NS_OBJECT_ENSURE_REGISTERED (DsaRsp) + ; DsaRsp::DsaRsp (void) : m_transactionId (0), @@ -771,7 +776,8 @@ DsaRsp::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (DsaAck); +NS_OBJECT_ENSURE_REGISTERED (DsaAck) + ; DsaAck::DsaAck (void) : m_transactionId (0), diff --git a/src/wimax/model/service-flow-manager.cc b/src/wimax/model/service-flow-manager.cc index 2d3eda046..6865003e7 100644 --- a/src/wimax/model/service-flow-manager.cc +++ b/src/wimax/model/service-flow-manager.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("ServiceFlowManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager); +NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager) + ; TypeId ServiceFlowManager::GetTypeId (void) { diff --git a/src/wimax/model/simple-ofdm-wimax-channel.cc b/src/wimax/model/simple-ofdm-wimax-channel.cc index 0c1f1e6a9..b51f81033 100644 --- a/src/wimax/model/simple-ofdm-wimax-channel.cc +++ b/src/wimax/model/simple-ofdm-wimax-channel.cc @@ -36,7 +36,8 @@ NS_LOG_COMPONENT_DEFINE ("simpleOfdmWimaxChannel"); namespace ns3 { -// NS_OBJECT_ENSURE_REGISTERED (simpleOfdmWimaxChannel); +// NS_OBJECT_ENSURE_REGISTERED (simpleOfdmWimaxChannel) +// ; SimpleOfdmWimaxChannel::SimpleOfdmWimaxChannel (void) diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index 0e65e4199..10f1f2852 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -38,7 +38,8 @@ NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy); +NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy) + ; TypeId SimpleOfdmWimaxPhy::GetTypeId (void) { diff --git a/src/wimax/model/ss-link-manager.cc b/src/wimax/model/ss-link-manager.cc index ba99cf55b..fcb262f5e 100644 --- a/src/wimax/model/ss-link-manager.cc +++ b/src/wimax/model/ss-link-manager.cc @@ -35,7 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("SSLinkManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSLinkManager); +NS_OBJECT_ENSURE_REGISTERED (SSLinkManager) + ; TypeId SSLinkManager::GetTypeId (void) { diff --git a/src/wimax/model/ss-manager.cc b/src/wimax/model/ss-manager.cc index 689957e57..339ac3cb2 100644 --- a/src/wimax/model/ss-manager.cc +++ b/src/wimax/model/ss-manager.cc @@ -28,7 +28,8 @@ NS_LOG_COMPONENT_DEFINE ("SSManager"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSManager); +NS_OBJECT_ENSURE_REGISTERED (SSManager) + ; TypeId SSManager::GetTypeId (void) { diff --git a/src/wimax/model/ss-net-device.cc b/src/wimax/model/ss-net-device.cc index 19a0a225c..96a4fc184 100644 --- a/src/wimax/model/ss-net-device.cc +++ b/src/wimax/model/ss-net-device.cc @@ -46,7 +46,8 @@ NS_LOG_COMPONENT_DEFINE ("SubscriberStationNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice); +NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice) + ; Time SubscriberStationNetDevice::GetDefaultLostDlMapInterval () { diff --git a/src/wimax/model/ss-scheduler.cc b/src/wimax/model/ss-scheduler.cc index 02814229f..773505142 100644 --- a/src/wimax/model/ss-scheduler.cc +++ b/src/wimax/model/ss-scheduler.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("SSScheduler"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (SSScheduler); +NS_OBJECT_ENSURE_REGISTERED (SSScheduler) + ; TypeId SSScheduler::GetTypeId (void) { diff --git a/src/wimax/model/ul-mac-messages.cc b/src/wimax/model/ul-mac-messages.cc index fae6080a7..5c6b7c9ad 100644 --- a/src/wimax/model/ul-mac-messages.cc +++ b/src/wimax/model/ul-mac-messages.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Ucd); +NS_OBJECT_ENSURE_REGISTERED (Ucd) + ; UcdChannelEncodings::UcdChannelEncodings (void) : m_bwReqOppSize (0), @@ -577,7 +578,8 @@ OfdmUlMapIe::Read (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (UlMap); +NS_OBJECT_ENSURE_REGISTERED (UlMap) + ; UlMap::UlMap (void) : m_reserved (0), diff --git a/src/wimax/model/wimax-channel.cc b/src/wimax/model/wimax-channel.cc index c877d6c3d..0bcb2d1f9 100644 --- a/src/wimax/model/wimax-channel.cc +++ b/src/wimax/model/wimax-channel.cc @@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("WimaxChannel"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxChannel); +NS_OBJECT_ENSURE_REGISTERED (WimaxChannel) + ; TypeId WimaxChannel::GetTypeId (void) { diff --git a/src/wimax/model/wimax-connection.cc b/src/wimax/model/wimax-connection.cc index a396e95c6..9ee3dd228 100644 --- a/src/wimax/model/wimax-connection.cc +++ b/src/wimax/model/wimax-connection.cc @@ -27,7 +27,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxConnection); +NS_OBJECT_ENSURE_REGISTERED (WimaxConnection) + ; TypeId WimaxConnection::GetTypeId (void) { diff --git a/src/wimax/model/wimax-mac-header.cc b/src/wimax/model/wimax-mac-header.cc index afa1602c7..0a95362da 100644 --- a/src/wimax/model/wimax-mac-header.cc +++ b/src/wimax/model/wimax-mac-header.cc @@ -25,7 +25,8 @@ namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (MacHeaderType); +NS_OBJECT_ENSURE_REGISTERED (MacHeaderType) + ; MacHeaderType::MacHeaderType (void) : m_type (0) @@ -92,7 +93,8 @@ uint32_t MacHeaderType::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader); +NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader) + ; GenericMacHeader::GenericMacHeader (void) : m_ht (0), @@ -296,7 +298,8 @@ bool GenericMacHeader::check_hcs (void) const // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader); +NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader) + ; BandwidthRequestHeader::BandwidthRequestHeader (void) : m_ht (1), @@ -478,7 +481,8 @@ bool BandwidthRequestHeader::check_hcs (void) const // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader); +NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader) + ; GrantManagementSubheader::GrantManagementSubheader (void) : m_si (0), @@ -569,7 +573,8 @@ uint32_t GrantManagementSubheader::Deserialize (Buffer::Iterator start) // ---------------------------------------------------------------------------------------------------------- -NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader); +NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader) + ; FragmentationSubheader::FragmentationSubheader (void) : m_fc (0), diff --git a/src/wimax/model/wimax-mac-queue.cc b/src/wimax/model/wimax-mac-queue.cc index b537505e4..96b94b006 100644 --- a/src/wimax/model/wimax-mac-queue.cc +++ b/src/wimax/model/wimax-mac-queue.cc @@ -31,7 +31,8 @@ NS_LOG_COMPONENT_DEFINE ("WimaxMacQueue"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue); +NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue) + ; WimaxMacQueue::QueueElement::QueueElement (void) : m_packet (Create ()), diff --git a/src/wimax/model/wimax-mac-to-mac-header.cc b/src/wimax/model/wimax-mac-to-mac-header.cc index 6bd3accc2..b61db932c 100644 --- a/src/wimax/model/wimax-mac-to-mac-header.cc +++ b/src/wimax/model/wimax-mac-to-mac-header.cc @@ -24,7 +24,8 @@ #include "ns3/log.h" namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader); +NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader) + ; WimaxMacToMacHeader::WimaxMacToMacHeader (void) : m_len (0) diff --git a/src/wimax/model/wimax-net-device.cc b/src/wimax/model/wimax-net-device.cc index 46c8836cb..f56beed43 100644 --- a/src/wimax/model/wimax-net-device.cc +++ b/src/wimax/model/wimax-net-device.cc @@ -43,7 +43,8 @@ NS_LOG_COMPONENT_DEFINE ("WimaxNetDevice"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice); +NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice) + ; uint32_t WimaxNetDevice::m_nrFrames = 0; uint8_t WimaxNetDevice::m_direction = ~0; diff --git a/src/wimax/model/wimax-phy.cc b/src/wimax/model/wimax-phy.cc index 23093f0a6..70bfdecaa 100644 --- a/src/wimax/model/wimax-phy.cc +++ b/src/wimax/model/wimax-phy.cc @@ -34,7 +34,8 @@ NS_LOG_COMPONENT_DEFINE ("WimaxPhy"); namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (WimaxPhy); +NS_OBJECT_ENSURE_REGISTERED (WimaxPhy) + ; TypeId WimaxPhy::GetTypeId (void) { diff --git a/src/wimax/model/wimax-tlv.cc b/src/wimax/model/wimax-tlv.cc index ac45ff322..bf7e79aaf 100644 --- a/src/wimax/model/wimax-tlv.cc +++ b/src/wimax/model/wimax-tlv.cc @@ -24,7 +24,8 @@ NS_LOG_COMPONENT_DEFINE ("Tlv"); namespace ns3 { -// NS_OBJECT_ENSURE_REGISTERED ("Tlv"); +// NS_OBJECT_ENSURE_REGISTERED ("Tlv") +// ; TypeId Tlv::GetInstanceTypeId (void) const {