[Bug 1551] Redux: NS_LOG_COMPONENT_DEFINE inside or outside of ns3 namespace?

doc/manual/source/logging.rst

@@ -320,7 +320,7 @@ How to add logging to your code
 Adding logging to your code is very simple:
 
 1. Invoke the ``NS_LOG_COMPONENT_DEFINE (...);`` macro
-   outside of ``namespace ns3``.
+   inside of ``namespace ns3``.
 
   Create a unique string identifier (usually based on the name of the file
   and/or class defined within the file) and register it with a macro call
@@ -328,9 +328,9 @@ Adding logging to your code is very simple:
 
   ::
 
-    NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
-
     namespace ns3 {
+    
+    NS_LOG_COMPONENT_DEFINE ("Ipv4L3Protocol");
     ...
 
   This registers ``Ipv4L3Protocol`` as a log component.

examples/energy/energy-model-example.cc

@@ -31,10 +31,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("EnergyExample");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("EnergyExample");
+
 static inline std::string
 PrintReceivedPacket (Address& from)
 {

examples/energy/energy-model-with-harvesting-example.cc

@@ -60,10 +60,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("EnergyWithHarvestingExample");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("EnergyWithHarvestingExample");
+
 static inline std::string
 PrintReceivedPacket (Address& from)
 {

examples/ipv6/fragmentation-ipv6.cc

@@ -41,7 +41,6 @@ using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("FragmentationIpv6Example");
 
-
 int main (int argc, char** argv)
 {
   bool verbose = false;

examples/ipv6/loose-routing-ipv6.cc

@@ -44,6 +44,7 @@
 #include "ns3/csma-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/ipv6-header.h"
+
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LooseRoutingIpv6Example");

examples/ipv6/test-ipv6.cc

@@ -24,10 +24,10 @@
 #include "ns3/node.h"
 #include "ns3/mac48-address.h"
 
-NS_LOG_COMPONENT_DEFINE ("TestIpv6");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("TestIpv6");
+
 int 
 main (int argc, char *argv[])
 {

examples/stats/wifi-example-sim.cc

@@ -49,9 +49,6 @@ using namespace std;
 
 NS_LOG_COMPONENT_DEFINE ("WiFiDistanceExperiment");
 
-
-
-
 void TxCallback (Ptr<CounterCalculator<uint32_t> > datac,
                  std::string path, Ptr<const Packet> packet) {
   NS_LOG_INFO ("Sent frame counted in " <<

examples/tcp/tcp-large-transfer.cc

@@ -44,7 +44,6 @@ using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("TcpLargeTransfer");
 
-
 // The number of bytes to send in this simulation.
 static const uint32_t totalTxBytes = 2000000;
 static uint32_t currentTxBytes = 0;

examples/tutorial/hello-simulator.cc

@@ -16,10 +16,10 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("HelloSimulator");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("HelloSimulator");
+
 int
 main (int argc, char *argv[])
 {

examples/wireless/multirate.cc

@@ -64,10 +64,10 @@
 #include <iostream>
 #include <fstream>
 
-NS_LOG_COMPONENT_DEFINE ("multirate");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("multirate");
+
 class Experiment
 {
 public:

examples/wireless/wifi-adhoc.cc

@@ -27,10 +27,10 @@
 
 #include <iostream>
 
-NS_LOG_COMPONENT_DEFINE ("Main");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("Main");
+
 class Experiment
 {
 public:

examples/wireless/wifi-clear-channel-cmu.cc

@@ -30,10 +30,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("Main");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("Main");
+
 class Experiment
 {
 public:

examples/wireless/wifi-simple-adhoc-grid.cc

@@ -84,10 +84,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhocGrid");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhocGrid");
+
 void ReceivePacket (Ptr<Socket> socket)
 {
   while (socket->Recv ())

examples/wireless/wifi-simple-adhoc.cc

@@ -63,10 +63,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleAdhoc");
+
 void ReceivePacket (Ptr<Socket> socket)
 {
   while (socket->Recv ())

examples/wireless/wifi-simple-infra.cc

@@ -64,10 +64,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleInfra");
+
 void ReceivePacket (Ptr<Socket> socket)
 {
   while (socket->Recv ())

examples/wireless/wifi-simple-interference.cc

@@ -92,10 +92,10 @@
 #include <vector>
 #include <string>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleInterference");
+
 static inline std::string PrintReceivedPacket (Ptr<Socket> socket)
 {
   Address addr;

examples/wireless/wifi-sleep.cc

@@ -62,10 +62,10 @@
 #include <string>
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("WifiSleep");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSleep");
+
 template <int node>
 void RemainingEnergyTrace (double oldValue, double newValue)
 {

scratch/scratch-simulator.cc

@@ -16,10 +16,10 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
+
 int 
 main (int argc, char *argv[])
 {

scratch/subdir/scratch-simulator-subdir.cc

@@ -16,10 +16,10 @@
 
 #include "ns3/core-module.h"
 
-NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("ScratchSimulator");
+
 int 
 main (int argc, char *argv[])
 {

src/antenna/model/angles.cc

@@ -24,10 +24,9 @@
 #include "angles.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("Angles");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Angles");
 
 double DegreesToRadians (double degrees)
 {

src/antenna/model/antenna-model.cc

@@ -24,10 +24,10 @@
 #include "antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("AntennaModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("AntennaModel");
+
 NS_OBJECT_ENSURE_REGISTERED (AntennaModel);
 
 

src/antenna/model/cosine-antenna-model.cc

@@ -27,10 +27,10 @@
 #include "cosine-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("CosineAntennaModel");
+
 NS_OBJECT_ENSURE_REGISTERED (CosineAntennaModel);
 
 

src/antenna/model/isotropic-antenna-model.cc

@@ -25,10 +25,10 @@
 #include "isotropic-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("IsotropicAntennaModel");
+
 NS_OBJECT_ENSURE_REGISTERED (IsotropicAntennaModel);
 
 

src/antenna/model/parabolic-antenna-model.cc

@@ -27,10 +27,10 @@
 #include "parabolic-antenna-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ParabolicAntennaModel");
+
 NS_OBJECT_ENSURE_REGISTERED (ParabolicAntennaModel);
 
 

src/antenna/test/test-cosine-antenna.cc

@@ -29,10 +29,10 @@
 #include <sstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("TestCosineAntennaModel");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("TestCosineAntennaModel");
+
 enum CosineAntennaModelGainTestCondition  {
   EQUAL = 0,
   LESSTHAN = 1

src/antenna/test/test-parabolic-antenna.cc

@@ -29,10 +29,10 @@
 #include <sstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("TestParabolicAntennaModel");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("TestParabolicAntennaModel");
+
 enum ParabolicAntennaModelGainTestCondition  {
   EQUAL = 0,
   LESSTHAN = 1

src/aodv/model/aodv-neighbor.cc

@@ -30,10 +30,12 @@
 #include "ns3/log.h"
 #include <algorithm>
 
-NS_LOG_COMPONENT_DEFINE ("AodvNeighbors");
 
 namespace ns3
 {
+  
+NS_LOG_COMPONENT_DEFINE ("AodvNeighbors");
+
 namespace aodv
 {
 Neighbors::Neighbors (Time delay) : 

src/aodv/model/aodv-routing-protocol.cc

@@ -42,10 +42,11 @@
 #include <algorithm>
 #include <limits>
 
-NS_LOG_COMPONENT_DEFINE ("AodvRoutingProtocol");
-
 namespace ns3
 {
+
+NS_LOG_COMPONENT_DEFINE ("AodvRoutingProtocol");
+
 namespace aodv
 {
 NS_OBJECT_ENSURE_REGISTERED (RoutingProtocol);

src/aodv/model/aodv-rqueue.cc

@@ -32,10 +32,11 @@
 #include "ns3/socket.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("AodvRequestQueue");
-
 namespace ns3
 {
+
+NS_LOG_COMPONENT_DEFINE ("AodvRequestQueue");
+
 namespace aodv
 {
 uint32_t

src/aodv/model/aodv-rtable.cc

@@ -32,10 +32,11 @@
 #include "ns3/simulator.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("AodvRoutingTable");
-
 namespace ns3
 {
+
+NS_LOG_COMPONENT_DEFINE ("AodvRoutingTable");
+
 namespace aodv
 {
 

src/applications/helper/radvd-helper.cc

@@ -26,11 +26,11 @@
 
 #include "radvd-helper.h"
 
-NS_LOG_COMPONENT_DEFINE ("RadvdHelper");
-
 namespace ns3
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdHelper");
+
 RadvdHelper::RadvdHelper ()
 {
   m_factory.SetTypeId (Radvd::GetTypeId ());

src/applications/model/application-packet-probe.cc

@@ -28,10 +28,10 @@
 #include "ns3/config.h"
 #include "ns3/trace-source-accessor.h"
 
-NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ApplicationPacketProbe");
+
 NS_OBJECT_ENSURE_REGISTERED (ApplicationPacketProbe);
 
 TypeId

src/applications/model/bulk-send-application.cc

@@ -31,10 +31,10 @@
 #include "ns3/tcp-socket-factory.h"
 #include "bulk-send-application.h"
 
-NS_LOG_COMPONENT_DEFINE ("BulkSendApplication");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BulkSendApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (BulkSendApplication);
 
 TypeId

src/applications/model/onoff-application.cc

@@ -42,10 +42,10 @@
 #include "ns3/string.h"
 #include "ns3/pointer.h"
 
-NS_LOG_COMPONENT_DEFINE ("OnOffApplication");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("OnOffApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (OnOffApplication);
 
 TypeId

src/applications/model/packet-loss-counter.cc

@@ -24,10 +24,9 @@
 #include "ns3/uinteger.h"
 #include "packet-loss-counter.h"
 
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
 
 PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)
   : m_lost (0),

src/applications/model/packet-sink.cc

@@ -32,10 +32,10 @@
 #include "ns3/udp-socket-factory.h"
 #include "packet-sink.h"
 
-NS_LOG_COMPONENT_DEFINE ("PacketSink");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("PacketSink");
+
 NS_OBJECT_ENSURE_REGISTERED (PacketSink);
 
 TypeId 

src/applications/model/ping6.cc

@@ -35,11 +35,11 @@
 
 #include "ping6.h"
 
-NS_LOG_COMPONENT_DEFINE ("Ping6Application");
-
 namespace ns3 
 {
 
+NS_LOG_COMPONENT_DEFINE ("Ping6Application");
+
 NS_OBJECT_ENSURE_REGISTERED (Ping6);
 
 TypeId Ping6::GetTypeId ()

src/applications/model/radvd-interface.cc

@@ -21,11 +21,11 @@
 #include "radvd-interface.h"
 #include <ns3/log.h>
 
-NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
-
 namespace ns3 
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdInterface");
+
 RadvdInterface::RadvdInterface (uint32_t interface)
   : m_interface (interface)
 {

src/applications/model/radvd-prefix.cc

@@ -21,11 +21,11 @@
 #include "radvd-prefix.h"
 #include <ns3/log.h>
 
-NS_LOG_COMPONENT_DEFINE ("RadvdPrefix");
-
 namespace ns3
 {
 
+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),
     m_prefixLength (prefixLength),

src/applications/model/radvd.cc

@@ -37,11 +37,11 @@
 
 #include "radvd.h"
 
-NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
-
 namespace ns3
 {
 
+NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (Radvd);
 
 TypeId Radvd::GetTypeId ()

src/applications/model/seq-ts-header.cc

@@ -24,10 +24,10 @@
 #include "ns3/simulator.h"
 #include "seq-ts-header.h"
 
-NS_LOG_COMPONENT_DEFINE ("SeqTsHeader");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("SeqTsHeader");
+
 NS_OBJECT_ENSURE_REGISTERED (SeqTsHeader);
 
 SeqTsHeader::SeqTsHeader ()

src/applications/model/udp-client.cc

@@ -33,10 +33,10 @@
 #include <cstdlib>
 #include <cstdio>
 
-NS_LOG_COMPONENT_DEFINE ("UdpClient");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("UdpClient");
+
 NS_OBJECT_ENSURE_REGISTERED (UdpClient);
 
 TypeId

src/applications/model/udp-echo-client.cc

@@ -29,10 +29,10 @@
 #include "ns3/trace-source-accessor.h"
 #include "udp-echo-client.h"
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient);
 
 TypeId

src/applications/model/udp-echo-server.cc

@@ -32,10 +32,10 @@
 
 #include "udp-echo-server.h"
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
+
 NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer);
 
 TypeId

src/applications/model/udp-server.cc

@@ -34,10 +34,10 @@
 #include "seq-ts-header.h"
 #include "udp-server.h"
 
-NS_LOG_COMPONENT_DEFINE ("UdpServer");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("UdpServer");
+
 NS_OBJECT_ENSURE_REGISTERED (UdpServer);
 
 

src/applications/model/udp-trace-client.cc

@@ -35,10 +35,10 @@
 #include <cstdio>
 #include <fstream>
 
-NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
+
 NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient);
 
 /**

src/applications/model/v4ping.cc

@@ -26,10 +26,10 @@
 #include "ns3/packet.h"
 #include "ns3/trace-source-accessor.h"
 
-NS_LOG_COMPONENT_DEFINE ("V4Ping");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("V4Ping");
+
 NS_OBJECT_ENSURE_REGISTERED (V4Ping);
 
 TypeId 

src/bridge/helper/bridge-helper.cc

@@ -22,10 +22,10 @@
 #include "ns3/node.h"
 #include "ns3/names.h"
 
-NS_LOG_COMPONENT_DEFINE ("BridgeHelper");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BridgeHelper");
+
 BridgeHelper::BridgeHelper ()
 {
   NS_LOG_FUNCTION_NOARGS ();

src/bridge/model/bridge-channel.cc

@@ -19,10 +19,10 @@
 #include "ns3/log.h"
 #include "bridge-channel.h"
 
-NS_LOG_COMPONENT_DEFINE ("BridgeChannel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BridgeChannel");
+
 NS_OBJECT_ENSURE_REGISTERED (BridgeChannel);
 
 TypeId 

src/bridge/model/bridge-net-device.cc

@@ -24,10 +24,10 @@
 #include "ns3/simulator.h"
 #include "ns3/uinteger.h"
 
-NS_LOG_COMPONENT_DEFINE ("BridgeNetDevice");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BridgeNetDevice");
+
 NS_OBJECT_ENSURE_REGISTERED (BridgeNetDevice);
 
 

src/brite/helper/brite-topology-helper.cc

@@ -30,10 +30,10 @@
 #include <iostream>
 #include <fstream>
 
-NS_LOG_COMPONENT_DEFINE ("BriteTopologyHelper");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BriteTopologyHelper");
+
 BriteTopologyHelper::BriteTopologyHelper (std::string confFile,
                                           std::string seedFile,
                                           std::string newseedFile)

src/buildings/helper/building-allocator.cc

@@ -27,10 +27,10 @@
 #include "ns3/log.h"
 #include <cmath>
 
-NS_LOG_COMPONENT_DEFINE ("BuildingAllocator");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BuildingAllocator");
+
 NS_OBJECT_ENSURE_REGISTERED (GridBuildingAllocator);
 
 GridBuildingAllocator::GridBuildingAllocator ()

src/buildings/helper/buildings-helper.cc

@@ -29,10 +29,9 @@
 #include <ns3/log.h>
 
 
-NS_LOG_COMPONENT_DEFINE ("BuildingsHelper");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BuildingsHelper");
 
 void
 BuildingsHelper::Install (NodeContainer c)

src/buildings/model/building-list.cc

@@ -28,10 +28,10 @@
 #include "building-list.h"
 #include "building.h"
 
-NS_LOG_COMPONENT_DEFINE ("BuildingList");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BuildingList");
+
 /**
  * \brief private implementation detail of the BuildingList API.
  */

src/buildings/model/building.cc

@@ -29,10 +29,9 @@
 #include <ns3/assert.h>
 #include <cmath>
 
-NS_LOG_COMPONENT_DEFINE ("Building");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Building");
 
 NS_OBJECT_ENSURE_REGISTERED (Building);
 

src/buildings/model/buildings-propagation-loss-model.cc

@@ -31,10 +31,10 @@
 #include "ns3/enum.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("BuildingsPropagationLossModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("BuildingsPropagationLossModel");
+
 NS_OBJECT_ENSURE_REGISTERED (BuildingsPropagationLossModel);
 
 BuildingsPropagationLossModel::ShadowingLoss::ShadowingLoss ()

src/buildings/model/hybrid-buildings-propagation-loss-model.cc

@@ -37,10 +37,10 @@
 #include "hybrid-buildings-propagation-loss-model.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("HybridBuildingsPropagationLossModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("HybridBuildingsPropagationLossModel");
+
 NS_OBJECT_ENSURE_REGISTERED (HybridBuildingsPropagationLossModel);
 
 

src/buildings/model/itu-r-1238-propagation-loss-model.cc

@@ -28,10 +28,10 @@
 #include "itu-r-1238-propagation-loss-model.h"
 #include <ns3/mobility-building-info.h>
 
-NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel");
+
 NS_OBJECT_ENSURE_REGISTERED (ItuR1238PropagationLossModel);
 
 

src/buildings/model/mobility-building-info.cc

@@ -26,10 +26,10 @@
 #include <ns3/log.h>
 #include <ns3/assert.h>
 
-NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("MobilityBuildingInfo");
+
 NS_OBJECT_ENSURE_REGISTERED (MobilityBuildingInfo);
 
 TypeId

src/buildings/model/oh-buildings-propagation-loss-model.cc

@@ -31,10 +31,10 @@
 #include "ns3/enum.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("OhBuildingsPropagationLossModel");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("OhBuildingsPropagationLossModel");
+
 NS_OBJECT_ENSURE_REGISTERED (OhBuildingsPropagationLossModel);
 
 

src/buildings/test/building-position-allocator-test.cc

@@ -32,10 +32,9 @@
 #include <ns3/simulator.h>
 #include <map>
 
-NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocatorTest");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("BuildingPositionAllocatorTest");
 
 struct Room
 {

src/buildings/test/buildings-helper-test.cc

@@ -29,10 +29,9 @@
 #include <ns3/mobility-helper.h>
 #include <ns3/simulator.h>
 
-NS_LOG_COMPONENT_DEFINE ("BuildingsHelperTest");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("BuildingsHelperTest");
 
 struct PositionInBuilding
 {

src/buildings/test/buildings-pathloss-test.cc

@@ -34,10 +34,9 @@
 
 
 
-NS_LOG_COMPONENT_DEFINE ("BuildingsPathlossTest");
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("BuildingsPathlossTest");
 
 /**
  * Test 1.1 BuildingsPathlossModel Pathloss compound test

src/buildings/test/buildings-shadowing-test.cc

@@ -33,11 +33,9 @@
 
 #include "buildings-shadowing-test.h"
 
-NS_LOG_COMPONENT_DEFINE ("BuildingsShadowingTest");
-
-
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("BuildingsShadowingTest");
 
 
 /**

src/click/helper/click-internet-stack-helper.cc

@@ -43,10 +43,10 @@
 #include <limits>
 #include <map>
 
-NS_LOG_COMPONENT_DEFINE ("ClickInternetStackHelper");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ClickInternetStackHelper");
+
 #define INTERFACE_CONTEXT
 
 typedef std::pair<Ptr<Ipv4>, uint32_t> InterfacePairIpv4;

src/click/model/ipv4-click-routing.cc

@@ -36,10 +36,10 @@
 #include <cstdlib>
 #include <cstdarg>
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4ClickRouting");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Ipv4ClickRouting");
+
 // Values from nsclick ExtRouter implementation
 #define INTERFACE_ID_KERNELTAP 0
 #define INTERFACE_ID_FIRST 1

src/click/model/ipv4-l3-click-protocol.cc

@@ -37,10 +37,10 @@
 #include "ns3/icmpv4-l4-protocol.h"
 #include "ns3/loopback-net-device.h"
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4L3ClickProtocol");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Ipv4L3ClickProtocol");
+
 const uint16_t Ipv4L3ClickProtocol::PROT_NUMBER = 0x0800;
 
 

src/config-store/model/attribute-iterator.cc

@@ -25,10 +25,9 @@
 #include <fstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("AttributeIterator");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("AttributeIterator");
 
 AttributeIterator::AttributeIterator ()
 {

src/config-store/model/config-store.cc

@@ -18,10 +18,9 @@
 #include <cstdlib>
 
 
-NS_LOG_COMPONENT_DEFINE ("ConfigStore");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ConfigStore");
 
 NS_OBJECT_ENSURE_REGISTERED (ConfigStore);
 

src/config-store/model/gtk-config-store.cc

@@ -24,10 +24,9 @@
 #include <fstream>
 
 
-NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
 
 GtkConfigStore::GtkConfigStore ()
 {

src/config-store/model/raw-text-config.cc

@@ -6,10 +6,10 @@
 #include "ns3/log.h"
 #include "ns3/config.h"
 
-NS_LOG_COMPONENT_DEFINE ("RawTextConfig");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("RawTextConfig");
+
 RawTextConfigSave::RawTextConfigSave ()
   : m_os (0)
 {

src/config-store/model/xml-config.cc

@@ -9,10 +9,10 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlwriter.h>
 
-NS_LOG_COMPONENT_DEFINE ("XmlConfig");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("XmlConfig");
+
 XmlConfigSave::XmlConfigSave ()
   : m_writer (0)
 {

src/core/examples/hash-example.cc

@@ -25,10 +25,11 @@
 #include "ns3/core-module.h"
 #include "ns3/hash.h"
 
-NS_LOG_COMPONENT_DEFINE ("Hasher");
-
 namespace ns3
 {
+
+NS_LOG_COMPONENT_DEFINE ("Hasher");
+
 namespace Hash
 {
 

src/core/helper/random-variable-stream-helper.cc

@@ -23,10 +23,10 @@
 #include "ns3/assert.h"
 #include "random-variable-stream-helper.h"
 
-NS_LOG_COMPONENT_DEFINE ("RandomVariableStreamHelper");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("RandomVariableStreamHelper");
+
 int64_t RandomVariableStreamHelper::AssignStreams (std::string path, int64_t stream)
 {
   NS_LOG_FUNCTION_NOARGS ();

src/core/model/attribute-construction-list.cc

@@ -20,10 +20,10 @@
 #include "attribute-construction-list.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
+
 AttributeConstructionList::AttributeConstructionList ()
 {
   NS_LOG_FUNCTION (this);

src/core/model/attribute.cc

@@ -23,10 +23,10 @@
 #include "string.h"
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("AttributeValue");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("AttributeValue");
+
 AttributeValue::AttributeValue ()
 {
 }

src/core/model/boolean.cc

@@ -21,10 +21,10 @@
 #include "fatal-error.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Boolean");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Boolean");
+
 BooleanValue::BooleanValue ()
   : m_value (false)
 {

src/core/model/breakpoint.cc

@@ -26,10 +26,10 @@
 # include <signal.h>
 #endif
 
-NS_LOG_COMPONENT_DEFINE ("Breakpoint");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Breakpoint");
+
 #if defined (HAVE_SIGNAL_H) && defined (SIGTRAP)
 
 void

src/core/model/calendar-scheduler.cc

@@ -26,10 +26,10 @@
 #include "assert.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
+
 NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler);
 
 TypeId

src/core/model/callback.cc

@@ -1,10 +1,30 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2005,2006 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+
 #include "callback.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Callback");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Callback");
+
 CallbackValue::CallbackValue ()
   : m_value ()
 {

src/core/model/command-line.cc

@@ -34,10 +34,10 @@
 #include "string.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("CommandLine");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("CommandLine");
+
 CommandLine::CommandLine ()
 {
   NS_LOG_FUNCTION (this);

src/core/model/config.cc

@@ -28,10 +28,10 @@
 
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("Config");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Config");
+
 namespace Config {
 
 MatchContainer::MatchContainer ()

src/core/model/default-simulator-impl.cc

@@ -30,14 +30,14 @@
 
 #include <cmath>
 
+
+namespace ns3 {
+
 // Note:  Logging in this file is largely avoided due to the
 // number of calls that are made to these functions and the possibility
 // of causing recursions leading to stack overflow
-
 NS_LOG_COMPONENT_DEFINE ("DefaultSimulatorImpl");
 
-namespace ns3 {
-
 NS_OBJECT_ENSURE_REGISTERED (DefaultSimulatorImpl);
 
 TypeId

src/core/model/double.cc

@@ -22,10 +22,10 @@
 #include "log.h"
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("Double");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Double");
+
 ATTRIBUTE_VALUE_IMPLEMENT_WITH_NAME (double, Double);
 
 namespace internal {

src/core/model/enum.cc

@@ -22,10 +22,10 @@
 #include "log.h"
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("Enum");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Enum");
+
 EnumValue::EnumValue ()
   : m_v ()
 {

src/core/model/event-id.cc

@@ -22,10 +22,10 @@
 #include "event-impl.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("EventId");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("EventId");
+
 EventId::EventId ()
   : m_eventImpl (0),
     m_ts (0),

src/core/model/event-impl.cc

@@ -21,10 +21,10 @@
 #include "event-impl.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("EventImpl");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("EventImpl");
+
 EventImpl::~EventImpl ()
 {
   NS_LOG_FUNCTION (this);

src/core/model/fatal-impl.cc

@@ -28,9 +28,10 @@
 
 #include <csignal>
 
-NS_LOG_COMPONENT_DEFINE ("FatalImpl");
-
 namespace ns3 {
+
+NS_LOG_COMPONENT_DEFINE ("FatalImpl");
+  
 namespace FatalImpl {
 
 /**

src/core/model/global-value.cc

@@ -29,10 +29,10 @@
 #include <cstdlib>
 #endif
 
-NS_LOG_COMPONENT_DEFINE ("GlobalValue");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("GlobalValue");
+
 GlobalValue::GlobalValue (std::string name, std::string help,
                           const AttributeValue &initialValue,
                           Ptr<const AttributeChecker> checker)

src/core/model/hash-fnv.cc

@@ -36,10 +36,10 @@
 #include "hash-fnv.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
+
 namespace Hash {
 
 namespace Function {

src/core/model/hash-function.cc

@@ -22,10 +22,10 @@
 #include "hash-function.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("HashFunction");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("HashFunction");
+
 namespace Hash {
 
 uint64_t

src/core/model/hash-murmur3.cc

@@ -34,10 +34,10 @@
 
 #include <iomanip>
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
+
 namespace Hash {
 
 namespace Function {

src/core/model/hash.cc

@@ -22,10 +22,10 @@
 #include "hash.h"
 
 
-NS_LOG_COMPONENT_DEFINE ("Hash");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Hash");
+
 Hasher::Hasher ()
 {
   m_impl = Create <Hash::Function::Murmur3> ();

src/core/model/heap-scheduler.cc

@@ -25,10 +25,10 @@
 #include "assert.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("HeapScheduler");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("HeapScheduler");
+
 NS_OBJECT_ENSURE_REGISTERED (HeapScheduler);
 
 TypeId

src/core/model/int64x64-128.cc

@@ -3,14 +3,13 @@
 #include "assert.h"
 #include "log.h"
 
+namespace ns3 {
+
 // Note:  Logging in this file is largely avoided due to the
 // number of calls that are made to these functions and the possibility
 // of causing recursions leading to stack overflow
-
 NS_LOG_COMPONENT_DEFINE ("int64x64-128");
 
-namespace ns3 {
-
 static inline  
 bool
 output_sign (const int128_t sa,

src/core/model/int64x64-cairo.cc

@@ -25,20 +25,18 @@
 #include <iostream>
 #include "int64x64-cairo.h"
 
-// Note:  Logging in this file is largely avoided due to the
-// number of calls that are made to these functions and the possibility
-// of causing recursions leading to stack overflow
-
-NS_LOG_COMPONENT_DEFINE ("int64x64-cairo");
-
 // Include directly to allow optimizations within this compilation unit.
 extern "C" {
 #include "cairo-wideint.c"
 }
 
-
 namespace ns3 {
 
+// Note:  Logging in this file is largely avoided due to the
+// number of calls that are made to these functions and the possibility
+// of causing recursions leading to stack overflow
+NS_LOG_COMPONENT_DEFINE ("int64x64-cairo");
+
 static inline  
 bool
 output_sign (const cairo_int128_t sa,

src/core/model/int64x64.cc

@@ -6,14 +6,14 @@
 #include "assert.h"
 #include "log.h"
 
+
+namespace ns3 {
+
 // Note:  Logging in this file is largely avoided due to the
 // number of calls that are made to these functions and the possibility
 // of causing recursions leading to stack overflow
-
 NS_LOG_COMPONENT_DEFINE ("int64x64");
 
-namespace ns3 {
-
 /**
  * \internal
  * This algorithm is exact to the precision requested, up to the full

src/core/model/integer.cc

@@ -22,10 +22,10 @@
 #include "log.h"
 #include <sstream>
 
-NS_LOG_COMPONENT_DEFINE ("Integer");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("Integer");
+
 ATTRIBUTE_VALUE_IMPLEMENT_WITH_NAME (int64_t, Integer);
 
 namespace internal {

src/core/model/list-scheduler.cc

@@ -25,10 +25,9 @@
 #include <string>
 #include "assert.h"
 
-NS_LOG_COMPONENT_DEFINE ("ListScheduler");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("ListScheduler");
 
 NS_OBJECT_ENSURE_REGISTERED (ListScheduler);
 

src/core/model/make-event.cc

@@ -1,10 +1,10 @@
 #include "make-event.h"
 #include "log.h"
 
-NS_LOG_COMPONENT_DEFINE ("MakeEvent");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("MakeEvent");
+
 EventImpl * MakeEvent (void (*f)(void))
 {
   NS_LOG_FUNCTION (f);