--- a/RELEASE_NOTES	Fri Sep 26 12:25:13 2014 -0700
+++ b/RELEASE_NOTES	Fri Sep 26 12:44:13 2014 -0700
@@ -26,6 +26,7 @@
 
 Bugs fixed
 ----------
+- Bug 1551 - NS_LOG_COMPONENT_DEFINE inside or outside of ns3 namespace?
 - Bug 1983 - FlowMonitor returns containers copies instead of references.
 - Bug 1991 - PcapFileWrapper::CaptureSize attribute (snaplen) has no effect.
 

--- a/src/applications/model/packet-loss-counter.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/packet-loss-counter.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -24,9 +24,9 @@
 #include "ns3/uinteger.h"
 #include "packet-loss-counter.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
 
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
+namespace ns3 {
 
 
 PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)

--- a/src/applications/model/packet-sink.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/packet-sink.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -32,9 +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 

--- a/src/applications/model/ping6.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/ping6.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -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 ()

--- a/src/applications/model/radvd-interface.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/radvd-interface.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -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)
 {

--- a/src/applications/model/radvd-prefix.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/radvd-prefix.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -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),

--- a/src/applications/model/radvd.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/radvd.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -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 ()

--- a/src/applications/model/udp-client.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/udp-client.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -33,9 +33,10 @@
 #include <cstdlib>
 #include <cstdio>
 
+NS_LOG_COMPONENT_DEFINE ("UdpClient");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpClient");
 NS_OBJECT_ENSURE_REGISTERED (UdpClient);
 
 TypeId

--- a/src/applications/model/udp-echo-client.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/udp-echo-client.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -29,9 +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

--- a/src/applications/model/udp-echo-server.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/udp-echo-server.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -32,9 +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

--- a/src/applications/model/udp-server.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/udp-server.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -34,9 +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);
 
 

--- a/src/applications/model/udp-trace-client.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/udp-trace-client.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -35,9 +35,10 @@
 #include <cstdio>
 #include <fstream>
 
+NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
 NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient);
 
 /**

--- a/src/applications/model/v4ping.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/applications/model/v4ping.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +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 

--- a/src/buildings/model/building-list.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/buildings/model/building-list.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "building-list.h"
 #include "building.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("BuildingList");
 
-NS_LOG_COMPONENT_DEFINE ("BuildingList");
+namespace ns3 {
 
 /**
  * \brief private implementation detail of the BuildingList API.

--- a/src/config-store/model/gtk-config-store.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/config-store/model/gtk-config-store.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -24,9 +24,9 @@
 #include <fstream>
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
 
-NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
+namespace ns3 {
 
 
 GtkConfigStore::GtkConfigStore ()

--- a/src/core/model/attribute-construction-list.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/attribute-construction-list.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -20,9 +20,9 @@
 #include "attribute-construction-list.h"
 #include "log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
 
-NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
+namespace ns3 {
 
 AttributeConstructionList::AttributeConstructionList ()
 {

--- a/src/core/model/calendar-scheduler.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/calendar-scheduler.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +26,9 @@
 #include "assert.h"
 #include "log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
 
-NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler);
 

--- a/src/core/model/global-value.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/global-value.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -29,9 +29,9 @@
 #include <cstdlib>
 #endif
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("GlobalValue");
 
-NS_LOG_COMPONENT_DEFINE ("GlobalValue");
+namespace ns3 {
 
 GlobalValue::GlobalValue (std::string name, std::string help,
                           const AttributeValue &initialValue,

--- a/src/core/model/hash-fnv.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/hash-fnv.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -36,9 +36,9 @@
 #include "hash-fnv.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
+namespace ns3 {
 
 namespace Hash {
 

--- a/src/core/model/hash-function.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/hash-function.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -22,9 +22,9 @@
 #include "hash-function.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("HashFunction");
 
-NS_LOG_COMPONENT_DEFINE ("HashFunction");
+namespace ns3 {
 
 namespace Hash {
 

--- a/src/core/model/hash-murmur3.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/hash-murmur3.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -34,9 +34,9 @@
 
 #include <iomanip>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
+namespace ns3 {
 
 namespace Hash {
 

--- a/src/core/model/hash.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/hash.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -22,9 +22,9 @@
 #include "hash.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Hash");
 
-NS_LOG_COMPONENT_DEFINE ("Hash");
+namespace ns3 {
 
 Hasher::Hasher ()
 {

--- a/src/core/model/names.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/names.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -23,9 +23,9 @@
 #include "abort.h"
 #include "names.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Names");
 
-NS_LOG_COMPONENT_DEFINE ("Names");
+namespace ns3 {
 
 class NameNode
 {

--- a/src/core/model/object-factory.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/object-factory.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -21,9 +21,9 @@
 #include "log.h"
 #include <sstream>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE("ObjectFactory");
 
-NS_LOG_COMPONENT_DEFINE("ObjectFactory");
+namespace ns3 {
 
 ObjectFactory::ObjectFactory ()
 {

--- a/src/core/model/random-variable.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/random-variable.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -38,14 +38,14 @@
 #include "fatal-error.h"
 #include "log.h"
 
+NS_LOG_COMPONENT_DEFINE ("RandomVariable");
+
 namespace ns3 {
 
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // RandomVariableBase methods
 
-NS_LOG_COMPONENT_DEFINE ("RandomVariable");
-
 /** \ingroup legacyrandom */
 class RandomVariableBase
 {

--- a/src/core/model/test.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/test.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include <map>
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Test");
 
-NS_LOG_COMPONENT_DEFINE ("Test");
+namespace ns3 {
 
 bool
 TestDoubleIsEqual (const double x1, const double x2, const double epsilon)

--- a/src/core/model/type-id.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/core/model/type-id.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -32,9 +32,9 @@
  *         Helper code
  *********************************************************************/
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("TypeId");
 
-NS_LOG_COMPONENT_DEFINE ("TypeId");
+namespace ns3 {
 
 // IidManager needs to be in ns3 namespace for NS_ASSERT and NS_LOG
 // to find g_log

--- a/src/flow-monitor/model/flow-monitor.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/flow-monitor/model/flow-monitor.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -29,9 +29,9 @@
 
 #define PERIODIC_CHECK_INTERVAL (Seconds (1))
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("FlowMonitor");
 
-NS_LOG_COMPONENT_DEFINE ("FlowMonitor");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (FlowMonitor);
 

--- a/src/flow-monitor/model/histogram.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/flow-monitor/model/histogram.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,10 +28,10 @@
 // #define RESERVED_BINS_INC	10
 
 
+NS_LOG_COMPONENT_DEFINE ("Histogram");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Histogram");
- 
 // uint32_t 
 // Histogram::GetSize () const
 // {

--- a/src/flow-monitor/model/ipv4-flow-probe.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/flow-monitor/model/ipv4-flow-probe.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "ns3/config.h"
 #include "ns3/flow-id-tag.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe");
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe");
+namespace ns3 {
 
 //////////////////////////////////////
 // Ipv4FlowProbeTag class implementation //

--- a/src/flow-monitor/model/ipv6-flow-probe.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/flow-monitor/model/ipv6-flow-probe.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -29,10 +29,9 @@
 #include "ns3/config.h"
 #include "ns3/flow-id-tag.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Ipv6FlowProbe");
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6FlowProbe")
-  ;
+namespace ns3 {
 
 //////////////////////////////////////
 // Ipv6FlowProbeTag class implementation //

--- a/src/internet/model/icmpv4-l4-protocol.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/model/icmpv4-l4-protocol.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -9,9 +9,9 @@
 #include "ns3/boolean.h"
 #include "ns3/ipv4-route.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol");
 
-NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol);
 

--- a/src/internet/model/ipv4-end-point-demux.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/model/ipv4-end-point-demux.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -22,9 +22,9 @@
 #include "ipv4-end-point.h"
 #include "ns3/log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux");
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4EndPointDemux");
+namespace ns3 {
 
 Ipv4EndPointDemux::Ipv4EndPointDemux ()
   : m_ephemeral (49152), m_portLast (65535), m_portFirst (49152)

--- a/src/internet/model/ipv6-end-point-demux.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/model/ipv6-end-point-demux.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -22,9 +22,9 @@
 #include "ipv6-end-point.h"
 #include "ns3/log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux");
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6EndPointDemux");
+namespace ns3 {
 
 Ipv6EndPointDemux::Ipv6EndPointDemux ()
   : m_ephemeral (49152),

--- a/src/internet/model/ipv6-static-routing.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/model/ipv6-static-routing.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -30,9 +30,10 @@
 #include "ipv6-static-routing.h"
 #include "ipv6-routing-table-entry.h"
 
+NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
 NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting);
 
 TypeId Ipv6StaticRouting::GetTypeId ()

--- a/src/internet/test/tcp-timestamp-test.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/test/tcp-timestamp-test.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -47,9 +47,9 @@
 
 #include "../src/internet/model/tcp-option-ts.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("TimestampTestSuite");
 
-NS_LOG_COMPONENT_DEFINE ("TimestampTestSuite");
+namespace ns3 {
 
 class TimestampTestCase : public TestCase
 {

--- a/src/internet/test/tcp-wscaling-test.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/internet/test/tcp-wscaling-test.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -50,9 +50,9 @@
 
 #include "ns3/tcp-socket-base.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("WScalingTestSuite");
 
-NS_LOG_COMPONENT_DEFINE ("WScalingTestSuite");
+namespace ns3 {
 
 class WScalingTestCase : public TestCase
 {

--- a/src/lte/helper/emu-epc-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/emu-epc-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -45,9 +45,9 @@
 #include <iomanip>
 #include <iostream>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("EmuEpcHelper");
 
-NS_LOG_COMPONENT_DEFINE ("EmuEpcHelper");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (EmuEpcHelper);
 

--- a/src/lte/helper/epc-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/epc-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -25,9 +25,9 @@
 #include <ns3/node.h>
 #include <ns3/ipv4-address.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("EpcHelper");
 
-NS_LOG_COMPONENT_DEFINE ("EpcHelper");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (EpcHelper);
 

--- a/src/lte/helper/lte-global-pathloss-database.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/lte-global-pathloss-database.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,10 +26,9 @@
 
 #include <limits>
 
-namespace ns3 {
-
 NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase");
 
+namespace ns3 {
 
 LteGlobalPathlossDatabase::~LteGlobalPathlossDatabase (void)
 {

--- a/src/lte/helper/lte-stats-calculator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/lte-stats-calculator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -27,9 +27,9 @@
 #include <ns3/lte-enb-net-device.h>
 #include <ns3/lte-ue-net-device.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator");
 
-NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator");
+namespace ns3 {
 
 LteStatsCalculator::LteStatsCalculator ()
   : m_dlOutputFilename (""),

--- a/src/lte/helper/mac-stats-calculator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/mac-stats-calculator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -23,9 +23,9 @@
 #include <ns3/simulator.h>
 #include <ns3/log.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator");
 
-NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator);
 

--- a/src/lte/helper/phy-rx-stats-calculator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/phy-rx-stats-calculator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -25,9 +25,9 @@
 #include <ns3/simulator.h>
 #include <ns3/log.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator");
 
-NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator);
 

--- a/src/lte/helper/phy-stats-calculator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/phy-stats-calculator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -23,9 +23,9 @@
 #include <ns3/simulator.h>
 #include <ns3/log.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator");
 
-NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator);
 

--- a/src/lte/helper/phy-tx-stats-calculator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/phy-tx-stats-calculator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -25,9 +25,9 @@
 #include <ns3/simulator.h>
 #include <ns3/log.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator");
 
-NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator);
 

--- a/src/lte/helper/point-to-point-epc-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/helper/point-to-point-epc-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -40,9 +40,9 @@
 #include <ns3/epc-mme.h>
 #include <ns3/epc-ue-nas.h>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper");
 
-NS_LOG_COMPONENT_DEFINE ("PointToPointEpcHelper");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (PointToPointEpcHelper);
 

--- a/src/lte/model/epc-enb-application.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/model/epc-enb-application.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -31,10 +31,9 @@
 #include "eps-bearer-tag.h"
 
 
-namespace ns3 {
-
 NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication");
 
+namespace ns3 {
 
 EpcEnbApplication::EpsFlowId_t::EpsFlowId_t ()
 {

--- a/src/lte/model/epc-sgw-pgw-application.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/model/epc-sgw-pgw-application.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "ns3/epc-gtpu-header.h"
 #include "ns3/abort.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication");
 
-NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication");
+namespace ns3 {
 
 
 /////////////////////////

--- a/src/lte/model/epc-tft.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/lte/model/epc-tft.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +26,9 @@
 #include "ns3/log.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("EpcTft");
 
-NS_LOG_COMPONENT_DEFINE ("EpcTft");
+namespace ns3 {
 
 std::ostream& operator<< (std::ostream& os, EpcTft::Direction& d)
 {

--- a/src/mobility/helper/mobility-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/mobility/helper/mobility-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -29,9 +29,9 @@
 #include "ns3/string.h"
 #include <iostream>
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("MobilityHelper");
 
-NS_LOG_COMPONENT_DEFINE ("MobilityHelper");
+namespace ns3 {
 
 MobilityHelper::MobilityHelper ()
 {

--- a/src/mpi/model/granted-time-window-mpi-interface.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/mpi/model/granted-time-window-mpi-interface.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -40,9 +40,9 @@
 #include <mpi.h>
 #endif
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("GrantedTimeWindowMpiInterface");
 
-NS_LOG_COMPONENT_DEFINE ("GrantedTimeWindowMpiInterface");
+namespace ns3 {
 
 
 SentBuffer::SentBuffer ()

--- a/src/network/model/channel-list.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/network/model/channel-list.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -24,9 +24,9 @@
 #include "channel-list.h"
 #include "channel.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("ChannelList");
 
-NS_LOG_COMPONENT_DEFINE ("ChannelList");
+namespace ns3 {
 
 /**
  * \ingroup network

--- a/src/network/model/node-list.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/network/model/node-list.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -27,9 +27,9 @@
 #include "node-list.h"
 #include "node.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("NodeList");
 
-NS_LOG_COMPONENT_DEFINE ("NodeList");
+namespace ns3 {
 
 /**
  * \ingroup network

--- a/src/network/utils/packet-socket-client.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/network/utils/packet-socket-client.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -33,9 +33,10 @@
 #include <cstdlib>
 #include <cstdio>
 
+NS_LOG_COMPONENT_DEFINE ("PacketSocketClient");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketSocketClient");
 NS_OBJECT_ENSURE_REGISTERED (PacketSocketClient);
 
 TypeId

--- a/src/network/utils/packet-socket-server.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/network/utils/packet-socket-server.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -33,9 +33,10 @@
 #include <cstdlib>
 #include <cstdio>
 
+NS_LOG_COMPONENT_DEFINE ("PacketSocketServer");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketSocketServer");
 NS_OBJECT_ENSURE_REGISTERED (PacketSocketServer);
 
 TypeId

--- a/src/propagation/model/cost231-propagation-loss-model.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/propagation/model/cost231-propagation-loss-model.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -27,9 +27,10 @@
 #include <cmath>
 #include "cost231-propagation-loss-model.h"
 
+NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel");
 NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel);
 
 TypeId

--- a/src/stats/helper/file-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/stats/helper/file-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "ns3/config.h"
 #include "ns3/get-wildcard-matches.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("FileHelper");
 
-NS_LOG_COMPONENT_DEFINE ("FileHelper");
+namespace ns3 {
 
 FileHelper::FileHelper ()
   : m_aggregator                     (0),

--- a/src/stats/helper/gnuplot-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/stats/helper/gnuplot-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -30,9 +30,9 @@
 #include "ns3/log.h"
 #include "ns3/get-wildcard-matches.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("GnuplotHelper");
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotHelper");
+namespace ns3 {
 
 GnuplotHelper::GnuplotHelper ()
   : m_aggregator                     (0),

--- a/src/stats/model/file-aggregator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/stats/model/file-aggregator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +26,9 @@
 #include "ns3/abort.h"
 #include "ns3/log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("FileAggregator");
 
-NS_LOG_COMPONENT_DEFINE ("FileAggregator");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (FileAggregator);
 

--- a/src/stats/model/gnuplot-aggregator.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/stats/model/gnuplot-aggregator.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +26,10 @@
 #include "ns3/abort.h"
 #include "ns3/log.h"
 
+NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator");
+
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator");
 NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator);
 
 TypeId

--- a/src/topology-read/helper/topology-reader-helper.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/topology-read/helper/topology-reader-helper.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -26,9 +26,9 @@
 #include "ns3/rocketfuel-topology-reader.h"
 #include "ns3/log.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper");
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper");
+namespace ns3 {
 
 TopologyReaderHelper::TopologyReaderHelper ()
 {

--- a/src/topology-read/model/inet-topology-reader.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/topology-read/model/inet-topology-reader.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "inet-topology-reader.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");
 
-NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader);
 

--- a/src/topology-read/model/orbis-topology-reader.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/topology-read/model/orbis-topology-reader.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "orbis-topology-reader.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");
 
-NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader);
 

--- a/src/topology-read/model/rocketfuel-topology-reader.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/topology-read/model/rocketfuel-topology-reader.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -28,9 +28,9 @@
 #include "ns3/unused.h"
 #include "rocketfuel-topology-reader.h"
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");
 
-NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader);
 

--- a/src/topology-read/model/topology-reader.cc	Fri Sep 26 12:25:13 2014 -0700
+++ b/src/topology-read/model/topology-reader.cc	Fri Sep 26 12:44:13 2014 -0700
@@ -24,9 +24,9 @@
 #include "topology-reader.h"
 
 
-namespace ns3 {
+NS_LOG_COMPONENT_DEFINE ("TopologyReader");
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReader");
+namespace ns3 {
 
 NS_OBJECT_ENSURE_REGISTERED (TopologyReader);