--- a/src/devices/wifi/rraa-wifi-manager.cc	Mon Apr 14 16:19:17 2008 -0700
+++ b/src/devices/wifi/rraa-wifi-manager.cc	Thu Apr 17 13:42:25 2008 -0700
@@ -193,122 +193,122 @@
     .AddConstructor<RraaWifiManager> ()
     .AddAttribute ("Basic",
                    "If true the RRAA-BASIC algorithm will be used, otherwise the RRAA wil be used",
-                   Boolean (false),
+                   BooleanValue (false),
                    MakeBooleanAccessor (&RraaWifiManager::m_basic),
                    MakeBooleanChecker ())
     .AddAttribute ("Timeout",
                    "Timeout for the RRAA BASIC loss estimaton block (s)",
-                   Seconds (0.05),
+                   TimeValue (Seconds (0.05)),
                    MakeTimeAccessor (&RraaWifiManager::m_timeout),
                    MakeTimeChecker ())
     .AddAttribute ("ewndFor54mbps",
                    "ewnd parameter for 54 Mbs data mode",
-                   Uinteger (40),
+                   UintegerValue (40),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor54),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor48mbps",
                    "ewnd parameter for 48 Mbs data mode",
-                   Uinteger (40),
+                   UintegerValue (40),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor48),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor36mbps",
                    "ewnd parameter for 36 Mbs data mode",
-                   Uinteger (40),
+                   UintegerValue (40),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor36),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor24mbps",
                    "ewnd parameter for 24 Mbs data mode",
-                   Uinteger (40),
+                   UintegerValue (40),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor24),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor18mbps",
                    "ewnd parameter for 18 Mbs data mode",
-                   Uinteger (20),
+                   UintegerValue (20),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor18),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor12mbps",
                    "ewnd parameter for 12 Mbs data mode",
-                   Uinteger (20),
+                   UintegerValue (20),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor12),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor9mbps",
                    "ewnd parameter for 9 Mbs data mode",
-                   Uinteger (10),
+                   UintegerValue (10),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor9),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("ewndFor6mbps",
                    "ewnd parameter for 6 Mbs data mode",
-                   Uinteger (6),
+                   UintegerValue (6),
                    MakeUintegerAccessor (&RraaWifiManager::m_ewndfor6),
                    MakeUintegerChecker<uint32_t> ())
     .AddAttribute ("poriFor48mbps",
                    "Pori parameter for 48 Mbs data mode",
-                   Double (0.047),
+                   DoubleValue (0.047),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor48),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor36mbps",
                    "Pori parameter for 36 Mbs data mode",
-                   Double (0.115),
+                   DoubleValue (0.115),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor36),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor24mbps",
                    "Pori parameter for 24 Mbs data mode",
-                   Double (0.1681),
+                   DoubleValue (0.1681),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor24),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor18mbps",
                    "Pori parameter for 18 Mbs data mode",
-                   Double (0.1325),
+                   DoubleValue (0.1325),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor18),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor12mbps",
                    "Pori parameter for 12 Mbs data mode",
-                   Double (0.1861),
+                   DoubleValue (0.1861),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor12),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor9mbps",
                    "Pori parameter for 9 Mbs data mode",
-                   Double (0.1434),
+                   DoubleValue (0.1434),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor9),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("poriFor6mbps",
                    "Pori parameter for 6 Mbs data mode",
-                   Double (0.5),
+                   DoubleValue (0.5),
                    MakeDoubleAccessor (&RraaWifiManager::m_porifor6),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor54mbps",
                    "Pmtl parameter for 54 Mbs data mode",
-                   Double (0.094),
+                   DoubleValue (0.094),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor54),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor48mbps",
                    "Pmtl parameter for 48 Mbs data mode",
-                   Double (0.23),
+                   DoubleValue (0.23),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor48),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor36mbps",
                    "Pmtl parameter for 36 Mbs data mode",
-                   Double (0.3363),
+                   DoubleValue (0.3363),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor36),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor24mbps",
                    "Pmtl parameter for 24 Mbs data mode",
-                   Double (0.265),
+                   DoubleValue (0.265),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor24),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor18mbps",
                    "Pmtl parameter for 18 Mbs data mode",
-                   Double (0.3722),
+                   DoubleValue (0.3722),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor18),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor12mbps",
                    "Pmtl parameter for 12 Mbs data mode",
-                   Double(0.2868),
+                   DoubleValue (0.2868),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor12),
                    MakeDoubleChecker<double> ())
     .AddAttribute ("pmtlFor9mbps",
                    "Pmtl parameter for 9 Mbs data mode",
-                   Double (0.3932),
+                   DoubleValue (0.3932),
                    MakeDoubleAccessor (&RraaWifiManager::m_pmtlfor9),
                    MakeDoubleChecker<double> ())
     ;