merge
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Fri, 17 Apr 2009 14:06:51 +0200
changeset 4352 6095f91e6a64
parent 4351 4b42ad1b0e12 (diff)
parent 4349 a30d9fc6f1ea (current diff)
child 4353 596eb8034443
merge
--- a/examples/wifi-adhoc.cc	Fri Apr 17 12:44:34 2009 +0100
+++ b/examples/wifi-adhoc.cc	Fri Apr 17 14:06:51 2009 +0200
@@ -263,6 +263,12 @@
   dataset = experiment.Run (wifi, wifiPhy, wifiChannel);
   gnuplot.AddDataset (dataset);
 
+  NS_LOG_DEBUG ("rraa");
+  experiment = Experiment ("rraa");
+  wifi.SetRemoteStationManager ("ns3::RraaWifiManager");
+  dataset = experiment.Run (wifi, wifiPhy, wifiChannel);
+  gnuplot.AddDataset (dataset);
+
   NS_LOG_DEBUG ("ideal");
   experiment = Experiment ("ideal");
   wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
--- a/src/devices/wifi/rraa-wifi-manager.cc	Fri Apr 17 12:44:34 2009 +0100
+++ b/src/devices/wifi/rraa-wifi-manager.cc	Fri Apr 17 14:06:51 2009 +0200
@@ -29,6 +29,8 @@
 NS_LOG_COMPONENT_DEFINE ("RraaWifiManager");
 
 namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED(RraaWifiManager);
   
 RraaWifiRemoteStation::RraaWifiRemoteStation (Ptr<RraaWifiManager> stations)
   : m_stations (stations)
@@ -188,7 +190,7 @@
 TypeId 
 RraaWifiManager::GetTypeId (void)
 {
-  static TypeId tid = TypeId ("RraaWifiManager")
+  static TypeId tid = TypeId ("ns3::RraaWifiManager")
     .SetParent<WifiRemoteStationManager> ()
     .AddConstructor<RraaWifiManager> ()
     .AddAttribute ("Basic",