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

src/wave/examples/wave-simple-80211p.cc

@@ -49,9 +49,10 @@
 #include "ns3/wifi-80211p-helper.h"
 #include "ns3/wave-mac-helper.h"
 
-NS_LOG_COMPONENT_DEFINE ("WifiSimpleOcb");
 using namespace ns3;
 
+NS_LOG_COMPONENT_DEFINE ("WifiSimpleOcb");
+
 /*
  * In WAVE module, there is no net device class named like "Wifi80211pNetDevice",
  * instead, we need to use Wifi80211pHelper to create an object of

src/wave/model/higher-tx-tag.cc

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

src/wave/model/ocb-wifi-mac.cc

@@ -32,10 +32,10 @@
 #include "vendor-specific-action.h"
 #include "higher-tx-tag.h"
 
-NS_LOG_COMPONENT_DEFINE ("OcbWifiMac");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("OcbWifiMac");
+
 NS_OBJECT_ENSURE_REGISTERED (OcbWifiMac);
 
 const static Mac48Address WILDCARD_BSSID = Mac48Address::GetBroadcast ();

src/wave/model/vendor-specific-action.cc

@@ -23,10 +23,10 @@
 #include "ns3/assert.h"
 #include "vendor-specific-action.h"
 
-NS_LOG_COMPONENT_DEFINE ("VendorSpecificAction");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("VendorSpecificAction");
+
 /*********** OrganizationIdentifier *******/
 
 ATTRIBUTE_HELPER_CPP (OrganizationIdentifier);

src/wave/model/wave-mac-low.cc

@@ -23,10 +23,10 @@
 #include "wave-mac-low.h"
 #include "higher-tx-tag.h"
 
-NS_LOG_COMPONENT_DEFINE ("WaveMacLow");
-
 namespace ns3 {
 
+NS_LOG_COMPONENT_DEFINE ("WaveMacLow");
+
 NS_OBJECT_ENSURE_REGISTERED (WaveMacLow);
 
 TypeId