--- a/src/antenna/model/antenna-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/antenna/model/antenna-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (AntennaModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AntennaModel);
AntennaModel::AntennaModel ()
--- a/src/antenna/model/cosine-antenna-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/antenna/model/cosine-antenna-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel);
TypeId
--- a/src/antenna/model/isotropic-antenna-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/antenna/model/isotropic-antenna-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel);
TypeId
--- a/src/antenna/model/parabolic-antenna-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/antenna/model/parabolic-antenna-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel);
TypeId
--- a/src/aodv/model/aodv-packet.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/aodv/model/aodv-packet.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace aodv
{
-NS_OBJECT_ENSURE_REGISTERED (TypeHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TypeHeader);
TypeHeader::TypeHeader (MessageType t) :
m_type (t), m_valid (true)
@@ -147,8 +146,7 @@
{
}
-NS_OBJECT_ENSURE_REGISTERED (RreqHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RreqHeader);
TypeId
RreqHeader::GetTypeId ()
@@ -287,8 +285,7 @@
m_lifeTime = uint32_t (lifeTime.GetMilliSeconds ());
}
-NS_OBJECT_ENSURE_REGISTERED (RrepHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RrepHeader);
TypeId
RrepHeader::GetTypeId ()
@@ -430,8 +427,7 @@
{
}
-NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RrepAckHeader);
TypeId
RrepAckHeader::GetTypeId ()
@@ -497,8 +493,7 @@
{
}
-NS_OBJECT_ENSURE_REGISTERED (RerrHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RerrHeader);
TypeId
RerrHeader::GetTypeId ()
--- a/src/aodv/model/aodv-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/aodv/model/aodv-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -48,8 +48,7 @@
{
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;
@@ -112,8 +111,7 @@
int32_t m_oif;
};
-NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DeferredRouteOutputTag);
//-----------------------------------------------------------------------------
--- a/src/applications/model/application-packet-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/application-packet-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe);
TypeId
ApplicationPacketProbe::GetTypeId ()
--- a/src/applications/model/bulk-send-application.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/bulk-send-application.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication);
TypeId
BulkSendApplication::GetTypeId (void)
--- a/src/applications/model/onoff-application.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/onoff-application.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (OnOffApplication)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OnOffApplication);
TypeId
OnOffApplication::GetTypeId (void)
--- a/src/applications/model/packet-loss-counter.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/packet-loss-counter.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter")
- ;
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)
--- a/src/applications/model/packet-sink.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/packet-sink.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,10 +34,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PacketSink")
- ;
-NS_OBJECT_ENSURE_REGISTERED (PacketSink)
- ;
+NS_LOG_COMPONENT_DEFINE ("PacketSink");
+NS_OBJECT_ENSURE_REGISTERED (PacketSink);
TypeId
PacketSink::GetTypeId (void)
--- a/src/applications/model/ping6.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/ping6.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,11 +38,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ping6Application")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ping6Application");
-NS_OBJECT_ENSURE_REGISTERED (Ping6)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ping6);
TypeId Ping6::GetTypeId ()
{
--- a/src/applications/model/radvd-interface.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/radvd-interface.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("RadvdInterface")
- ;
+NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
RadvdInterface::RadvdInterface (uint32_t interface)
: m_interface (interface)
--- a/src/applications/model/radvd-prefix.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/radvd-prefix.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("RadvdPrefix")
- ;
+NS_LOG_COMPONENT_DEFINE ("RadvdPrefix");
RadvdPrefix::RadvdPrefix (Ipv6Address network, uint8_t prefixLength, uint32_t preferredLifeTime, uint32_t validLifeTime, bool onLinkFlag, bool autonomousFlag, bool routerAddrFlag)
: m_network (network),
--- a/src/applications/model/radvd.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/radvd.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,11 +40,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("RadvdApplication")
- ;
+NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
-NS_OBJECT_ENSURE_REGISTERED (Radvd)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Radvd);
TypeId Radvd::GetTypeId ()
{
--- a/src/applications/model/seq-ts-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/seq-ts-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader);
SeqTsHeader::SeqTsHeader ()
: m_seq (0),
--- a/src/applications/model/udp-client.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/udp-client.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,10 +35,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("UdpClient")
- ;
-NS_OBJECT_ENSURE_REGISTERED (UdpClient)
- ;
+NS_LOG_COMPONENT_DEFINE ("UdpClient");
+NS_OBJECT_ENSURE_REGISTERED (UdpClient);
TypeId
UdpClient::GetTypeId (void)
--- a/src/applications/model/udp-echo-client.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/udp-echo-client.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,10 +31,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication")
- ;
-NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient)
- ;
+NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
+NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient);
TypeId
UdpEchoClient::GetTypeId (void)
--- a/src/applications/model/udp-echo-server.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/udp-echo-server.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,10 +34,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication")
- ;
-NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer)
- ;
+NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
+NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer);
TypeId
UdpEchoServer::GetTypeId (void)
--- a/src/applications/model/udp-server.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/udp-server.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,10 +36,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("UdpServer")
- ;
-NS_OBJECT_ENSURE_REGISTERED (UdpServer)
- ;
+NS_LOG_COMPONENT_DEFINE ("UdpServer");
+NS_OBJECT_ENSURE_REGISTERED (UdpServer);
TypeId
--- a/src/applications/model/udp-trace-client.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/udp-trace-client.cc Wed Mar 05 17:06:59 2014 -0800
@@ -37,10 +37,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("UdpTraceClient")
- ;
-NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient)
- ;
+NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
+NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient);
/**
* \brief Default trace to send
--- a/src/applications/model/v4ping.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/applications/model/v4ping.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,10 +28,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("V4Ping")
- ;
-NS_OBJECT_ENSURE_REGISTERED (V4Ping)
- ;
+NS_LOG_COMPONENT_DEFINE ("V4Ping");
+NS_OBJECT_ENSURE_REGISTERED (V4Ping);
TypeId
V4Ping::GetTypeId (void)
--- a/src/bridge/model/bridge-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/bridge/model/bridge-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BridgeChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BridgeChannel);
TypeId
BridgeChannel::GetTypeId (void)
--- a/src/bridge/model/bridge-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/bridge/model/bridge-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice);
TypeId
--- a/src/buildings/helper/building-allocator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/helper/building-allocator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator);
GridBuildingAllocator::GridBuildingAllocator ()
: m_current (0)
--- a/src/buildings/helper/building-position-allocator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/helper/building-position-allocator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -37,8 +37,7 @@
using namespace ns3;
-NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomBuildingPositionAllocator);
RandomBuildingPositionAllocator::RandomBuildingPositionAllocator ()
@@ -105,8 +104,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomRoomPositionAllocator);
RandomRoomPositionAllocator::RandomRoomPositionAllocator ()
@@ -194,8 +192,7 @@
-NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SameRoomPositionAllocator);
SameRoomPositionAllocator::SameRoomPositionAllocator ()
{
@@ -285,8 +282,7 @@
return 1;
}
-NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FixedRoomPositionAllocator);
FixedRoomPositionAllocator::FixedRoomPositionAllocator (
--- a/src/buildings/model/building-list.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/building-list.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("BuildingList")
- ;
+NS_LOG_COMPONENT_DEFINE ("BuildingList");
/**
* \brief private implementation detail of the BuildingList API.
@@ -58,8 +57,7 @@
std::vector<Ptr<Building> > m_buildings;
};
-NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BuildingListPriv);
TypeId
BuildingListPriv::GetTypeId (void)
--- a/src/buildings/model/building.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/building.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Building)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Building);
TypeId
Building::GetTypeId (void)
--- a/src/buildings/model/buildings-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/buildings-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel);
BuildingsPropagationLossModel::ShadowingLoss::ShadowingLoss ()
{
--- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel);
--- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/itu-r-1238-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel);
TypeId
--- a/src/buildings/model/mobility-building-info.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/mobility-building-info.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo);
TypeId
MobilityBuildingInfo::GetTypeId (void)
--- a/src/buildings/model/oh-buildings-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel);
--- a/src/click/model/ipv4-click-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/click/model/ipv4-click-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -45,8 +45,7 @@
#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> > Ipv4ClickRouting::m_clickInstanceFromSimNode;
--- a/src/click/model/ipv4-l3-click-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/click/model/ipv4-l3-click-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800;
-NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4L3ClickProtocol);
TypeId
Ipv4L3ClickProtocol::GetTypeId (void)
--- a/src/config-store/examples/config-store-save.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/config-store/examples/config-store-save.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
int16_t m_int16;
};
-NS_OBJECT_ENSURE_REGISTERED (ConfigExample)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConfigExample);
// Assign a new default value to A::TestInt16 (-5)
// Configure a TestInt16 value for a special instance of A (to -3)
--- a/src/config-store/model/config-store.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/config-store/model/config-store.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConfigStore)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConfigStore);
TypeId
ConfigStore::GetTypeId (void)
--- a/src/config-store/model/gtk-config-store.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/config-store/model/gtk-config-store.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("GtkconfigStore")
- ;
+NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
GtkConfigStore::GtkConfigStore ()
--- a/src/core/model/attribute-construction-list.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/attribute-construction-list.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE("AttributeConstructionList")
- ;
+NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
AttributeConstructionList::AttributeConstructionList ()
{
--- a/src/core/model/calendar-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/calendar-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,11 +28,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("CalendarScheduler")
- ;
+NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
-NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler);
TypeId
CalendarScheduler::GetTypeId (void)
--- a/src/core/model/default-simulator-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/default-simulator-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl);
TypeId
DefaultSimulatorImpl::GetTypeId (void)
--- a/src/core/model/global-value.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/global-value.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("GlobalValue")
- ;
+NS_LOG_COMPONENT_DEFINE ("GlobalValue");
GlobalValue::GlobalValue (std::string name, std::string help,
const AttributeValue &initialValue,
--- a/src/core/model/hash-fnv.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/hash-fnv.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Hash-Fnv")
- ;
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
namespace Hash {
--- a/src/core/model/hash-function.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/hash-function.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("HashFunction")
- ;
+NS_LOG_COMPONENT_DEFINE ("HashFunction");
namespace Hash {
--- a/src/core/model/hash-murmur3.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/hash-murmur3.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3")
- ;
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
namespace Hash {
--- a/src/core/model/hash.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/hash.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Hash")
- ;
+NS_LOG_COMPONENT_DEFINE ("Hash");
Hasher::Hasher ()
{
--- a/src/core/model/heap-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/heap-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (HeapScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HeapScheduler);
TypeId
HeapScheduler::GetTypeId (void)
--- a/src/core/model/list-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/list-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ListScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ListScheduler);
TypeId
ListScheduler::GetTypeId (void)
--- a/src/core/model/map-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/map-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MapScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MapScheduler);
TypeId
MapScheduler::GetTypeId (void)
--- a/src/core/model/names.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/names.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Names")
- ;
+NS_LOG_COMPONENT_DEFINE ("Names");
class NameNode
{
--- a/src/core/model/object-base.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/object-base.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ObjectBase)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ObjectBase);
static TypeId
GetObjectIid (void)
--- a/src/core/model/object-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/object-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE("ObjectFactory")
- ;
+NS_LOG_COMPONENT_DEFINE("ObjectFactory");
ObjectFactory::ObjectFactory ()
{
--- a/src/core/model/object.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/object.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
* The Object implementation
*********************************************************************/
-NS_OBJECT_ENSURE_REGISTERED (Object)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Object);
Object::AggregateIterator::AggregateIterator ()
: m_object (0),
--- a/src/core/model/random-variable-stream.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/random-variable-stream.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomVariableStream);
TypeId
RandomVariableStream::GetTypeId (void)
@@ -131,8 +130,7 @@
return m_rng;
}
-NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(UniformRandomVariable);
TypeId
UniformRandomVariable::GetTypeId (void)
@@ -202,8 +200,7 @@
return (uint32_t)GetValue (m_min, m_max + 1);
}
-NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ConstantRandomVariable);
TypeId
ConstantRandomVariable::GetTypeId (void)
@@ -257,8 +254,7 @@
return (uint32_t)GetValue (m_constant);
}
-NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(SequentialRandomVariable);
TypeId
SequentialRandomVariable::GetTypeId (void)
@@ -357,8 +353,7 @@
return (uint32_t)GetValue ();
}
-NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ExponentialRandomVariable);
TypeId
ExponentialRandomVariable::GetTypeId (void)
@@ -439,8 +434,7 @@
return (uint32_t)GetValue (m_mean, m_bound);
}
-NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ParetoRandomVariable);
TypeId
ParetoRandomVariable::GetTypeId (void)
@@ -535,8 +529,7 @@
return (uint32_t)GetValue (m_mean, m_shape, m_bound);
}
-NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(WeibullRandomVariable);
TypeId
WeibullRandomVariable::GetTypeId (void)
@@ -629,8 +622,7 @@
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;
@@ -749,8 +741,7 @@
return (uint32_t)GetValue (m_mean, m_variance, m_bound);
}
-NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(LogNormalRandomVariable);
TypeId
LogNormalRandomVariable::GetTypeId (void)
@@ -869,8 +860,7 @@
return (uint32_t)GetValue (m_mu, m_sigma);
}
-NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(GammaRandomVariable);
TypeId
GammaRandomVariable::GetTypeId (void)
@@ -1045,8 +1035,7 @@
}
}
-NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ErlangRandomVariable);
TypeId
ErlangRandomVariable::GetTypeId (void)
@@ -1157,8 +1146,7 @@
}
}
-NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(TriangularRandomVariable);
TypeId
TriangularRandomVariable::GetTypeId (void)
@@ -1252,8 +1240,7 @@
return (uint32_t)GetValue (m_mean, m_min, m_max);
}
-NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ZipfRandomVariable);
TypeId
ZipfRandomVariable::GetTypeId (void)
@@ -1343,8 +1330,7 @@
return (uint32_t)GetValue (m_n, m_alpha);
}
-NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(ZetaRandomVariable);
TypeId
ZetaRandomVariable::GetTypeId (void)
@@ -1427,8 +1413,7 @@
return (uint32_t)GetValue (m_alpha);
}
-NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(DeterministicRandomVariable);
TypeId
DeterministicRandomVariable::GetTypeId (void)
@@ -1500,8 +1485,7 @@
return (uint32_t)GetValue ();
}
-NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable)
- ;
+NS_OBJECT_ENSURE_REGISTERED(EmpiricalRandomVariable);
// ValueCDF methods
EmpiricalRandomVariable::ValueCDF::ValueCDF ()
--- a/src/core/model/random-variable.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/random-variable.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
// -----------------------------------------------------------------------------
// RandomVariableBase methods
-NS_LOG_COMPONENT_DEFINE ("RandomVariable")
- ;
+NS_LOG_COMPONENT_DEFINE ("RandomVariable");
/** \ingroup legacyrandom */
class RandomVariableBase
--- a/src/core/model/realtime-simulator-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/realtime-simulator-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RealtimeSimulatorImpl);
TypeId
RealtimeSimulatorImpl::GetTypeId (void)
--- a/src/core/model/scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Scheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Scheduler);
Scheduler::~Scheduler ()
{
--- a/src/core/model/synchronizer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/synchronizer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Synchronizer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Synchronizer);
TypeId
Synchronizer::GetTypeId (void)
--- a/src/core/model/test.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/test.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Test")
- ;
+NS_LOG_COMPONENT_DEFINE ("Test");
bool
TestDoubleIsEqual (const double x1, const double x2, const double epsilon)
--- a/src/core/model/type-id.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/model/type-id.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("TypeId")
- ;
+NS_LOG_COMPONENT_DEFINE ("TypeId");
// IidManager needs to be in ns3 namespace for NS_ASSERT and NS_LOG
// to find g_log
--- a/src/core/test/attribute-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/test/attribute-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -72,8 +72,7 @@
Derived () {}
};
-NS_OBJECT_ENSURE_REGISTERED (Derived)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Derived);
class AttributeObjectTest : public Object
{
@@ -264,8 +263,7 @@
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
--- a/src/core/test/object-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/core/test/object-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -89,14 +89,10 @@
}
};
-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
--- a/src/csma/model/csma-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/csma/model/csma-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (CsmaChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CsmaChannel);
TypeId
CsmaChannel::GetTypeId (void)
--- a/src/csma/model/csma-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/csma/model/csma-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -37,8 +37,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice);
TypeId
CsmaNetDevice::GetTypeId (void)
--- a/src/dsdv/model/dsdv-packet.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsdv/model/dsdv-packet.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,9 @@
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),
--- a/src/dsdv/model/dsdv-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsdv/model/dsdv-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,8 @@
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;
--- a/src/dsr/model/dsr-fs-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-fs-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,8 +39,7 @@
NS_LOG_COMPONENT_DEFINE ("DsrFsHeader");
-NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrFsHeader);
TypeId DsrFsHeader::GetTypeId ()
{
@@ -259,8 +258,7 @@
return m_optionData;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrRoutingHeader);
TypeId DsrRoutingHeader::GetTypeId ()
{
--- a/src/dsr/model/dsr-gratuitous-reply-table.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-gratuitous-reply-table.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
namespace ns3 {
namespace dsr {
-NS_OBJECT_ENSURE_REGISTERED (GraReply)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GraReply);
TypeId GraReply::GetTypeId ()
{
--- a/src/dsr/model/dsr-network-queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-network-queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
namespace dsr {
-NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrNetworkQueue);
TypeId
DsrNetworkQueue::GetTypeId (void)
--- a/src/dsr/model/dsr-option-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-option-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -42,8 +42,7 @@
namespace dsr {
NS_LOG_COMPONENT_DEFINE ("DsrOptionHeader");
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionHeader);
TypeId DsrOptionHeader::GetTypeId ()
{
@@ -131,8 +130,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1Header);
TypeId DsrOptionPad1Header::GetTypeId ()
{
@@ -183,8 +181,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadnHeader);
TypeId DsrOptionPadnHeader::GetTypeId ()
{
@@ -244,8 +241,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreqHeader);
TypeId DsrOptionRreqHeader::GetTypeId ()
{
@@ -392,8 +388,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrepHeader);
TypeId DsrOptionRrepHeader::GetTypeId ()
{
@@ -514,8 +509,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionSRHeader);
TypeId DsrOptionSRHeader::GetTypeId ()
{
@@ -657,8 +651,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrHeader);
TypeId DsrOptionRerrHeader::GetTypeId ()
{
@@ -786,8 +779,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnreachHeader);
TypeId DsrOptionRerrUnreachHeader::GetTypeId ()
{
@@ -915,8 +907,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerrUnsupportHeader);
TypeId DsrOptionRerrUnsupportHeader::GetTypeId ()
{
@@ -1034,8 +1025,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReqHeader);
TypeId DsrOptionAckReqHeader::GetTypeId ()
{
@@ -1110,8 +1100,7 @@
return retVal;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckHeader);
TypeId DsrOptionAckHeader::GetTypeId ()
{
--- a/src/dsr/model/dsr-options.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-options.cc Wed Mar 05 17:06:59 2014 -0800
@@ -65,8 +65,7 @@
namespace ns3 {
namespace dsr {
-NS_OBJECT_ENSURE_REGISTERED (DsrOptions)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptions);
TypeId DsrOptions::GetTypeId ()
{
@@ -372,8 +371,7 @@
return 0;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPad1);
TypeId DsrOptionPad1::GetTypeId ()
{
@@ -413,8 +411,7 @@
return pad1Header.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionPadn);
TypeId DsrOptionPadn::GetTypeId ()
{
@@ -454,8 +451,7 @@
return padnHeader.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRreq);
TypeId DsrOptionRreq::GetTypeId ()
{
@@ -953,8 +949,7 @@
//unreachable: return rreq.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRrep);
TypeId DsrOptionRrep::GetTypeId ()
{
@@ -1154,8 +1149,7 @@
return rrep.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionSR);
TypeId DsrOptionSR::GetTypeId ()
{
@@ -1313,8 +1307,7 @@
m_dropTrace (packet);
return 0;
}
- // -fstrict-overflow sensitive, see bug 1868
- if (numberAddress - segsLeft < 2) // The index is invalid
+ if (numberAddress - segsLeft - 2 < 0) // The index is invalid
{
NS_LOG_LOGIC ("Malformed header. Drop!");
m_dropTrace (packet);
@@ -1396,8 +1389,7 @@
return sourceRoute.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionRerr);
TypeId DsrOptionRerr::GetTypeId ()
{
@@ -1576,8 +1568,7 @@
return serializedSize;
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAckReq);
TypeId DsrOptionAckReq::GetTypeId ()
{
@@ -1632,8 +1623,7 @@
return ackReq.GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsrOptionAck);
TypeId DsrOptionAck::GetTypeId ()
{
--- a/src/dsr/model/dsr-passive-buff.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-passive-buff.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
namespace dsr {
-NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PassiveBuffer);
TypeId PassiveBuffer::GetTypeId ()
{
--- a/src/dsr/model/dsr-rcache.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-rcache.cc Wed Mar 05 17:06:59 2014 -0800
@@ -131,8 +131,7 @@
<< "\t";
}
-NS_OBJECT_ENSURE_REGISTERED (RouteCache)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RouteCache);
TypeId RouteCache::GetTypeId ()
{
--- a/src/dsr/model/dsr-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -79,8 +79,7 @@
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;
--- a/src/dsr/model/dsr-rreq-table.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/dsr/model/dsr-rreq-table.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,8 +39,7 @@
namespace ns3 {
namespace dsr {
-NS_OBJECT_ENSURE_REGISTERED (RreqTable)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RreqTable);
TypeId RreqTable::GetTypeId ()
{
--- a/src/emu/model/emu-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/emu/model/emu-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -55,8 +55,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EmuNetDevice);
#define EMU_MAGIC 65867
--- a/src/energy/model/basic-energy-source.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/basic-energy-source.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BasicEnergySource);
TypeId
BasicEnergySource::GetTypeId (void)
--- a/src/energy/model/device-energy-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/device-energy-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DeviceEnergyModel);
TypeId
DeviceEnergyModel::GetTypeId (void)
--- a/src/energy/model/energy-source.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/energy-source.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EnergySource)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EnergySource);
TypeId
EnergySource::GetTypeId (void)
--- a/src/energy/model/li-ion-energy-source.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/li-ion-energy-source.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LiIonEnergySource);
TypeId
LiIonEnergySource::GetTypeId (void)
--- a/src/energy/model/rv-battery-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/rv-battery-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RvBatteryModel);
TypeId
RvBatteryModel::GetTypeId (void)
--- a/src/energy/model/simple-device-energy-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/simple-device-energy-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SimpleDeviceEnergyModel);
TypeId
SimpleDeviceEnergyModel::GetTypeId (void)
--- a/src/energy/model/wifi-radio-energy-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/model/wifi-radio-energy-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiRadioEnergyModel);
TypeId
WifiRadioEnergyModel::GetTypeId (void)
--- a/src/energy/test/li-ion-energy-source-test.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/energy/test/li-ion-energy-source-test.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite")
- ;
+NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite");
class LiIonEnergyTestCase : public TestCase
{
--- a/src/fd-net-device/model/fd-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/fd-net-device/model/fd-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -74,8 +74,7 @@
return FdReader::Data (buf, len);
}
-NS_OBJECT_ENSURE_REGISTERED (FdNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FdNetDevice);
TypeId
FdNetDevice::GetTypeId (void)
--- a/src/flow-monitor/model/flow-monitor.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/flow-monitor/model/flow-monitor.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,11 +31,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("FlowMonitor")
- ;
+NS_LOG_COMPONENT_DEFINE ("FlowMonitor");
-NS_OBJECT_ENSURE_REGISTERED (FlowMonitor)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FlowMonitor);
TypeId
--- a/src/flow-monitor/model/histogram.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/flow-monitor/model/histogram.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Histogram")
- ;
+NS_LOG_COMPONENT_DEFINE ("Histogram");
// uint32_t
// Histogram::GetSize () const
--- a/src/flow-monitor/model/ipv4-flow-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/flow-monitor/model/ipv4-flow-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe");
//////////////////////////////////////
// Ipv4FlowProbeTag class implementation //
--- a/src/internet/helper/ipv6-address-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/helper/ipv6-address-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper");
Ipv6AddressHelper::Ipv6AddressHelper ()
{
--- a/src/internet/model/arp-cache.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/arp-cache.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ArpCache)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ArpCache);
TypeId
ArpCache::GetTypeId (void)
--- a/src/internet/model/arp-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/arp-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ArpHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ArpHeader);
void
ArpHeader::SetRequest (Address sourceHardwareAddress,
--- a/src/internet/model/arp-l3-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/arp-l3-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
const uint16_t ArpL3Protocol::PROT_NUMBER = 0x0806;
-NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol);
TypeId
ArpL3Protocol::GetTypeId (void)
--- a/src/internet/model/global-router-interface.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/global-router-interface.cc Wed Mar 05 17:06:59 2014 -0800
@@ -504,8 +504,7 @@
//
// ---------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (GlobalRouter)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GlobalRouter);
TypeId
GlobalRouter::GetTypeId (void)
--- a/src/internet/model/icmpv4-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/icmpv4-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -11,11 +11,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol")
- ;
+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;
--- a/src/internet/model/icmpv4.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/icmpv4.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
* Icmpv4Header
********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4Header);
TypeId
Icmpv4Header::GetTypeId (void)
@@ -134,8 +133,7 @@
* Icmpv4Echo
********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4Echo);
void
Icmpv4Echo::SetIdentifier (uint16_t id)
@@ -272,8 +270,7 @@
* Icmpv4DestinationUnreachable
********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4DestinationUnreachable);
TypeId
Icmpv4DestinationUnreachable::GetTypeId (void)
@@ -396,8 +393,7 @@
* Icmpv4TimeExceeded
********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv4TimeExceeded);
TypeId
Icmpv4TimeExceeded::GetTypeId (void)
--- a/src/internet/model/icmpv6-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/icmpv6-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Header);
TypeId Icmpv6Header::GetTypeId ()
{
@@ -173,8 +172,7 @@
m_checksum = ~(it.CalculateIpChecksum (40));
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6NS);
Icmpv6NS::Icmpv6NS ()
{
@@ -296,8 +294,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6NA);
TypeId Icmpv6NA::GetTypeId ()
{
@@ -480,8 +477,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6RA);
TypeId Icmpv6RA::GetTypeId ()
{
@@ -700,8 +696,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6RS);
TypeId Icmpv6RS::GetTypeId ()
{
@@ -791,8 +786,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Redirection);
TypeId Icmpv6Redirection::GetTypeId ()
{
@@ -922,8 +916,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6Echo);
TypeId Icmpv6Echo::GetTypeId ()
{
@@ -1040,8 +1033,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6DestinationUnreachable);
TypeId Icmpv6DestinationUnreachable::GetTypeId ()
{
@@ -1138,8 +1130,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6TooBig);
TypeId Icmpv6TooBig::GetTypeId ()
{
@@ -1249,8 +1240,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6TimeExceeded);
TypeId Icmpv6TimeExceeded::GetTypeId ()
{
@@ -1349,8 +1339,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6ParameterError);
TypeId Icmpv6ParameterError::GetTypeId ()
{
@@ -1460,8 +1449,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionHeader);
TypeId Icmpv6OptionHeader::GetTypeId ()
{
@@ -1539,8 +1527,7 @@
NS_LOG_FUNCTION (this << &start);
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionMtu);
TypeId Icmpv6OptionMtu::GetTypeId ()
{
@@ -1636,8 +1623,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionPrefixInformation);
TypeId Icmpv6OptionPrefixInformation::GetTypeId ()
{
@@ -1810,8 +1796,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionLinkLayerAddress);
TypeId Icmpv6OptionLinkLayerAddress::GetTypeId ()
{
@@ -1910,17 +1895,15 @@
SetType (i.ReadU8 ());
SetLength (i.ReadU8 ());
- // -fstrict-overflow sensitive, see bug 1868
- NS_ASSERT (GetLength () * 8 <= 32 + 2);
+ NS_ASSERT (GetLength () * 8 - 2 <= 32);
i.Read (mac, (GetLength () * 8) - 2);
- m_addr.CopyFrom (mac, (GetLength () * 8) - 2);
+ m_addr.CopyFrom (mac, (GetLength () * 8)-2);
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6OptionRedirected);
TypeId Icmpv6OptionRedirected::GetTypeId ()
{
--- a/src/internet/model/icmpv6-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/icmpv6-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,11 +39,9 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Icmpv6L4Protocol);
-NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol")
- ;
+NS_LOG_COMPONENT_DEFINE ("Icmpv6L4Protocol");
const uint8_t Icmpv6L4Protocol::PROT_NUMBER = 58;
--- a/src/internet/model/ip-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ip-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (IpL4Protocol);
TypeId
IpL4Protocol::GetTypeId (void)
--- a/src/internet/model/ipv4-end-point-demux.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-end-point-demux.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux");
Ipv4EndPointDemux::Ipv4EndPointDemux ()
: m_ephemeral (49152), m_portLast (65535), m_portFirst (49152)
--- a/src/internet/model/ipv4-global-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-global-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4GlobalRouting);
TypeId
Ipv4GlobalRouting::GetTypeId (void)
--- a/src/internet/model/ipv4-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4Header);
Ipv4Header::Ipv4Header ()
: m_calcChecksum (false),
@@ -247,8 +246,7 @@
Ipv4Header::GetFragmentOffset (void) const
{
NS_LOG_FUNCTION (this);
- // -fstrict-overflow sensitive, see bug 1868
- if ( m_fragmentOffset + m_payloadSize > 65535 - 5*4 )
+ if ((m_fragmentOffset+m_payloadSize+5*4) > 65535)
{
NS_LOG_WARN("Fragment will exceed the maximum packet size once reassembled");
}
--- a/src/internet/model/ipv4-interface.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-interface.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4Interface);
TypeId
Ipv4Interface::GetTypeId (void)
--- a/src/internet/model/ipv4-l3-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-l3-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
const uint16_t Ipv4L3Protocol::PROT_NUMBER = 0x0800;
-NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol);
TypeId
Ipv4L3Protocol::GetTypeId (void)
@@ -1290,8 +1289,8 @@
{
NS_LOG_FUNCTION (this << packet << ipHeader << iif);
- uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 | uint64_t (ipHeader.GetDestination ().Get ());
- uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 | uint32_t (ipHeader.GetProtocol ());
+ uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 & uint64_t (ipHeader.GetDestination ().Get ());
+ uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 & uint32_t (ipHeader.GetProtocol ());
std::pair<uint64_t, uint32_t> key;
bool ret = false;
Ptr<Packet> p = packet->Copy ();
--- a/src/internet/model/ipv4-list-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-list-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4ListRouting);
TypeId
Ipv4ListRouting::GetTypeId (void)
--- a/src/internet/model/ipv4-packet-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-packet-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4PacketProbe);
TypeId
Ipv4PacketProbe::GetTypeId ()
--- a/src/internet/model/ipv4-raw-socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-raw-socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketFactory);
TypeId Ipv4RawSocketFactory::GetTypeId (void)
{
--- a/src/internet/model/ipv4-raw-socket-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-raw-socket-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -17,8 +17,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RawSocketImpl);
TypeId
Ipv4RawSocketImpl::GetTypeId (void)
--- a/src/internet/model/ipv4-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4RoutingProtocol);
TypeId Ipv4RoutingProtocol::GetTypeId (void)
{
--- a/src/internet/model/ipv4-static-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4-static-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4StaticRouting);
TypeId
Ipv4StaticRouting::GetTypeId (void)
--- a/src/internet/model/ipv4.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv4.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4);
TypeId
Ipv4::GetTypeId (void)
--- a/src/internet/model/ipv6-end-point-demux.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-end-point-demux.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux");
Ipv6EndPointDemux::Ipv6EndPointDemux ()
: m_ephemeral (49152),
--- a/src/internet/model/ipv6-end-point.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-end-point.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6EndPoint");
Ipv6EndPoint::Ipv6EndPoint (Ipv6Address addr, uint16_t port)
: m_localAddr (addr),
--- a/src/internet/model/ipv6-extension-demux.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-extension-demux.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDemux);
TypeId Ipv6ExtensionDemux::GetTypeId ()
{
--- a/src/internet/model/ipv6-extension-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-extension-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,11 +26,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader");
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader);
TypeId Ipv6ExtensionHeader::GetTypeId ()
{
@@ -201,8 +199,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHopHeader);
TypeId Ipv6ExtensionHopByHopHeader::GetTypeId ()
{
@@ -257,8 +254,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestinationHeader);
TypeId Ipv6ExtensionDestinationHeader::GetTypeId ()
{
@@ -313,8 +309,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragmentHeader);
TypeId Ipv6ExtensionFragmentHeader::GetTypeId ()
{
@@ -407,8 +402,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingHeader);
TypeId Ipv6ExtensionRoutingHeader::GetTypeId ()
{
@@ -487,8 +481,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRoutingHeader);
TypeId Ipv6ExtensionLooseRoutingHeader::GetTypeId ()
{
@@ -595,8 +588,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESPHeader);
TypeId Ipv6ExtensionESPHeader::GetTypeId ()
{
@@ -642,8 +634,7 @@
return 0;
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAHHeader);
TypeId Ipv6ExtensionAHHeader::GetTypeId ()
{
--- a/src/internet/model/ipv6-extension.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-extension.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Extension);
TypeId Ipv6Extension::GetTypeId ()
{
@@ -183,8 +182,7 @@
return 1;
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHopByHop);
TypeId Ipv6ExtensionHopByHop::GetTypeId ()
{
@@ -236,8 +234,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionDestination);
TypeId Ipv6ExtensionDestination::GetTypeId ()
{
@@ -289,8 +286,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionFragment);
TypeId Ipv6ExtensionFragment::GetTypeId ()
{
@@ -707,8 +703,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting);
TypeId Ipv6ExtensionRouting::GetTypeId ()
{
@@ -793,8 +788,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRoutingDemux);
TypeId Ipv6ExtensionRoutingDemux::GetTypeId ()
{
@@ -856,8 +850,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionLooseRouting);
TypeId Ipv6ExtensionLooseRouting::GetTypeId ()
{
@@ -1010,8 +1003,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionESP);
TypeId Ipv6ExtensionESP::GetTypeId ()
{
@@ -1049,8 +1041,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionAH);
TypeId Ipv6ExtensionAH::GetTypeId ()
{
--- a/src/internet/model/ipv6-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Header);
Ipv6Header::Ipv6Header ()
: m_version (6),
--- a/src/internet/model/ipv6-interface-address.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-interface-address.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress");
Ipv6InterfaceAddress::Ipv6InterfaceAddress ()
: m_address (Ipv6Address ()),
--- a/src/internet/model/ipv6-interface.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-interface.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,11 +34,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6Interface")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6Interface");
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface);
TypeId Ipv6Interface::GetTypeId ()
{
--- a/src/internet/model/ipv6-l3-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-l3-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -49,11 +49,9 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6L3Protocol);
-NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6L3Protocol");
const uint16_t Ipv6L3Protocol::PROT_NUMBER = 0x86DD;
--- a/src/internet/model/ipv6-list-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-list-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6ListRouting);
TypeId
Ipv6ListRouting::GetTypeId (void)
--- a/src/internet/model/ipv6-option-demux.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-option-demux.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionDemux);
TypeId Ipv6OptionDemux::GetTypeId ()
{
--- a/src/internet/model/ipv6-option-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-option-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,11 +26,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader");
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader);
TypeId Ipv6OptionHeader::GetTypeId ()
{
@@ -118,8 +116,7 @@
return (Alignment){ 1,0};
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1Header);
TypeId Ipv6OptionPad1Header::GetTypeId ()
{
@@ -170,8 +167,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadnHeader);
TypeId Ipv6OptionPadnHeader::GetTypeId ()
{
@@ -231,8 +227,7 @@
return GetSerializedSize ();
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogramHeader);
TypeId Ipv6OptionJumbogramHeader::GetTypeId ()
{
@@ -303,8 +298,7 @@
return (Alignment){ 4,2}; //4n+2
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlertHeader);
TypeId Ipv6OptionRouterAlertHeader::GetTypeId ()
{
--- a/src/internet/model/ipv6-option.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-option.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Ipv6Option)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6Option);
TypeId Ipv6Option::GetTypeId ()
{
@@ -56,8 +55,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPad1);
TypeId Ipv6OptionPad1::GetTypeId ()
{
@@ -101,8 +99,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionPadn);
TypeId Ipv6OptionPadn::GetTypeId ()
{
@@ -146,8 +143,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionJumbogram);
TypeId Ipv6OptionJumbogram::GetTypeId ()
{
@@ -191,8 +187,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionRouterAlert);
TypeId Ipv6OptionRouterAlert::GetTypeId ()
{
--- a/src/internet/model/ipv6-packet-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-packet-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PacketProbe);
TypeId
Ipv6PacketProbe::GetTypeId ()
--- a/src/internet/model/ipv6-pmtu-cache.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-pmtu-cache.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6PmtuCache);
TypeId Ipv6PmtuCache::GetTypeId ()
{
--- a/src/internet/model/ipv6-raw-socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-raw-socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketFactory);
TypeId Ipv6RawSocketFactory::GetTypeId ()
{
--- a/src/internet/model/ipv6-raw-socket-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-raw-socket-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,12 +38,10 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl")
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl");
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl);
TypeId Ipv6RawSocketImpl::GetTypeId ()
{
--- a/src/internet/model/ipv6-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6RoutingProtocol);
TypeId Ipv6RoutingProtocol::GetTypeId ()
{
--- a/src/internet/model/ipv6-static-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6-static-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,10 +32,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting")
- ;
-NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting)
- ;
+NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
+NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting);
TypeId Ipv6StaticRouting::GetTypeId ()
{
--- a/src/internet/model/ipv6.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ipv6.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (Ipv6)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv6);
TypeId Ipv6::GetTypeId (void)
{
--- a/src/internet/model/loopback-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/loopback-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LoopbackNetDevice);
TypeId
LoopbackNetDevice::GetTypeId (void)
--- a/src/internet/model/ndisc-cache.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/ndisc-cache.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,11 +30,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("NdiscCache")
- ;
+NS_LOG_COMPONENT_DEFINE ("NdiscCache");
-NS_OBJECT_ENSURE_REGISTERED (NdiscCache)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NdiscCache);
TypeId NdiscCache::GetTypeId ()
{
--- a/src/internet/model/nsc-sysctl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/nsc-sysctl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -152,8 +152,7 @@
}
}
-NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ns3NscStack);
TypeId
Ns3NscStack::Ns3NscStack::GetTypeId (void)
--- a/src/internet/model/nsc-tcp-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/nsc-tcp-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -49,8 +49,7 @@
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;
--- a/src/internet/model/nsc-tcp-socket-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/nsc-tcp-socket-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -47,8 +47,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NscTcpSocketImpl);
TypeId
NscTcpSocketImpl::GetTypeId ()
--- a/src/internet/model/rtt-estimator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/rtt-estimator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RttEstimator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RttEstimator);
TypeId
RttEstimator::GetTypeId (void)
@@ -232,8 +231,7 @@
//-----------------------------------------------------------------------------
// Mean-Deviation Estimator
-NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation);
TypeId
RttMeanDeviation::GetTypeId (void)
--- a/src/internet/model/tcp-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpHeader);
TcpHeader::TcpHeader ()
: m_sourcePort (0),
--- a/src/internet/model/tcp-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -51,8 +51,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol);
//TcpL4Protocol stuff----------------------------------------------------------
--- a/src/internet/model/tcp-newreno.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-newreno.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpNewReno)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpNewReno);
TypeId
TcpNewReno::GetTypeId (void)
--- a/src/internet/model/tcp-reno.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-reno.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpReno)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpReno);
TypeId
TcpReno::GetTypeId (void)
--- a/src/internet/model/tcp-rfc793.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-rfc793.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpRfc793)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpRfc793);
TypeId
TcpRfc793::GetTypeId (void)
--- a/src/internet/model/tcp-socket-base.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-socket-base.cc Wed Mar 05 17:06:59 2014 -0800
@@ -54,8 +54,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpSocketBase);
TypeId
TcpSocketBase::GetTypeId (void)
--- a/src/internet/model/tcp-socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpSocketFactory);
TypeId
TcpSocketFactory::GetTypeId (void)
--- a/src/internet/model/tcp-socket.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-socket.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
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" };
--- a/src/internet/model/tcp-tahoe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-tahoe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TcpTahoe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TcpTahoe);
TypeId
TcpTahoe::GetTypeId (void)
--- a/src/internet/model/tcp-westwood.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/tcp-westwood.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED(TcpWestwood)
- ;
+NS_OBJECT_ENSURE_REGISTERED(TcpWestwood);
TypeId
TcpWestwood::GetTypeId (void)
--- a/src/internet/model/udp-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/udp-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
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
--- a/src/internet/model/udp-l4-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/udp-l4-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
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;
--- a/src/internet/model/udp-socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/udp-socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory);
TypeId UdpSocketFactory::GetTypeId (void)
{
--- a/src/internet/model/udp-socket-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/udp-socket-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UdpSocketImpl);
// The correct maximum UDP message size is 65507, as determined by the following formula:
// 0xffff - (sizeof(IP Header) + sizeof(UDP Header)) = 65535-(20+8) = 65507
--- a/src/internet/model/udp-socket.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/model/udp-socket.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UdpSocket)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UdpSocket);
TypeId
UdpSocket::GetTypeId (void)
--- a/src/internet/test/error-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/internet/test/error-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ErrorChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ErrorChannel);
TypeId
ErrorChannel::GetTypeId (void)
@@ -105,8 +104,7 @@
return m_devices[i];
}
-NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BinaryErrorModel);
TypeId BinaryErrorModel::GetTypeId (void)
{
--- a/src/lte/helper/epc-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/epc-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,11 +27,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("EpcHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcHelper");
-NS_OBJECT_ENSURE_REGISTERED (EpcHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcHelper);
EpcHelper::EpcHelper ()
--- a/src/lte/helper/lte-global-pathloss-database.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/lte-global-pathloss-database.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase")
- ;
+NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase");
LteGlobalPathlossDatabase::~LteGlobalPathlossDatabase (void)
--- a/src/lte/helper/lte-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/lte-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -65,8 +65,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteHelper);
LteHelper::LteHelper (void)
: m_fadingStreamsAssigned (false),
--- a/src/lte/helper/lte-hex-grid-enb-topology-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/lte-hex-grid-enb-topology-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteHexGridEnbTopologyHelper);
LteHexGridEnbTopologyHelper::LteHexGridEnbTopologyHelper ()
{
--- a/src/lte/helper/lte-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/lte-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator");
LteStatsCalculator::LteStatsCalculator ()
: m_dlOutputFilename (""),
--- a/src/lte/helper/mac-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/mac-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,11 +25,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator");
-NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator);
MacStatsCalculator::MacStatsCalculator ()
: m_dlFirstWrite (true),
--- a/src/lte/helper/phy-rx-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/phy-rx-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,11 +27,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator");
-NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator);
PhyRxStatsCalculator::PhyRxStatsCalculator ()
: m_dlRxFirstWrite (true),
--- a/src/lte/helper/phy-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/phy-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,11 +25,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator");
-NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator);
PhyStatsCalculator::PhyStatsCalculator ()
: m_RsrpSinrFirstWrite (true),
--- a/src/lte/helper/phy-tx-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/phy-tx-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,11 +27,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator");
-NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator);
PhyTxStatsCalculator::PhyTxStatsCalculator ()
: m_dlTxFirstWrite (true),
--- a/src/lte/helper/point-to-point-epc-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/point-to-point-epc-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -42,11 +42,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper");
-NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper);
PointToPointEpcHelper::PointToPointEpcHelper ()
--- a/src/lte/helper/radio-bearer-stats-calculator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/radio-bearer-stats-calculator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,11 +29,9 @@
namespace ns3
{
-NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator")
- ;
+NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator");
-NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator);
RadioBearerStatsCalculator::RadioBearerStatsCalculator ()
: m_firstWrite (true),
--- a/src/lte/helper/radio-environment-map-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/helper/radio-environment-map-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
-NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RadioEnvironmentMapHelper);
RadioEnvironmentMapHelper::RadioEnvironmentMapHelper ()
{
--- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (A2A4RsrqHandoverAlgorithm);
///////////////////////////////////////////
--- a/src/lte/model/a3-rsrp-handover-algorithm.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/a3-rsrp-handover-algorithm.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (A3RsrpHandoverAlgorithm);
A3RsrpHandoverAlgorithm::A3RsrpHandoverAlgorithm ()
--- a/src/lte/model/epc-enb-application.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-enb-application.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication");
EpcEnbApplication::EpsFlowId_t::EpsFlowId_t ()
--- a/src/lte/model/epc-gtpu-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-gtpu-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
* GTP-U-v1 Header
********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (GtpuHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GtpuHeader);
TypeId
GtpuHeader::GetTypeId (void)
--- a/src/lte/model/epc-mme.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-mme.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
-NS_OBJECT_ENSURE_REGISTERED (EpcMme)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcMme);
EpcMme::EpcMme ()
: m_s11SapSgw (0)
--- a/src/lte/model/epc-sgw-pgw-application.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-sgw-pgw-application.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication");
/////////////////////////
--- a/src/lte/model/epc-tft.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-tft.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("EpcTft")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcTft");
std::ostream& operator<< (std::ostream& os, EpcTft::Direction& d)
{
--- a/src/lte/model/epc-ue-nas.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-ue-nas.cc Wed Mar 05 17:06:59 2014 -0800
@@ -52,8 +52,7 @@
-NS_OBJECT_ENSURE_REGISTERED (EpcUeNas)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcUeNas);
EpcUeNas::EpcUeNas ()
: m_state (OFF),
--- a/src/lte/model/epc-x2-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-x2-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EpcX2Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2Header);
EpcX2Header::EpcX2Header ()
: m_messageType (0xfa),
@@ -146,8 +145,7 @@
/////////////////////////////////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestHeader);
EpcX2HandoverRequestHeader::EpcX2HandoverRequestHeader ()
: m_numberOfIes (1 + 1 + 1 + 1),
@@ -435,8 +433,7 @@
/////////////////////////////////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverRequestAckHeader);
EpcX2HandoverRequestAckHeader::EpcX2HandoverRequestAckHeader ()
: m_numberOfIes (1 + 1 + 1 + 1),
@@ -661,8 +658,7 @@
/////////////////////////////////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2HandoverPreparationFailureHeader);
EpcX2HandoverPreparationFailureHeader::EpcX2HandoverPreparationFailureHeader ()
: m_numberOfIes (1 + 1 + 1),
@@ -787,8 +783,7 @@
/////////////////////////////////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2SnStatusTransferHeader);
EpcX2SnStatusTransferHeader::EpcX2SnStatusTransferHeader ()
: m_numberOfIes (3),
@@ -980,8 +975,7 @@
/////////////////////////////////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2UeContextReleaseHeader);
EpcX2UeContextReleaseHeader::EpcX2UeContextReleaseHeader ()
: m_numberOfIes (1 + 1),
@@ -1088,8 +1082,7 @@
/////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2LoadInformationHeader);
EpcX2LoadInformationHeader::EpcX2LoadInformationHeader ()
: m_numberOfIes (1),
@@ -1313,8 +1306,7 @@
////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2ResourceStatusUpdateHeader);
EpcX2ResourceStatusUpdateHeader::EpcX2ResourceStatusUpdateHeader ()
: m_numberOfIes (3),
--- a/src/lte/model/epc-x2.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/epc-x2.cc Wed Mar 05 17:06:59 2014 -0800
@@ -80,8 +80,7 @@
///////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (EpcX2)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcX2);
EpcX2::EpcX2 ()
: m_x2cUdpPort (4444),
--- a/src/lte/model/eps-bearer-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/eps-bearer-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpsBearerTag);
TypeId
EpsBearerTag::GetTypeId (void)
--- a/src/lte/model/fdbet-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/fdbet-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FdBetFfMacScheduler);
--- a/src/lte/model/fdmt-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/fdmt-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FdMtFfMacScheduler);
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FdTbfqFfMacScheduler);
--- a/src/lte/model/ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FfMacScheduler);
FfMacScheduler::FfMacScheduler ()
--- a/src/lte/model/lte-amc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-amc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
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
--- a/src/lte/model/lte-anr.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-anr.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteAnr)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteAnr);
LteAnr::LteAnr (uint16_t servingCellId)
--- a/src/lte/model/lte-asn1-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-asn1-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Asn1Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Asn1Header);
TypeId
Asn1Header::GetTypeId (void)
--- a/src/lte/model/lte-enb-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-enb-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteEnbMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteEnbMac);
--- a/src/lte/model/lte-enb-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-enb-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -48,8 +48,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED ( LteEnbNetDevice);
TypeId LteEnbNetDevice::GetTypeId (void)
{
--- a/src/lte/model/lte-enb-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-enb-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -49,8 +49,7 @@
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
--- a/src/lte/model/lte-enb-rrc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-enb-rrc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -120,8 +120,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (UeManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UeManager);
UeManager::UeManager ()
@@ -1220,8 +1219,7 @@
// eNB RRC methods
///////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrc);
LteEnbRrc::LteEnbRrc ()
: m_x2SapProvider (0),
--- a/src/lte/model/lte-handover-algorithm.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-handover-algorithm.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteHandoverAlgorithm);
LteHandoverAlgorithm::LteHandoverAlgorithm ()
--- a/src/lte/model/lte-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED ( LteNetDevice);
////////////////////////////////
// LteNetDevice
--- a/src/lte/model/lte-pdcp-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-pdcp-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LtePdcpHeader);
LtePdcpHeader::LtePdcpHeader ()
: m_dcBit (0xff),
--- a/src/lte/model/lte-pdcp-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-pdcp-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PdcpTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PdcpTag);
PdcpTag::PdcpTag ()
: m_senderTimestamp (Seconds (0))
--- a/src/lte/model/lte-pdcp.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-pdcp.cc Wed Mar 05 17:06:59 2014 -0800
@@ -61,8 +61,7 @@
///////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (LtePdcp)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LtePdcp);
LtePdcp::LtePdcp ()
: m_pdcpSapUser (0),
--- a/src/lte/model/lte-phy-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-phy-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LtePhyTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LtePhyTag);
TypeId
LtePhyTag::GetTypeId (void)
--- a/src/lte/model/lte-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LtePhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LtePhy);
LtePhy::LtePhy ()
--- a/src/lte/model/lte-radio-bearer-info.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-radio-bearer-info.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerInfo);
LteRadioBearerInfo::LteRadioBearerInfo (void)
{
--- a/src/lte/model/lte-radio-bearer-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-radio-bearer-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag);
TypeId
LteRadioBearerTag::GetTypeId (void)
--- a/src/lte/model/lte-rlc-am-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-am-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcAmHeader);
LteRlcAmHeader::LteRlcAmHeader ()
: m_headerLength (0),
--- a/src/lte/model/lte-rlc-am.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-am.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcAm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcAm);
LteRlcAm::LteRlcAm ()
{
--- a/src/lte/model/lte-rlc-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcHeader);
LteRlcHeader::LteRlcHeader ()
: m_headerLength (0),
--- a/src/lte/model/lte-rlc-sdu-status-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-sdu-status-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcSduStatusTag);
LteRlcSduStatusTag::LteRlcSduStatusTag ()
{
--- a/src/lte/model/lte-rlc-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RlcTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RlcTag);
RlcTag::RlcTag ()
: m_senderTimestamp (Seconds (0))
--- a/src/lte/model/lte-rlc-tm.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-tm.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcTm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcTm);
LteRlcTm::LteRlcTm ()
: m_maxTxBufferSize (0),
--- a/src/lte/model/lte-rlc-um.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc-um.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteRlcUm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcUm);
LteRlcUm::LteRlcUm ()
: m_maxTxBufferSize (10 * 1024),
--- a/src/lte/model/lte-rlc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rlc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -81,8 +81,7 @@
///////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (LteRlc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlc);
LteRlc::LteRlc ()
: m_rlcSapUser (0),
@@ -168,8 +167,7 @@
////////////////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (LteRlcSm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteRlcSm);
LteRlcSm::LteRlcSm ()
{
--- a/src/lte/model/lte-rrc-protocol-ideal.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rrc-protocol-ideal.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,8 +39,7 @@
const Time RRC_IDEAL_MSG_DELAY = MilliSeconds (0);
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolIdeal);
LteUeRrcProtocolIdeal::LteUeRrcProtocolIdeal ()
: m_ueRrcSapProvider (0),
@@ -207,8 +206,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolIdeal);
LteEnbRrcProtocolIdeal::LteEnbRrcProtocolIdeal ()
: m_enbRrcSapProvider (0)
--- a/src/lte/model/lte-rrc-protocol-real.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-rrc-protocol-real.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
const Time RRC_REAL_MSG_DELAY = MilliSeconds (0);
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrcProtocolReal);
LteUeRrcProtocolReal::LteUeRrcProtocolReal ()
: m_ueRrcSapProvider (0),
@@ -351,8 +350,7 @@
}
}
-NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteEnbRrcProtocolReal);
LteEnbRrcProtocolReal::LteEnbRrcProtocolReal ()
: m_enbRrcSapProvider (0)
--- a/src/lte/model/lte-spectrum-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-spectrum-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -110,8 +110,7 @@
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),
--- a/src/lte/model/lte-ue-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-ue-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteUeMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteUeMac);
///////////////////////////////////////////////////////////
--- a/src/lte/model/lte-ue-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-ue-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -48,8 +48,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED ( LteUeNetDevice);
TypeId LteUeNetDevice::GetTypeId (void)
--- a/src/lte/model/lte-ue-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-ue-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -118,8 +118,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (LteUePhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteUePhy);
LteUePhy::LteUePhy ()
--- a/src/lte/model/lte-ue-rrc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/lte-ue-rrc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -115,8 +115,7 @@
// ue RRC methods
/////////////////////////////
-NS_OBJECT_ENSURE_REGISTERED (LteUeRrc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteUeRrc);
LteUeRrc::LteUeRrc ()
--- a/src/lte/model/no-op-handover-algorithm.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/no-op-handover-algorithm.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NoOpHandoverAlgorithm);
NoOpHandoverAlgorithm::NoOpHandoverAlgorithm ()
--- a/src/lte/model/pf-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/pf-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -42,8 +42,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PfFfMacScheduler);
--- a/src/lte/model/pss-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/pss-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PssFfMacScheduler);
--- a/src/lte/model/rem-spectrum-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/rem-spectrum-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RemSpectrumPhy);
RemSpectrumPhy::RemSpectrumPhy ()
: m_mobility (0),
--- a/src/lte/model/rr-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/rr-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
-NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RrFfMacScheduler);
class RrSchedulerMemberCschedSapProvider : public FfMacCschedSapProvider
--- a/src/lte/model/tdbet-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/tdbet-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TdBetFfMacScheduler);
--- a/src/lte/model/tdmt-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TdMtFfMacScheduler);
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TdTbfqFfMacScheduler);
--- a/src/lte/model/trace-fading-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/trace-fading-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TraceFadingLossModel);
--- a/src/lte/model/tta-ff-mac-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/model/tta-ff-mac-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
}; // see table 7.1.6.1-1 of 36.213
-NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TtaFfMacScheduler);
--- a/src/lte/test/epc-test-s1u-downlink.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/epc-test-s1u-downlink.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink");
--- a/src/lte/test/epc-test-s1u-uplink.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/epc-test-s1u-uplink.cc Wed Mar 05 17:06:59 2014 -0800
@@ -52,8 +52,7 @@
-NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink")
- ;
+NS_LOG_COMPONENT_DEFINE ("EpcTestS1uUplink");
/*
* A Udp client. Sends UDP packet carrying sequence number and time
--- a/src/lte/test/lte-simple-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/lte-simple-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteSimpleHelper);
LteSimpleHelper::LteSimpleHelper (void)
{
--- a/src/lte/test/lte-simple-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/lte-simple-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteSimpleNetDevice);
TypeId LteSimpleNetDevice::GetTypeId (void)
--- a/src/lte/test/lte-test-entities.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/lte-test-entities.cc Wed Mar 05 17:06:59 2014 -0800
@@ -608,8 +608,7 @@
-NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EpcTestRrc);
EpcTestRrc::EpcTestRrc ()
: m_s1SapProvider (0)
--- a/src/lte/test/lte-test-ue-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/lte-test-ue-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LteTestUePhy);
LteTestUePhy::LteTestUePhy ()
{
--- a/src/lte/test/test-lte-epc-e2e-data.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/lte/test/test-lte-epc-e2e-data.cc Wed Mar 05 17:06:59 2014 -0800
@@ -47,8 +47,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData")
- ;
+NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData");
--- a/src/mesh/helper/dot11s/dot11s-installer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/helper/dot11s/dot11s-installer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
using namespace dot11s;
-NS_OBJECT_ENSURE_REGISTERED (Dot11sStack)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Dot11sStack);
TypeId
Dot11sStack::GetTypeId ()
--- a/src/mesh/helper/flame/flame-installer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/helper/flame/flame-installer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3
{
using namespace flame;
-NS_OBJECT_ENSURE_REGISTERED (FlameStack)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FlameStack);
TypeId
FlameStack::GetTypeId ()
--- a/src/mesh/model/dot11s/airtime-metric.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/airtime-metric.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AirtimeLinkMetricCalculator);
TypeId
AirtimeLinkMetricCalculator::GetTypeId ()
--- a/src/mesh/model/dot11s/hwmp-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HwmpProtocol);
TypeId
HwmpProtocol::GetTypeId ()
--- a/src/mesh/model/dot11s/hwmp-rtable.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/hwmp-rtable.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
NS_LOG_COMPONENT_DEFINE ("HwmpRtable");
-NS_OBJECT_ENSURE_REGISTERED (HwmpRtable)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HwmpRtable);
TypeId
HwmpRtable::GetTypeId ()
--- a/src/mesh/model/dot11s/hwmp-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/hwmp-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED (HwmpTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HwmpTag);
//Class HwmpTag:
HwmpTag::HwmpTag () :
--- a/src/mesh/model/dot11s/peer-link-frame.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/peer-link-frame.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
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 (),
--- a/src/mesh/model/dot11s/peer-link.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/peer-link.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
namespace dot11s {
-NS_OBJECT_ENSURE_REGISTERED ( PeerLink)
- ;
+NS_OBJECT_ENSURE_REGISTERED ( PeerLink);
TypeId
PeerLink::GetTypeId ()
--- a/src/mesh/model/dot11s/peer-management-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/dot11s/peer-management-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,8 +39,7 @@
/***************************************************
* PeerManager
***************************************************/
-NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PeerManagementProtocol);
TypeId
PeerManagementProtocol::GetTypeId (void)
--- a/src/mesh/model/flame/flame-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/flame/flame-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
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 ())
--- a/src/mesh/model/flame/flame-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/flame/flame-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,10 +38,8 @@
//-----------------------------------------------------------------------------
// FlameTag
//-----------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (FlameTag)
- ;
-NS_OBJECT_ENSURE_REGISTERED (FlameProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FlameTag);
+NS_OBJECT_ENSURE_REGISTERED (FlameProtocol);
TypeId
FlameTag::GetTypeId ()
--- a/src/mesh/model/flame/flame-rtable.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/flame/flame-rtable.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
NS_LOG_COMPONENT_DEFINE ("FlameRtable");
-NS_OBJECT_ENSURE_REGISTERED (FlameRtable)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FlameRtable);
TypeId
FlameRtable::GetTypeId ()
--- a/src/mesh/model/mesh-l2-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/mesh-l2-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MeshL2RoutingProtocol);
TypeId
MeshL2RoutingProtocol::GetTypeId (void)
--- a/src/mesh/model/mesh-point-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/mesh-point-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MeshPointDevice);
TypeId
MeshPointDevice::GetTypeId ()
--- a/src/mesh/model/mesh-wifi-interface-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mesh/model/mesh-wifi-interface-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MeshWifiInterfaceMac);
TypeId
MeshWifiInterfaceMac::GetTypeId ()
--- a/src/mobility/helper/mobility-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/helper/mobility-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("MobilityHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("MobilityHelper");
MobilityHelper::MobilityHelper ()
{
--- a/src/mobility/model/constant-acceleration-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/constant-acceleration-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -20,8 +20,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantAccelerationMobilityModel);
TypeId ConstantAccelerationMobilityModel::GetTypeId (void)
{
--- a/src/mobility/model/constant-position-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/constant-position-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -21,8 +21,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantPositionMobilityModel);
TypeId
ConstantPositionMobilityModel::GetTypeId (void)
--- a/src/mobility/model/constant-velocity-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/constant-velocity-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantVelocityMobilityModel);
TypeId ConstantVelocityMobilityModel::GetTypeId (void)
{
--- a/src/mobility/model/gauss-markov-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/gauss-markov-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GaussMarkovMobilityModel);
TypeId
GaussMarkovMobilityModel::GetTypeId (void)
--- a/src/mobility/model/hierarchical-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/hierarchical-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel);
TypeId
HierarchicalMobilityModel::GetTypeId (void)
--- a/src/mobility/model/mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MobilityModel);
TypeId
MobilityModel::GetTypeId (void)
--- a/src/mobility/model/position-allocator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/position-allocator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PositionAllocator);
TypeId
PositionAllocator::GetTypeId (void)
@@ -49,8 +48,7 @@
{
}
-NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator);
TypeId
ListPositionAllocator::GetTypeId (void)
@@ -87,8 +85,7 @@
return 0;
}
-NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator);
TypeId
GridPositionAllocator::GetTypeId (void)
@@ -216,8 +213,7 @@
return 0;
}
-NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator);
TypeId
RandomRectanglePositionAllocator::GetTypeId (void)
@@ -273,8 +269,7 @@
return 2;
}
-NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomBoxPositionAllocator);
TypeId
RandomBoxPositionAllocator::GetTypeId (void)
@@ -342,8 +337,7 @@
return 3;
}
-NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator);
TypeId
RandomDiscPositionAllocator::GetTypeId (void)
@@ -424,8 +418,7 @@
-NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UniformDiscPositionAllocator);
TypeId
UniformDiscPositionAllocator::GetTypeId (void)
--- a/src/mobility/model/random-direction-2d-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/random-direction-2d-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
const double RandomDirection2dMobilityModel::PI = 3.14159265358979323846;
-NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel);
TypeId
--- a/src/mobility/model/random-walk-2d-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/random-walk-2d-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel);
TypeId
RandomWalk2dMobilityModel::GetTypeId (void)
--- a/src/mobility/model/random-waypoint-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/random-waypoint-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel);
TypeId
RandomWaypointMobilityModel::GetTypeId (void)
--- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SteadyStateRandomWaypointMobilityModel);
TypeId
SteadyStateRandomWaypointMobilityModel::GetTypeId (void)
--- a/src/mobility/model/waypoint-mobility-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mobility/model/waypoint-mobility-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WaypointMobilityModel);
TypeId
--- a/src/mpi/model/distributed-simulator-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/mpi/model/distributed-simulator-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DistributedSimulatorImpl);
LbtsMessage::~LbtsMessage ()
{
--- a/src/netanim/examples/uan-animation.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/netanim/examples/uan-animation.cc Wed Mar 05 17:06:59 2014 -0800
@@ -47,8 +47,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("UanCwExample")
- ;
+NS_LOG_COMPONENT_DEFINE ("UanCwExample");
NetAnimExperiment::NetAnimExperiment ()
: m_numNodes (15),
--- a/src/network/model/application.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/application.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Application)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Application);
// Application Methods
--- a/src/network/model/channel-list.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/channel-list.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("ChannelList")
- ;
+NS_LOG_COMPONENT_DEFINE ("ChannelList");
/**
* \brief private implementation detail of the ChannelList API.
@@ -56,8 +55,7 @@
std::vector<Ptr<Channel> > m_channels;
};
-NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ChannelListPriv);
TypeId
ChannelListPriv::GetTypeId (void)
--- a/src/network/model/channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Channel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Channel);
TypeId
Channel::GetTypeId (void)
--- a/src/network/model/chunk.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/chunk.cc Wed Mar 05 17:06:59 2014 -0800
@@ -2,8 +2,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Chunk)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Chunk);
TypeId
Chunk::GetTypeId (void)
--- a/src/network/model/header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -5,8 +5,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Header)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Header);
Header::~Header ()
{
--- a/src/network/model/net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (NetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NetDevice);
TypeId NetDevice::GetTypeId (void)
{
--- a/src/network/model/node-list.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/node-list.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("NodeList")
- ;
+NS_LOG_COMPONENT_DEFINE ("NodeList");
/**
* \brief private implementation detail of the NodeList API.
@@ -57,8 +56,7 @@
std::vector<Ptr<Node> > m_nodes;
};
-NS_OBJECT_ENSURE_REGISTERED (NodeListPriv)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NodeListPriv);
TypeId
NodeListPriv::GetTypeId (void)
--- a/src/network/model/node.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/node.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
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",
--- a/src/network/model/packet-tag-list.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/packet-tag-list.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
#include "ns3/log.h"
#include <cstring>
-NS_LOG_COMPONENT_DEFINE ("PacketTagList")
- ;
+NS_LOG_COMPONENT_DEFINE ("PacketTagList");
namespace ns3 {
--- a/src/network/model/socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SocketFactory);
TypeId SocketFactory::GetTypeId (void)
{
--- a/src/network/model/socket.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/socket.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Socket)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Socket);
TypeId
Socket::GetTypeId (void)
@@ -533,8 +532,7 @@
return m_address;
}
-NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SocketAddressTag);
TypeId
SocketAddressTag::GetTypeId (void)
@@ -594,8 +592,7 @@
return m_ttl;
}
-NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SocketIpTtlTag);
TypeId
SocketIpTtlTag::GetTypeId (void)
@@ -653,8 +650,7 @@
return m_hopLimit;
}
-NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SocketIpv6HopLimitTag);
TypeId
SocketIpv6HopLimitTag::GetTypeId (void)
@@ -715,8 +711,7 @@
return m_dontFragment;
}
-NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SocketSetDontFragmentTag);
TypeId
SocketSetDontFragmentTag::GetTypeId (void)
--- a/src/network/model/tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -21,8 +21,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Tag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Tag);
TypeId
Tag::GetTypeId (void)
--- a/src/network/model/trailer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/model/trailer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -5,8 +5,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Trailer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Trailer);
Trailer::~Trailer ()
{
--- a/src/network/utils/drop-tail-queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/drop-tail-queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DropTailQueue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DropTailQueue);
TypeId DropTailQueue::GetTypeId (void)
{
--- a/src/network/utils/error-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/error-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -77,8 +77,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ErrorModel);
TypeId ErrorModel::GetTypeId (void)
{
@@ -146,8 +145,7 @@
// RateErrorModel
//
-NS_OBJECT_ENSURE_REGISTERED (RateErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RateErrorModel);
TypeId RateErrorModel::GetTypeId (void)
{
@@ -286,8 +284,7 @@
// BurstErrorModel
//
-NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BurstErrorModel);
TypeId BurstErrorModel::GetTypeId (void)
{
@@ -415,8 +412,7 @@
// ListErrorModel
//
-NS_OBJECT_ENSURE_REGISTERED (ListErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ListErrorModel);
TypeId ListErrorModel::GetTypeId (void)
{
@@ -485,8 +481,7 @@
// ReceiveListErrorModel
//
-NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ReceiveListErrorModel);
TypeId ReceiveListErrorModel::GetTypeId (void)
{
--- a/src/network/utils/ethernet-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/ethernet-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EthernetHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EthernetHeader);
EthernetHeader::EthernetHeader (bool hasPreamble)
: m_enPreambleSfd (hasPreamble),
--- a/src/network/utils/ethernet-trailer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/ethernet-trailer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EthernetTrailer);
EthernetTrailer::EthernetTrailer ()
: m_calcFcs (false),
--- a/src/network/utils/flow-id-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/flow-id-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (FlowIdTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FlowIdTag);
TypeId
FlowIdTag::GetTypeId (void)
--- a/src/network/utils/llc-snap-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/llc-snap-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LlcSnapHeader);
LlcSnapHeader::LlcSnapHeader ()
{
--- a/src/network/utils/packet-burst.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/packet-burst.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PacketBurst)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketBurst);
TypeId
PacketBurst::GetTypeId (void)
--- a/src/network/utils/packet-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/packet-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PacketProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketProbe);
TypeId
PacketProbe::GetTypeId ()
--- a/src/network/utils/packet-socket-factory.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/packet-socket-factory.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory);
TypeId
PacketSocketFactory::GetTypeId (void)
--- a/src/network/utils/packet-socket.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/packet-socket.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PacketSocket)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketSocket);
TypeId
PacketSocket::GetTypeId (void)
@@ -537,8 +536,7 @@
return m_destAddr;
}
-NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketSocketTag);
TypeId
PacketSocketTag::GetTypeId (void)
@@ -601,8 +599,7 @@
return m_deviceName;
}
-NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DeviceNameTag);
TypeId
DeviceNameTag::GetTypeId (void)
--- a/src/network/utils/packetbb.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/packetbb.cc Wed Mar 05 17:06:59 2014 -0800
@@ -58,8 +58,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PbbPacket)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PbbPacket);
PbbTlvBlock::PbbTlvBlock (void)
{
--- a/src/network/utils/pcap-file-wrapper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/pcap-file-wrapper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PcapFileWrapper);
TypeId
PcapFileWrapper::GetTypeId (void)
--- a/src/network/utils/queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Queue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Queue);
TypeId
Queue::GetTypeId (void)
--- a/src/network/utils/radiotap-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/radiotap-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RadiotapHeader);
RadiotapHeader::RadiotapHeader()
: m_length (8),
--- a/src/network/utils/red-queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/red-queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -69,8 +69,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RedQueue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RedQueue);
TypeId RedQueue::GetTypeId (void)
{
--- a/src/network/utils/simple-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/simple-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SimpleChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SimpleChannel);
TypeId
SimpleChannel::GetTypeId (void)
--- a/src/network/utils/simple-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/network/utils/simple-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SimpleNetDevice);
TypeId
SimpleNetDevice::GetTypeId (void)
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ipv4NixVectorRouting);
TypeId
Ipv4NixVectorRouting::GetTypeId (void)
--- a/src/olsr/model/olsr-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/olsr/model/olsr-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -96,8 +96,7 @@
// ---------------- OLSR Packet -------------------------------
-NS_OBJECT_ENSURE_REGISTERED (PacketHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PacketHeader);
PacketHeader::PacketHeader ()
{
@@ -154,8 +153,7 @@
// ---------------- OLSR Message -------------------------------
-NS_OBJECT_ENSURE_REGISTERED (MessageHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MessageHeader);
MessageHeader::MessageHeader ()
: m_messageType (MessageHeader::MessageType (0))
--- a/src/olsr/model/olsr-routing-protocol.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/olsr/model/olsr-routing-protocol.cc Wed Mar 05 17:06:59 2014 -0800
@@ -146,8 +146,7 @@
/********** OLSR class **********/
-NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);
TypeId
RoutingProtocol::GetTypeId (void)
--- a/src/openflow/model/openflow-switch-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/openflow/model/openflow-switch-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OpenFlowSwitchNetDevice);
const char *
OpenFlowSwitchNetDevice::GetManufacturerDescription ()
--- a/src/point-to-point/model/point-to-point-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/point-to-point/model/point-to-point-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel);
TypeId
PointToPointChannel::GetTypeId (void)
--- a/src/point-to-point/model/point-to-point-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/point-to-point/model/point-to-point-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice);
TypeId
PointToPointNetDevice::GetTypeId (void)
--- a/src/point-to-point/model/point-to-point-remote-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/point-to-point/model/point-to-point-remote-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PointToPointRemoteChannel);
TypeId
PointToPointRemoteChannel::GetTypeId (void)
--- a/src/point-to-point/model/ppp-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/point-to-point/model/ppp-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PppHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PppHeader);
PppHeader::PppHeader ()
{
--- a/src/propagation/model/cost231-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/cost231-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,10 +29,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel")
- ;
-NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel)
- ;
+NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel");
+NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel);
TypeId
Cost231PropagationLossModel::GetTypeId (void)
--- a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ItuR1411LosPropagationLossModel);
TypeId
ItuR1411LosPropagationLossModel::GetTypeId (void)
--- a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ItuR1411NlosOverRooftopPropagationLossModel);
TypeId
--- a/src/propagation/model/jakes-process.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/jakes-process.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
return (m_amplitude * std::cos (at.GetSeconds () * m_omega + m_phase));
}
-NS_OBJECT_ENSURE_REGISTERED (JakesProcess)
- ;
+NS_OBJECT_ENSURE_REGISTERED (JakesProcess);
TypeId
JakesProcess::GetTypeId ()
--- a/src/propagation/model/jakes-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/jakes-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel);
const double JakesPropagationLossModel::PI = 3.14159265358979323846;
--- a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Kun2600MhzPropagationLossModel);
TypeId
--- a/src/propagation/model/okumura-hata-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/okumura-hata-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OkumuraHataPropagationLossModel);
TypeId
--- a/src/propagation/model/propagation-delay-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/propagation-delay-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel);
TypeId
PropagationDelayModel::GetTypeId (void)
@@ -49,8 +48,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomPropagationDelayModel);
TypeId
RandomPropagationDelayModel::GetTypeId (void)
@@ -86,8 +84,7 @@
return 1;
}
-NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantSpeedPropagationDelayModel);
TypeId
ConstantSpeedPropagationDelayModel::GetTypeId (void)
--- a/src/propagation/model/propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/model/propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (PropagationLossModel);
TypeId
PropagationLossModel::GetTypeId (void)
@@ -96,8 +95,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RandomPropagationLossModel);
TypeId
RandomPropagationLossModel::GetTypeId (void)
@@ -140,8 +138,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel);
const double FriisPropagationLossModel::PI = 3.14159265358979323846;
@@ -282,8 +279,7 @@
// ------------------------------------------------------------------------- //
// -- 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;
@@ -457,8 +453,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (LogDistancePropagationLossModel);
TypeId
LogDistancePropagationLossModel::GetTypeId (void)
@@ -546,8 +541,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ThreeLogDistancePropagationLossModel);
TypeId
ThreeLogDistancePropagationLossModel::GetTypeId (void)
@@ -648,8 +642,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NakagamiPropagationLossModel);
TypeId
NakagamiPropagationLossModel::GetTypeId (void)
@@ -763,8 +756,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FixedRssLossModel);
TypeId
FixedRssLossModel::GetTypeId (void)
@@ -810,8 +802,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MatrixPropagationLossModel);
TypeId
MatrixPropagationLossModel::GetTypeId (void)
@@ -890,8 +881,7 @@
// ------------------------------------------------------------------------- //
-NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RangePropagationLossModel);
TypeId
RangePropagationLossModel::GetTypeId (void)
--- a/src/propagation/test/itu-r-1411-los-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/test/itu-r-1411-los-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest")
- ;
+NS_LOG_COMPONENT_DEFINE ("ItuR1411LosPropagationLossModelTest");
class ItuR1411LosPropagationLossModelTestCase : public TestCase
--- a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest")
- ;
+NS_LOG_COMPONENT_DEFINE ("ItuR1411NlosOverRooftopPropagationLossModelTest");
class ItuR1411NlosOverRooftopPropagationLossModelTestCase : public TestCase
--- a/src/propagation/test/kun-2600-mhz-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/test/kun-2600-mhz-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest")
- ;
+NS_LOG_COMPONENT_DEFINE ("Kun2600MhzPropagationLossModelTest");
class Kun2600MhzPropagationLossModelTestCase : public TestCase
--- a/src/propagation/test/okumura-hata-test-suite.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/propagation/test/okumura-hata-test-suite.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest")
- ;
+NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest");
class OkumuraHataPropagationLossModelTestCase : public TestCase
--- a/src/sixlowpan/examples/example-sixlowpan.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/sixlowpan/examples/example-sixlowpan.cc Wed Mar 05 17:06:59 2014 -0800
@@ -50,8 +50,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("ExampleSixlowpan")
- ;
+NS_LOG_COMPONENT_DEFINE ("ExampleSixlowpan");
int main (int argc, char** argv)
{
--- a/src/sixlowpan/helper/sixlowpan-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/sixlowpan/helper/sixlowpan-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
#include "ns3/node.h"
#include "ns3/names.h"
-NS_LOG_COMPONENT_DEFINE ("SixLowPanHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("SixLowPanHelper");
namespace ns3 {
--- a/src/sixlowpan/model/sixlowpan-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/sixlowpan/model/sixlowpan-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -94,8 +94,7 @@
/*
* SixLowPanHc1
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanHc1)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanHc1);
SixLowPanHc1::SixLowPanHc1 ()
: m_hopLimit (0)
@@ -539,8 +538,7 @@
/*
* SixLowPanFrag1
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanFrag1)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanFrag1);
SixLowPanFrag1::SixLowPanFrag1 ()
: m_datagramSize (0),
@@ -624,8 +622,7 @@
* SixLowPanFragN
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanFragN)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanFragN);
SixLowPanFragN::SixLowPanFragN ()
: m_datagramSize (0),
@@ -723,8 +720,7 @@
/*
* SixLowPanIphcHeader
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanIphc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanIphc);
SixLowPanIphc::SixLowPanIphc ()
{
@@ -1419,8 +1415,7 @@
/*
* SixLowPanNhcExtensionHeader
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanNhcExtension)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanNhcExtension);
SixLowPanNhcExtension::SixLowPanNhcExtension ()
{
@@ -1547,8 +1542,7 @@
/*
* SixLowPanUdpNhcExtension
*/
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanUdpNhcExtension)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanUdpNhcExtension);
SixLowPanUdpNhcExtension::SixLowPanUdpNhcExtension ()
{
--- a/src/sixlowpan/model/sixlowpan-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/sixlowpan/model/sixlowpan-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,13 +41,11 @@
#include "sixlowpan-net-device.h"
#include "sixlowpan-header.h"
-NS_LOG_COMPONENT_DEFINE ("SixLowPanNetDevice")
- ;
+NS_LOG_COMPONENT_DEFINE ("SixLowPanNetDevice");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SixLowPanNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SixLowPanNetDevice);
TypeId SixLowPanNetDevice::GetTypeId (void)
{
--- a/src/sixlowpan/test/error-channel-sixlow.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/sixlowpan/test/error-channel-sixlow.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,13 +24,11 @@
#include "ns3/node.h"
#include "ns3/log.h"
-NS_LOG_COMPONENT_DEFINE ("ErrorChannelSixlow")
- ;
+NS_LOG_COMPONENT_DEFINE ("ErrorChannelSixlow");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ErrorChannelSixlow)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ErrorChannelSixlow);
TypeId
ErrorChannelSixlow::GetTypeId (void)
@@ -146,8 +144,7 @@
return m_devices[i];
}
-NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BinaryErrorSixlowModel);
TypeId BinaryErrorSixlowModel::GetTypeId (void)
{
--- a/src/spectrum/model/aloha-noack-mac-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/aloha-noack-mac-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AlohaNoackMacHeader);
TypeId
AlohaNoackMacHeader::GetTypeId (void)
--- a/src/spectrum/model/aloha-noack-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/aloha-noack-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -55,8 +55,7 @@
}
-NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AlohaNoackNetDevice);
TypeId
AlohaNoackNetDevice::GetTypeId (void)
--- a/src/spectrum/model/constant-spectrum-propagation-loss.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/constant-spectrum-propagation-loss.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantSpectrumPropagationLossModel);
ConstantSpectrumPropagationLossModel::ConstantSpectrumPropagationLossModel ()
{
--- a/src/spectrum/model/friis-spectrum-propagation-loss.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FriisSpectrumPropagationLossModel);
FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel ()
--- a/src/spectrum/model/half-duplex-ideal-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (HalfDuplexIdealPhy);
HalfDuplexIdealPhy::HalfDuplexIdealPhy ()
: m_mobility (0),
--- a/src/spectrum/model/multi-model-spectrum-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/multi-model-spectrum-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -45,8 +45,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MultiModelSpectrumChannel);
std::ostream& operator<< (std::ostream& lhs, TxSpectrumModelInfoMap_t& rhs)
--- a/src/spectrum/model/non-communicating-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/non-communicating-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
-NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NonCommunicatingNetDevice);
TypeId
NonCommunicatingNetDevice::GetTypeId (void)
--- a/src/spectrum/model/single-model-spectrum-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/single-model-spectrum-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -44,8 +44,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SingleModelSpectrumChannel);
SingleModelSpectrumChannel::SingleModelSpectrumChannel ()
{
--- a/src/spectrum/model/spectrum-analyzer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/spectrum-analyzer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SpectrumAnalyzer);
SpectrumAnalyzer::SpectrumAnalyzer ()
: m_mobility (0),
--- a/src/spectrum/model/spectrum-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/spectrum-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SpectrumChannel);
TypeId
SpectrumChannel::GetTypeId (void)
--- a/src/spectrum/model/spectrum-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/spectrum-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SpectrumPhy);
TypeId
--- a/src/spectrum/model/spectrum-propagation-loss-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/spectrum-propagation-loss-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SpectrumPropagationLossModel);
SpectrumPropagationLossModel::SpectrumPropagationLossModel ()
: m_next (0)
--- a/src/spectrum/model/waveform-generator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/spectrum/model/waveform-generator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WaveformGenerator);
WaveformGenerator::WaveformGenerator ()
: m_mobility (0),
--- a/src/stats/examples/double-probe-example.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/examples/double-probe-example.cc Wed Mar 05 17:06:59 2014 -0800
@@ -50,8 +50,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (Emitter)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Emitter);
TypeId
Emitter::GetTypeId (void)
--- a/src/stats/examples/file-helper-example.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/examples/file-helper-example.cc Wed Mar 05 17:06:59 2014 -0800
@@ -53,8 +53,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (Emitter)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Emitter);
TypeId
Emitter::GetTypeId (void)
--- a/src/stats/examples/gnuplot-helper-example.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/examples/gnuplot-helper-example.cc Wed Mar 05 17:06:59 2014 -0800
@@ -53,8 +53,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (Emitter)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Emitter);
TypeId
Emitter::GetTypeId (void)
--- a/src/stats/helper/file-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/helper/file-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("FileHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("FileHelper");
FileHelper::FileHelper ()
: m_aggregator (0),
--- a/src/stats/helper/gnuplot-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/helper/gnuplot-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("GnuplotHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("GnuplotHelper");
GnuplotHelper::GnuplotHelper ()
: m_aggregator (0),
--- a/src/stats/model/boolean-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/boolean-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BooleanProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BooleanProbe);
TypeId
BooleanProbe::GetTypeId ()
--- a/src/stats/model/data-collection-object.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/data-collection-object.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DataCollectionObject);
TypeId
DataCollectionObject::GetTypeId (void)
--- a/src/stats/model/double-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/double-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (DoubleProbe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DoubleProbe);
TypeId
DoubleProbe::GetTypeId ()
--- a/src/stats/model/file-aggregator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/file-aggregator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,11 +28,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("FileAggregator")
- ;
+NS_LOG_COMPONENT_DEFINE ("FileAggregator");
-NS_OBJECT_ENSURE_REGISTERED (FileAggregator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FileAggregator);
TypeId
FileAggregator::GetTypeId ()
--- a/src/stats/model/gnuplot-aggregator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/gnuplot-aggregator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,10 +28,8 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator")
- ;
-NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator)
- ;
+NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator");
+NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator);
TypeId
GnuplotAggregator::GetTypeId ()
--- a/src/stats/model/probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Probe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Probe);
TypeId
Probe::GetTypeId ()
--- a/src/stats/model/time-series-adaptor.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/time-series-adaptor.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TimeSeriesAdaptor);
TypeId
TimeSeriesAdaptor::GetTypeId (void)
--- a/src/stats/model/uinteger-16-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/uinteger-16-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Uinteger16Probe);
TypeId
Uinteger16Probe::GetTypeId ()
--- a/src/stats/model/uinteger-32-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/uinteger-32-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Uinteger32Probe);
TypeId
Uinteger32Probe::GetTypeId ()
--- a/src/stats/model/uinteger-8-probe.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/stats/model/uinteger-8-probe.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Uinteger8Probe);
TypeId
Uinteger8Probe::GetTypeId ()
--- a/src/tap-bridge/model/tap-bridge.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/tap-bridge/model/tap-bridge.cc Wed Mar 05 17:06:59 2014 -0800
@@ -73,8 +73,7 @@
#define TAP_MAGIC 95549
-NS_OBJECT_ENSURE_REGISTERED (TapBridge)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TapBridge);
TypeId
TapBridge::GetTypeId (void)
--- a/src/topology-read/helper/topology-reader-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/topology-read/helper/topology-reader-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper")
- ;
+NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper");
TopologyReaderHelper::TopologyReaderHelper ()
{
--- a/src/topology-read/model/inet-topology-reader.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/topology-read/model/inet-topology-reader.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,11 +30,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("InetTopologyReader")
- ;
+NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");
-NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader);
TypeId InetTopologyReader::GetTypeId (void)
{
--- a/src/topology-read/model/orbis-topology-reader.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/topology-read/model/orbis-topology-reader.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,11 +30,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader")
- ;
+NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");
-NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader);
TypeId OrbisTopologyReader::GetTypeId (void)
{
--- a/src/topology-read/model/rocketfuel-topology-reader.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/topology-read/model/rocketfuel-topology-reader.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,11 +30,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader")
- ;
+NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");
-NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader);
TypeId RocketfuelTopologyReader::GetTypeId (void)
{
--- a/src/topology-read/model/topology-reader.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/topology-read/model/topology-reader.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,11 +26,9 @@
namespace ns3 {
-NS_LOG_COMPONENT_DEFINE ("TopologyReader")
- ;
+NS_LOG_COMPONENT_DEFINE ("TopologyReader");
-NS_OBJECT_ENSURE_REGISTERED (TopologyReader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (TopologyReader);
TypeId TopologyReader::GetTypeId (void)
{
--- a/src/uan/examples/uan-cw-example.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/examples/uan-cw-example.cc Wed Mar 05 17:06:59 2014 -0800
@@ -53,8 +53,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("UanCwExample")
- ;
+NS_LOG_COMPONENT_DEFINE ("UanCwExample");
Experiment::Experiment ()
: m_numNodes (15),
--- a/src/uan/examples/uan-rc-example.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/examples/uan-rc-example.cc Wed Mar 05 17:06:59 2014 -0800
@@ -65,8 +65,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("UanRcExample")
- ;
+NS_LOG_COMPONENT_DEFINE ("UanRcExample");
Experiment::Experiment ()
--- a/src/uan/model/acoustic-modem-energy-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/acoustic-modem-energy-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AcousticModemEnergyModel);
TypeId
AcousticModemEnergyModel::GetTypeId (void)
--- a/src/uan/model/uan-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
NS_LOG_COMPONENT_DEFINE ("UanChannel");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanChannel);
TypeId
UanChannel::GetTypeId ()
--- a/src/uan/model/uan-header-common.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-header-common.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanHeaderCommon);
UanHeaderCommon::UanHeaderCommon ()
{
--- a/src/uan/model/uan-header-rc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-header-rc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,16 +25,11 @@
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 (),
--- a/src/uan/model/uan-mac-aloha.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-mac-aloha.cc Wed Mar 05 17:06:59 2014 -0800
@@ -32,8 +32,7 @@
namespace ns3
{
-NS_OBJECT_ENSURE_REGISTERED (UanMacAloha)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanMacAloha);
UanMacAloha::UanMacAloha ()
: UanMac (),
--- a/src/uan/model/uan-mac-cw.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-mac-cw.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanMacCw)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanMacCw);
UanMacCw::UanMacCw ()
: UanMac (),
--- a/src/uan/model/uan-mac-rc-gw.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-mac-rc-gw.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanMacRcGw);
UanMacRcGw::UanMacRcGw ()
: UanMac (),
--- a/src/uan/model/uan-mac-rc.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-mac-rc.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
NS_LOG_COMPONENT_DEFINE ("UanMacRc");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanMacRc)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanMacRc);
Reservation::Reservation ()
: m_length (0),
--- a/src/uan/model/uan-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanMac);
TypeId UanMac::GetTypeId (void)
{
--- a/src/uan/model/uan-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanNetDevice);
UanNetDevice::UanNetDevice ()
: NetDevice (),
--- a/src/uan/model/uan-noise-model-default.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-noise-model-default.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanNoiseModelDefault);
UanNoiseModelDefault::UanNoiseModelDefault ()
{
--- a/src/uan/model/uan-noise-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-noise-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanNoiseModel);
TypeId UanNoiseModel::GetTypeId (void)
{
--- a/src/uan/model/uan-phy-dual.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-phy-dual.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,10 +41,8 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanPhyDual)
- ;
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyDual);
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinrDual);
UanPhyCalcSinrDual::UanPhyCalcSinrDual ()
{
--- a/src/uan/model/uan-phy-gen.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-phy-gen.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,16 +40,11 @@
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 *****************/
--- a/src/uan/model/uan-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyCalcSinr);
TypeId UanPhyCalcSinr::GetTypeId (void)
{
@@ -44,8 +43,7 @@
Object::DoDispose ();
}
-NS_OBJECT_ENSURE_REGISTERED (UanPhyPer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhyPer);
TypeId UanPhyPer::GetTypeId (void)
{
@@ -66,8 +64,7 @@
Object::DoDispose ();
}
-NS_OBJECT_ENSURE_REGISTERED (UanPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPhy);
TypeId UanPhy::GetTypeId (void)
{
--- a/src/uan/model/uan-prop-model-ideal.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-prop-model-ideal.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPropModelIdeal);
UanPropModelIdeal::UanPropModelIdeal ()
{
--- a/src/uan/model/uan-prop-model-thorp.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-prop-model-thorp.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPropModelThorp);
UanPropModelThorp::UanPropModelThorp ()
{
--- a/src/uan/model/uan-prop-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-prop-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -336,8 +336,7 @@
return pdp;
}
-NS_OBJECT_ENSURE_REGISTERED (UanPropModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanPropModel);
TypeId UanPropModel::GetTypeId (void)
{
--- a/src/uan/model/uan-transducer-hd.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-transducer-hd.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanTransducerHd);
UanTransducerHd::UanTransducerHd ()
: UanTransducer (),
--- a/src/uan/model/uan-transducer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/model/uan-transducer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UanTransducer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UanTransducer);
TypeId UanTransducer::GetTypeId (void)
{
--- a/src/uan/test/uan-energy-model-test.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/uan/test/uan-energy-model-test.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
using namespace ns3;
-NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite")
- ;
+NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite");
class AcousticModemEnergyTestCase : public TestCase
{
--- a/src/virtual-net-device/model/virtual-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/virtual-net-device/model/virtual-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (VirtualNetDevice);
TypeId
VirtualNetDevice::GetTypeId (void)
--- a/src/visualizer/model/visual-simulator-impl.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/visualizer/model/visual-simulator-impl.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
-NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl)
- ;
+NS_OBJECT_ENSURE_REGISTERED (VisualSimulatorImpl);
namespace
{
--- a/src/wifi/helper/athstats-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/helper/athstats-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -105,8 +105,7 @@
-NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AthstatsWifiTraceSink);
TypeId
AthstatsWifiTraceSink::GetTypeId (void)
--- a/src/wifi/model/aarf-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/aarf-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -52,8 +52,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager);
TypeId
AarfWifiManager::GetTypeId (void)
--- a/src/wifi/model/aarfcd-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/aarfcd-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -59,8 +59,7 @@
bool m_haveASuccess;
};
-NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AarfcdWifiManager);
TypeId
AarfcdWifiManager::GetTypeId (void)
--- a/src/wifi/model/adhoc-wifi-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/adhoc-wifi-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -40,8 +40,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac);
TypeId
AdhocWifiMac::GetTypeId (void)
--- a/src/wifi/model/amrr-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/amrr-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -50,8 +50,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager);
TypeId
AmrrWifiManager::GetTypeId (void)
--- a/src/wifi/model/amsdu-subframe-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/amsdu-subframe-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (AmsduSubframeHeader);
TypeId
AmsduSubframeHeader::GetTypeId ()
--- a/src/wifi/model/ap-wifi-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/ap-wifi-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -42,8 +42,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ApWifiMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ApWifiMac);
TypeId
ApWifiMac::GetTypeId (void)
--- a/src/wifi/model/arf-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/arf-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -50,8 +50,7 @@
uint32_t m_rate;
};
-NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager);
TypeId
ArfWifiManager::GetTypeId (void)
--- a/src/wifi/model/cara-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/cara-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
uint32_t m_rate;
};
-NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CaraWifiManager);
TypeId
CaraWifiManager::GetTypeId (void)
--- a/src/wifi/model/constant-rate-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/constant-rate-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager);
TypeId
ConstantRateWifiManager::GetTypeId (void)
--- a/src/wifi/model/ctrl-headers.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/ctrl-headers.cc Wed Mar 05 17:06:59 2014 -0800
@@ -30,8 +30,7 @@
* Block ack request
***********************************/
-NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CtrlBAckRequestHeader);
CtrlBAckRequestHeader::CtrlBAckRequestHeader ()
: m_barAckPolicy (false),
@@ -279,8 +278,7 @@
* Block ack response
***********************************/
-NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (CtrlBAckResponseHeader);
CtrlBAckResponseHeader::CtrlBAckResponseHeader ()
: m_baAckPolicy (false),
--- a/src/wifi/model/dca-txop.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/dca-txop.cc Wed Mar 05 17:06:59 2014 -0800
@@ -120,8 +120,7 @@
DcaTxop *m_txop;
};
-NS_OBJECT_ENSURE_REGISTERED (DcaTxop)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DcaTxop);
TypeId
DcaTxop::GetTypeId (void)
--- a/src/wifi/model/dcf.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/dcf.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Dcf)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Dcf);
TypeId
Dcf::GetTypeId (void)
--- a/src/wifi/model/edca-txop-n.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/edca-txop-n.cc Wed Mar 05 17:06:59 2014 -0800
@@ -138,8 +138,7 @@
EdcaTxopN *m_txop;
};
-NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN)
- ;
+NS_OBJECT_ENSURE_REGISTERED (EdcaTxopN);
TypeId
EdcaTxopN::GetTypeId (void)
--- a/src/wifi/model/error-rate-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/error-rate-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -21,8 +21,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ErrorRateModel);
TypeId ErrorRateModel::GetTypeId (void)
{
--- a/src/wifi/model/ideal-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/ideal-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
double m_lastSnr; //!< SNR of last packet sent to the remote station
};
-NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager);
TypeId
IdealWifiManager::GetTypeId (void)
--- a/src/wifi/model/mgt-headers.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/mgt-headers.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
* Probe Request
***********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtProbeRequestHeader);
MgtProbeRequestHeader::~MgtProbeRequestHeader ()
{
@@ -123,8 +122,7 @@
* Probe Response
***********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtProbeResponseHeader);
MgtProbeResponseHeader::MgtProbeResponseHeader ()
{
@@ -257,8 +255,7 @@
* Assoc Request
***********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtAssocRequestHeader);
MgtAssocRequestHeader::MgtAssocRequestHeader ()
: m_listenInterval (0)
@@ -370,8 +367,7 @@
* Assoc Response
***********************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtAssocResponseHeader);
MgtAssocResponseHeader::MgtAssocResponseHeader ()
: m_aid (0)
@@ -641,8 +637,7 @@
* ADDBARequest
****************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtAddBaRequestHeader);
MgtAddBaRequestHeader::MgtAddBaRequestHeader ()
: m_dialogToken (1),
@@ -818,8 +813,7 @@
* ADDBAResponse
****************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtAddBaResponseHeader);
MgtAddBaResponseHeader::MgtAddBaResponseHeader ()
: m_dialogToken (1),
@@ -985,8 +979,7 @@
* DelBa
****************************************************/
-NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MgtDelBaHeader);
MgtDelBaHeader::MgtDelBaHeader ()
: m_reasonCode (1)
--- a/src/wifi/model/minstrel-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/minstrel-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -83,8 +83,7 @@
bool m_initialized; ///< for initializing tables
};
-NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MinstrelWifiManager);
TypeId
MinstrelWifiManager::GetTypeId (void)
--- a/src/wifi/model/msdu-aggregator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/msdu-aggregator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MsduAggregator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MsduAggregator);
TypeId
MsduAggregator::GetTypeId (void)
--- a/src/wifi/model/msdu-standard-aggregator.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/msdu-standard-aggregator.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MsduStandardAggregator);
TypeId
MsduStandardAggregator::GetTypeId (void)
--- a/src/wifi/model/nist-error-rate-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/nist-error-rate-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (NistErrorRateModel);
TypeId
NistErrorRateModel::GetTypeId (void)
--- a/src/wifi/model/onoe-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/onoe-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -48,8 +48,7 @@
};
-NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (OnoeWifiManager);
TypeId
OnoeWifiManager::GetTypeId (void)
--- a/src/wifi/model/qos-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/qos-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -23,8 +23,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (QosTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (QosTag);
TypeId
QosTag::GetTypeId (void)
--- a/src/wifi/model/regular-wifi-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/regular-wifi-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac);
RegularWifiMac::RegularWifiMac ()
{
--- a/src/wifi/model/rraa-wifi-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/rraa-wifi-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -52,8 +52,7 @@
uint32_t m_rate;
};
-NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RraaWifiManager);
TypeId
RraaWifiManager::GetTypeId (void)
--- a/src/wifi/model/snr-tag.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/snr-tag.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SnrTag)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SnrTag);
TypeId
SnrTag::GetTypeId (void)
--- a/src/wifi/model/sta-wifi-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/sta-wifi-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -60,8 +60,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (StaWifiMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (StaWifiMac);
TypeId
StaWifiMac::GetTypeId (void)
--- a/src/wifi/model/wifi-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiChannel);
TypeId
WifiChannel::GetTypeId (void)
--- a/src/wifi/model/wifi-information-element-vector.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-information-element-vector.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiInformationElementVector);
WifiInformationElementVector::WifiInformationElementVector ()
: m_maxSize (1500)
--- a/src/wifi/model/wifi-mac-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-mac-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiMacHeader);
enum
{
--- a/src/wifi/model/wifi-mac-queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-mac-queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -29,8 +29,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiMacQueue);
WifiMacQueue::Item::Item (Ptr<const Packet> packet,
const WifiMacHeader &hdr,
--- a/src/wifi/model/wifi-mac-trailer.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-mac-trailer.cc Wed Mar 05 17:06:59 2014 -0800
@@ -22,8 +22,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiMacTrailer);
WifiMacTrailer::WifiMacTrailer ()
{
--- a/src/wifi/model/wifi-mac.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-mac.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiMac)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiMac);
Time
--- a/src/wifi/model/wifi-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiNetDevice);
TypeId
WifiNetDevice::GetTypeId (void)
--- a/src/wifi/model/wifi-phy-state-helper.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-phy-state-helper.cc Wed Mar 05 17:06:59 2014 -0800
@@ -26,8 +26,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiPhyStateHelper);
TypeId
WifiPhyStateHelper::GetTypeId (void)
--- a/src/wifi/model/wifi-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -48,8 +48,7 @@
* The actual WifiPhy class
****************************************************************/
-NS_OBJECT_ENSURE_REGISTERED (WifiPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiPhy);
TypeId
WifiPhy::GetTypeId (void)
--- a/src/wifi/model/wifi-remote-station-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/wifi-remote-station-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -249,8 +249,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager);
TypeId
WifiRemoteStationManager::GetTypeId (void)
--- a/src/wifi/model/yans-error-rate-model.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/yans-error-rate-model.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (YansErrorRateModel);
TypeId
YansErrorRateModel::GetTypeId (void)
--- a/src/wifi/model/yans-wifi-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/yans-wifi-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (YansWifiChannel);
TypeId
YansWifiChannel::GetTypeId (void)
--- a/src/wifi/model/yans-wifi-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wifi/model/yans-wifi-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -42,8 +42,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (YansWifiPhy);
TypeId
YansWifiPhy::GetTypeId (void)
--- a/src/wimax/model/bandwidth-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bandwidth-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -37,8 +37,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BandwidthManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BandwidthManager);
TypeId BandwidthManager::GetTypeId (void)
{
--- a/src/wimax/model/bs-link-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-link-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BSLinkManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BSLinkManager);
TypeId BSLinkManager::GetTypeId (void)
{
--- a/src/wimax/model/bs-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -50,8 +50,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BaseStationNetDevice);
TypeId BaseStationNetDevice::GetTypeId (void)
{
--- a/src/wimax/model/bs-scheduler-rtps.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-scheduler-rtps.cc Wed Mar 05 17:06:59 2014 -0800
@@ -41,8 +41,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerRtps);
TypeId
BSSchedulerRtps::GetTypeId (void)
--- a/src/wimax/model/bs-scheduler-simple.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-scheduler-simple.cc Wed Mar 05 17:06:59 2014 -0800
@@ -39,8 +39,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BSSchedulerSimple);
TypeId BSSchedulerSimple::GetTypeId (void)
{
--- a/src/wimax/model/bs-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
NS_LOG_COMPONENT_DEFINE ("BSScheduler");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BSScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BSScheduler);
TypeId
BSScheduler::GetTypeId (void)
--- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc Wed Mar 05 17:06:59 2014 -0800
@@ -33,8 +33,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerMBQoS);
UplinkSchedulerMBQoS::UplinkSchedulerMBQoS ()
{
--- a/src/wimax/model/bs-uplink-scheduler-rtps.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerRtps");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED ( UplinkSchedulerRtps)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerRtps);
UplinkSchedulerRtps::UplinkSchedulerRtps ()
--- a/src/wimax/model/bs-uplink-scheduler-simple.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-uplink-scheduler-simple.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
NS_LOG_COMPONENT_DEFINE ("UplinkSchedulerSimple");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UplinkSchedulerSimple);
UplinkSchedulerSimple::UplinkSchedulerSimple (void)
{
--- a/src/wimax/model/bs-uplink-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/bs-uplink-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -36,8 +36,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UplinkScheduler);
UplinkScheduler::UplinkScheduler (void)
: m_bs (0),
--- a/src/wimax/model/burst-profile-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/burst-profile-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BurstProfileManager);
TypeId BurstProfileManager::GetTypeId (void)
{
--- a/src/wimax/model/connection-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/connection-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ConnectionManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ConnectionManager);
TypeId ConnectionManager::GetTypeId (void)
{
--- a/src/wimax/model/dl-mac-messages.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/dl-mac-messages.cc Wed Mar 05 17:06:59 2014 -0800
@@ -312,8 +312,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (Dcd)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Dcd);
Dcd::Dcd (void)
: m_reserved (0),
@@ -545,8 +544,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (DlMap)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DlMap);
DlMap::DlMap (void)
: m_dcdCount (0),
--- a/src/wimax/model/ipcs-classifier.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ipcs-classifier.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier)
- ;
+NS_OBJECT_ENSURE_REGISTERED (IpcsClassifier);
TypeId IpcsClassifier::GetTypeId (void)
{
--- a/src/wimax/model/mac-messages.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/mac-messages.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,10 +27,10 @@
#include "wimax-tlv.h"
NS_LOG_COMPONENT_DEFINE ("MACMESSAGES");
+
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ManagementMessageType);
ManagementMessageType::ManagementMessageType (void)
: m_type (~0)
@@ -105,10 +105,9 @@
return i.GetDistanceFrom (start);
}
-// ----------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (RngReq)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RngReq);
RngReq::RngReq (void)
: m_reserved (0),
@@ -220,10 +219,9 @@
return i.GetDistanceFrom (start);
}
-// ----------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (RngRsp)
- ;
+NS_OBJECT_ENSURE_REGISTERED (RngRsp);
RngRsp::RngRsp (void)
: m_reserved (0),
@@ -498,10 +496,9 @@
return i.GetDistanceFrom (start);
}
-// ----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (DsaReq)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsaReq);
DsaReq::DsaReq (void)
: m_transactionId (0),
@@ -633,10 +630,9 @@
m_serviceFlow = sf;
}
-// ----------------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (DsaRsp)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsaRsp);
DsaRsp::DsaRsp (void)
: m_transactionId (0),
@@ -774,10 +770,9 @@
return size + 3;
}
-// ----------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (DsaAck)
- ;
+NS_OBJECT_ENSURE_REGISTERED (DsaAck);
DsaAck::DsaAck (void)
: m_transactionId (0),
--- a/src/wimax/model/service-flow-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/service-flow-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (ServiceFlowManager);
TypeId ServiceFlowManager::GetTypeId (void)
{
--- a/src/wimax/model/simple-ofdm-wimax-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/simple-ofdm-wimax-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -38,8 +38,7 @@
NS_LOG_COMPONENT_DEFINE ("SimpleOfdmWimaxPhy");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SimpleOfdmWimaxPhy);
TypeId SimpleOfdmWimaxPhy::GetTypeId (void)
{
--- a/src/wimax/model/ss-link-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ss-link-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -35,8 +35,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SSLinkManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SSLinkManager);
TypeId SSLinkManager::GetTypeId (void)
{
--- a/src/wimax/model/ss-manager.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ss-manager.cc Wed Mar 05 17:06:59 2014 -0800
@@ -28,8 +28,7 @@
NS_LOG_COMPONENT_DEFINE ("SSManager");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SSManager)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SSManager);
TypeId SSManager::GetTypeId (void)
{
--- a/src/wimax/model/ss-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ss-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -46,8 +46,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SubscriberStationNetDevice);
Time SubscriberStationNetDevice::GetDefaultLostDlMapInterval ()
{
--- a/src/wimax/model/ss-scheduler.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ss-scheduler.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
NS_LOG_COMPONENT_DEFINE ("SSScheduler");
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (SSScheduler)
- ;
+NS_OBJECT_ENSURE_REGISTERED (SSScheduler);
TypeId SSScheduler::GetTypeId (void)
{
--- a/src/wimax/model/ul-mac-messages.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/ul-mac-messages.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (Ucd)
- ;
+NS_OBJECT_ENSURE_REGISTERED (Ucd);
UcdChannelEncodings::UcdChannelEncodings (void)
: m_bwReqOppSize (0),
@@ -578,8 +577,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (UlMap)
- ;
+NS_OBJECT_ENSURE_REGISTERED (UlMap);
UlMap::UlMap (void)
: m_reserved (0),
--- a/src/wimax/model/wimax-channel.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-channel.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxChannel)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxChannel);
TypeId WimaxChannel::GetTypeId (void)
{
--- a/src/wimax/model/wimax-connection.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-connection.cc Wed Mar 05 17:06:59 2014 -0800
@@ -27,8 +27,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxConnection)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxConnection);
TypeId WimaxConnection::GetTypeId (void)
{
--- a/src/wimax/model/wimax-mac-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-mac-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -25,8 +25,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (MacHeaderType)
- ;
+NS_OBJECT_ENSURE_REGISTERED (MacHeaderType);
MacHeaderType::MacHeaderType (void)
: m_type (0)
@@ -93,8 +92,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GenericMacHeader);
GenericMacHeader::GenericMacHeader (void)
: m_ht (0),
@@ -298,8 +296,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (BandwidthRequestHeader);
BandwidthRequestHeader::BandwidthRequestHeader (void)
: m_ht (1),
@@ -481,8 +478,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (GrantManagementSubheader);
GrantManagementSubheader::GrantManagementSubheader (void)
: m_si (0),
@@ -573,8 +569,7 @@
// ----------------------------------------------------------------------------------------------------------
-NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (FragmentationSubheader);
FragmentationSubheader::FragmentationSubheader (void)
: m_fc (0),
--- a/src/wimax/model/wimax-mac-queue.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-mac-queue.cc Wed Mar 05 17:06:59 2014 -0800
@@ -31,8 +31,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacQueue);
WimaxMacQueue::QueueElement::QueueElement (void)
: m_packet (Create<Packet> ()),
--- a/src/wimax/model/wimax-mac-to-mac-header.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-mac-to-mac-header.cc Wed Mar 05 17:06:59 2014 -0800
@@ -24,8 +24,7 @@
#include "ns3/log.h"
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxMacToMacHeader);
WimaxMacToMacHeader::WimaxMacToMacHeader (void)
: m_len (0)
--- a/src/wimax/model/wimax-net-device.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-net-device.cc Wed Mar 05 17:06:59 2014 -0800
@@ -43,8 +43,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxNetDevice);
uint32_t WimaxNetDevice::m_nrFrames = 0;
uint8_t WimaxNetDevice::m_direction = ~0;
--- a/src/wimax/model/wimax-phy.cc Wed Mar 05 16:55:49 2014 -0800
+++ b/src/wimax/model/wimax-phy.cc Wed Mar 05 17:06:59 2014 -0800
@@ -34,8 +34,7 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (WimaxPhy)
- ;
+NS_OBJECT_ENSURE_REGISTERED (WimaxPhy);
TypeId WimaxPhy::GetTypeId (void)
{