merge with tip

src/devices/wifi/dca-txop.cc

@@ -60,7 +60,6 @@ private:
   virtual void DoNotifyChannelSwitching (void) { 
     m_txop->NotifyChannelSwitching ();
   }
-
   DcaTxop *m_txop;
 };
 
@@ -101,7 +100,7 @@ TypeId
 DcaTxop::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::DcaTxop")
-    .SetParent<Object> ()
+    .SetParent (ns3::Dcf::GetTypeId ())
     .AddConstructor<DcaTxop> ()
     ;
   return tid;

src/devices/wifi/dca-txop.h

@@ -26,10 +26,10 @@
 #include "ns3/packet.h"
 #include "ns3/nstime.h"
 #include "ns3/object.h"
-#include "wifi-mac-header.h"
-#include "wifi-mode.h"
-#include "wifi-remote-station-manager.h"
-#include "dcf.h"
+#include "ns3/wifi-mac-header.h"
+#include "ns3/wifi-mode.h"
+#include "ns3/wifi-remote-station-manager.h"
+#include "ns3/dcf.h"
 
 namespace ns3 {
 

src/devices/wifi/edca-txop-n.cc

@@ -124,7 +124,7 @@ TypeId
 EdcaTxopN::GetTypeId (void)
 {
   static TypeId tid = TypeId ("ns3::EdcaTxopN")
-    .SetParent<Object> ()
+    .SetParent (ns3::Dcf::GetTypeId ())
     .AddConstructor<EdcaTxopN> ()
     .AddAttribute ("BlockAckThreshold", "If number of packets in this queue reaches this value,\
                                          block ack mechanism is used. If this value is 0, block ack is never used.",