--- a/src/applications/model/packet-loss-counter.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/packet-loss-counter.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketLossCounter");
+NS_LOG_COMPONENT_DEFINE ("PacketLossCounter")
+  ;
 
 
 PacketLossCounter::PacketLossCounter (uint8_t bitmapSize)

--- a/src/applications/model/packet-sink.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/packet-sink.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PacketSink");
+NS_LOG_COMPONENT_DEFINE ("PacketSink")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (PacketSink)
   ;
 

--- a/src/applications/model/ping6.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/ping6.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -38,7 +38,8 @@
 namespace ns3 
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ping6Application");
+NS_LOG_COMPONENT_DEFINE ("Ping6Application")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Ping6)
   ;

--- a/src/applications/model/radvd-interface.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/radvd-interface.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/radvd-prefix.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/radvd.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -40,7 +40,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadvdApplication");
+NS_LOG_COMPONENT_DEFINE ("RadvdApplication")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Radvd)
   ;

--- a/src/applications/model/udp-client.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/udp-client.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -35,7 +35,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpClient");
+NS_LOG_COMPONENT_DEFINE ("UdpClient")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (UdpClient)
   ;
 

--- a/src/applications/model/udp-echo-client.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/udp-echo-client.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication");
+NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient)
   ;
 

--- a/src/applications/model/udp-echo-server.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/udp-echo-server.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -34,7 +34,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication");
+NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer)
   ;
 

--- a/src/applications/model/udp-server.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/udp-server.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpServer");
+NS_LOG_COMPONENT_DEFINE ("UdpServer")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (UdpServer)
   ;
 

--- a/src/applications/model/udp-trace-client.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/udp-trace-client.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -37,7 +37,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UdpTraceClient");
+NS_LOG_COMPONENT_DEFINE ("UdpTraceClient")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (UdpTraceClient)
   ;
 

--- a/src/applications/model/v4ping.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/applications/model/v4ping.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("V4Ping");
+NS_LOG_COMPONENT_DEFINE ("V4Ping")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (V4Ping)
   ;
 

--- a/src/buildings/model/building-list.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/buildings/model/building-list.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("BuildingList");
+NS_LOG_COMPONENT_DEFINE ("BuildingList")
+  ;
 
 /**
  * \brief private implementation detail of the BuildingList API.

--- a/src/config-store/model/gtk-config-store.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/config-store/model/gtk-config-store.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GtkconfigStore");
+NS_LOG_COMPONENT_DEFINE ("GtkconfigStore")
+  ;
 
 
 GtkConfigStore::GtkConfigStore ()

--- a/src/core/model/attribute-construction-list.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/attribute-construction-list.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -22,7 +22,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE("AttributeConstructionList");
+NS_LOG_COMPONENT_DEFINE("AttributeConstructionList")
+  ;
 
 AttributeConstructionList::AttributeConstructionList ()
 {

--- a/src/core/model/calendar-scheduler.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/calendar-scheduler.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("CalendarScheduler");
+NS_LOG_COMPONENT_DEFINE ("CalendarScheduler")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (CalendarScheduler)
   ;

--- a/src/core/model/global-value.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/global-value.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/hash-fnv.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Fnv");
+NS_LOG_COMPONENT_DEFINE ("Hash-Fnv")
+  ;
 
 namespace Hash {
 

--- a/src/core/model/hash-function.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/hash-function.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("HashFunction");
+NS_LOG_COMPONENT_DEFINE ("HashFunction")
+  ;
 
 namespace Hash {
 

--- a/src/core/model/hash-murmur3.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/hash-murmur3.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -36,7 +36,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3");
+NS_LOG_COMPONENT_DEFINE ("Hash-Murmur3")
+  ;
 
 namespace Hash {
 

--- a/src/core/model/hash.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/hash.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Hash");
+NS_LOG_COMPONENT_DEFINE ("Hash")
+  ;
 
 Hasher::Hasher ()
 {

--- a/src/core/model/log.h	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/log.h	Thu Nov 14 16:58:56 2013 -0800
@@ -111,13 +111,25 @@
  * \ingroup logging
  * \param name a string
  *
- * Define a Log component with a specific name. This macro
- * should be used at the top of every file in which you want 
+ * Define a Log component with a specific name.
+ *
+ * This macro should be used at the top of every file in which you want 
  * to use the NS_LOG macro. This macro defines a new
  * "log component" which can be later selectively enabled
  * or disabled with the ns3::LogComponentEnable and 
  * ns3::LogComponentDisable functions or with the NS_LOG
  * environment variable.
+ *
+ * To create a log component Foo, at the top of foo.cc:
+ *
+ * \code
+ *   NS_LOG_COMPONENT_DEFINE ("Foo")
+ *     ;
+ * \endcode
+ *
+ * Note the closing ';' is not on the same line;  this prevents 
+ * Doxygen from spuriously warning that the macro invocation is undocumented.
+ 
  */
 #define NS_LOG_COMPONENT_DEFINE(name)                           \
   static ns3::LogComponent g_log = ns3::LogComponent (name)

--- a/src/core/model/names.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/names.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Names");
+NS_LOG_COMPONENT_DEFINE ("Names")
+  ;
 
 class NameNode
 {

--- a/src/core/model/object-factory.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/object-factory.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -23,7 +23,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE("ObjectFactory");
+NS_LOG_COMPONENT_DEFINE("ObjectFactory")
+  ;
 
 ObjectFactory::ObjectFactory ()
 {

--- a/src/core/model/random-variable.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/random-variable.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -44,7 +44,8 @@
 // -----------------------------------------------------------------------------
 // RandomVariableBase methods
 
-NS_LOG_COMPONENT_DEFINE ("RandomVariable");
+NS_LOG_COMPONENT_DEFINE ("RandomVariable")
+  ;
 
 /** \ingroup legacyrandom */
 class RandomVariableBase

--- a/src/core/model/test.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/test.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/core/model/type-id.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -34,7 +34,8 @@
 
 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/energy/test/li-ion-energy-source-test.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/energy/test/li-ion-energy-source-test.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite");
+NS_LOG_COMPONENT_DEFINE ("LiIonEnergySourceTestSuite")
+  ;
 
 class LiIonEnergyTestCase : public TestCase
 {

--- a/src/flow-monitor/model/flow-monitor.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/flow-monitor/model/flow-monitor.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FlowMonitor");
+NS_LOG_COMPONENT_DEFINE ("FlowMonitor")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (FlowMonitor)
   ;

--- a/src/flow-monitor/model/histogram.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/flow-monitor/model/histogram.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/flow-monitor/model/ipv4-flow-probe.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe");
+NS_LOG_COMPONENT_DEFINE ("Ipv4FlowProbe")
+  ;
 
 //////////////////////////////////////
 // Ipv4FlowProbeTag class implementation //

--- a/src/internet/helper/ipv6-address-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/helper/ipv6-address-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -34,7 +34,8 @@
 namespace ns3 
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper");
+NS_LOG_COMPONENT_DEFINE ("Ipv6AddressHelper")
+  ;
 
 Ipv6AddressHelper::Ipv6AddressHelper ()
 {

--- a/src/internet/model/icmpv4-l4-protocol.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/icmpv4-l4-protocol.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -11,7 +11,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol");
+NS_LOG_COMPONENT_DEFINE ("Icmpv4L4Protocol")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Icmpv4L4Protocol)
   ;

--- a/src/internet/model/icmpv6-l4-protocol.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/icmpv6-l4-protocol.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -42,7 +42,8 @@
 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/ipv4-end-point-demux.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv4-end-point-demux.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 
 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/ipv6-end-point-demux.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-end-point-demux.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -24,7 +24,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-end-point.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -27,7 +27,8 @@
 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-header.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-extension-header.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader");
+NS_LOG_COMPONENT_DEFINE ("Ipv6ExtensionHeader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionHeader)
   ;

--- a/src/internet/model/ipv6-interface-address.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-interface-address.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress");
+NS_LOG_COMPONENT_DEFINE ("Ipv6InterfaceAddress")
+  ;
 
 Ipv6InterfaceAddress::Ipv6InterfaceAddress () 
   : m_address (Ipv6Address ()),

--- a/src/internet/model/ipv6-interface.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-interface.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -34,7 +34,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6Interface");
+NS_LOG_COMPONENT_DEFINE ("Ipv6Interface")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6Interface)
   ;

--- a/src/internet/model/ipv6-l3-protocol.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-l3-protocol.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -52,7 +52,8 @@
 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-option-header.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-option-header.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader");
+NS_LOG_COMPONENT_DEFINE ("Ipv6OptionHeader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6OptionHeader)
   ;

--- a/src/internet/model/ipv6-raw-socket-impl.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-raw-socket-impl.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -38,7 +38,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl");
+NS_LOG_COMPONENT_DEFINE ("Ipv6RawSocketImpl")
+  ;
 
 
 NS_OBJECT_ENSURE_REGISTERED (Ipv6RawSocketImpl)

--- a/src/internet/model/ipv6-static-routing.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ipv6-static-routing.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting");
+NS_LOG_COMPONENT_DEFINE ("Ipv6StaticRouting")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (Ipv6StaticRouting)
   ;
 

--- a/src/internet/model/ndisc-cache.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/internet/model/ndisc-cache.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("NdiscCache");
+NS_LOG_COMPONENT_DEFINE ("NdiscCache")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (NdiscCache)
   ;

--- a/src/lte/helper/epc-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/epc-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -42,7 +42,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcHelper");
+NS_LOG_COMPONENT_DEFINE ("EpcHelper")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (EpcHelper)
   ;

--- a/src/lte/helper/lte-global-pathloss-database.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/lte-global-pathloss-database.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase");
+NS_LOG_COMPONENT_DEFINE ("LteGlobalPathlossDatabase")
+  ;
 
 
 LteGlobalPathlossDatabase::~LteGlobalPathlossDatabase (void)

--- a/src/lte/helper/lte-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/lte-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("LteStatsCalculator")
+  ;
 
 LteStatsCalculator::LteStatsCalculator ()
   : m_dlOutputFilename (""),

--- a/src/lte/helper/mac-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/mac-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("MacStatsCalculator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (MacStatsCalculator)
   ;

--- a/src/lte/helper/phy-rx-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/phy-rx-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyRxStatsCalculator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (PhyRxStatsCalculator)
   ;

--- a/src/lte/helper/phy-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/phy-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -25,7 +25,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyStatsCalculator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (PhyStatsCalculator)
   ;

--- a/src/lte/helper/phy-tx-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/phy-tx-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -27,7 +27,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("PhyTxStatsCalculator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (PhyTxStatsCalculator)
   ;

--- a/src/lte/helper/radio-bearer-stats-calculator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/helper/radio-bearer-stats-calculator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -29,7 +29,8 @@
 namespace ns3
 {
 
-NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator");
+NS_LOG_COMPONENT_DEFINE ("RadioBearerStatsCalculator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED ( RadioBearerStatsCalculator)
   ;

--- a/src/lte/model/epc-enb-application.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/model/epc-enb-application.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -33,7 +33,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication");
+NS_LOG_COMPONENT_DEFINE ("EpcEnbApplication")
+  ;
 
 
 EpcEnbApplication::EpsFlowId_t::EpsFlowId_t ()

--- a/src/lte/model/epc-sgw-pgw-application.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/model/epc-sgw-pgw-application.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication");
+NS_LOG_COMPONENT_DEFINE ("EpcSgwPgwApplication")
+  ;
 
 
 /////////////////////////

--- a/src/lte/model/epc-tft.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/model/epc-tft.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("EpcTft");
+NS_LOG_COMPONENT_DEFINE ("EpcTft")
+  ;
 
 std::ostream& operator<< (std::ostream& os, EpcTft::Direction& d)
 {

--- a/src/lte/test/epc-test-s1u-downlink.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/test/epc-test-s1u-downlink.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -44,7 +44,8 @@
 namespace ns3 {
 
 
-NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink");
+NS_LOG_COMPONENT_DEFINE ("EpcTestS1uDownlink")
+  ;
 
 
 

--- a/src/lte/test/epc-test-s1u-uplink.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/test/epc-test-s1u-uplink.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -52,7 +52,8 @@
 
 
 
-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/test-lte-epc-e2e-data.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/lte/test/test-lte-epc-e2e-data.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -47,7 +47,8 @@
 namespace ns3 {
 
 
-NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData");
+NS_LOG_COMPONENT_DEFINE ("LteEpcE2eData")
+  ;
 
 
 

--- a/src/mobility/helper/mobility-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/mobility/helper/mobility-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("MobilityHelper");
+NS_LOG_COMPONENT_DEFINE ("MobilityHelper")
+  ;
 
 MobilityHelper::MobilityHelper ()
 {

--- a/src/netanim/examples/uan-animation.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/netanim/examples/uan-animation.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -47,7 +47,8 @@
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("UanCwExample");
+NS_LOG_COMPONENT_DEFINE ("UanCwExample")
+  ;
 
 NetAnimExperiment::NetAnimExperiment () 
   : m_numNodes (15),

--- a/src/network/model/channel-list.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/network/model/channel-list.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("ChannelList");
+NS_LOG_COMPONENT_DEFINE ("ChannelList")
+  ;
 
 /**
  * \brief private implementation detail of the ChannelList API.

--- a/src/network/model/node-list.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/network/model/node-list.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("NodeList");
+NS_LOG_COMPONENT_DEFINE ("NodeList")
+  ;
 
 /**
  * \brief private implementation detail of the NodeList API.

--- a/src/network/model/packet-tag-list.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/network/model/packet-tag-list.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 #include "ns3/log.h"
 #include <cstring>
 
-NS_LOG_COMPONENT_DEFINE ("PacketTagList");
+NS_LOG_COMPONENT_DEFINE ("PacketTagList")
+  ;
 
 namespace ns3 {
 

--- a/src/propagation/model/cost231-propagation-loss-model.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/propagation/model/cost231-propagation-loss-model.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -29,7 +29,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel");
+NS_LOG_COMPONENT_DEFINE ("Cost231PropagationLossModel")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (Cost231PropagationLossModel)
   ;
 

--- a/src/propagation/test/itu-r-1411-los-test-suite.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/propagation/test/itu-r-1411-los-test-suite.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/propagation/test/kun-2600-mhz-test-suite.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/propagation/test/okumura-hata-test-suite.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -31,7 +31,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest");
+NS_LOG_COMPONENT_DEFINE ("OkumuraHataPropagationLossModelTest")
+  ;
 
 
 class OkumuraHataPropagationLossModelTestCase : public TestCase

--- a/src/stats/helper/file-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/stats/helper/file-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FileHelper");
+NS_LOG_COMPONENT_DEFINE ("FileHelper")
+  ;
 
 FileHelper::FileHelper ()
   : m_aggregator                     (0),

--- a/src/stats/helper/gnuplot-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/stats/helper/gnuplot-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -32,7 +32,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotHelper");
+NS_LOG_COMPONENT_DEFINE ("GnuplotHelper")
+  ;
 
 GnuplotHelper::GnuplotHelper ()
   : m_aggregator                     (0),

--- a/src/stats/model/file-aggregator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/stats/model/file-aggregator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("FileAggregator");
+NS_LOG_COMPONENT_DEFINE ("FileAggregator")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (FileAggregator)
   ;

--- a/src/stats/model/gnuplot-aggregator.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/stats/model/gnuplot-aggregator.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator");
+NS_LOG_COMPONENT_DEFINE ("GnuplotAggregator")
+  ;
 NS_OBJECT_ENSURE_REGISTERED (GnuplotAggregator)
   ;
 

--- a/src/topology-read/helper/topology-reader-helper.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/topology-read/helper/topology-reader-helper.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -28,7 +28,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper");
+NS_LOG_COMPONENT_DEFINE ("TopologyReaderHelper")
+  ;
 
 TopologyReaderHelper::TopologyReaderHelper ()
 {

--- a/src/topology-read/model/inet-topology-reader.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/topology-read/model/inet-topology-reader.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("InetTopologyReader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader)
   ;

--- a/src/topology-read/model/orbis-topology-reader.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/topology-read/model/orbis-topology-reader.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader)
   ;

--- a/src/topology-read/model/rocketfuel-topology-reader.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/topology-read/model/rocketfuel-topology-reader.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -30,7 +30,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");
+NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader)
   ;

--- a/src/topology-read/model/topology-reader.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/topology-read/model/topology-reader.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -26,7 +26,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("TopologyReader");
+NS_LOG_COMPONENT_DEFINE ("TopologyReader")
+  ;
 
 NS_OBJECT_ENSURE_REGISTERED (TopologyReader)
   ;

--- a/src/uan/examples/uan-cw-example.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/uan/examples/uan-cw-example.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -47,7 +47,8 @@
 
 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	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/uan/examples/uan-rc-example.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -65,7 +65,8 @@
 
 using namespace ns3;
 
-NS_LOG_COMPONENT_DEFINE ("UanRcExample");
+NS_LOG_COMPONENT_DEFINE ("UanRcExample")
+  ;
 
 
 Experiment::Experiment () 

--- a/src/uan/test/uan-energy-model-test.cc	Thu Nov 14 16:58:28 2013 -0800
+++ b/src/uan/test/uan-energy-model-test.cc	Thu Nov 14 16:58:56 2013 -0800
@@ -38,7 +38,8 @@
 
 namespace ns3 {
 
-NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite");
+NS_LOG_COMPONENT_DEFINE ("UanEnergyModelTestSuite")
+  ;
 
 class AcousticModemEnergyTestCase : public TestCase
 {