--- a/src/helper/wifi-helper.cc	Mon Apr 14 16:19:17 2008 -0700
+++ b/src/helper/wifi-helper.cc	Thu Apr 17 13:42:25 2008 -0700
@@ -78,14 +78,14 @@
 
 void 
 WifiHelper::SetRemoteStationManager (std::string type,
-				     std::string n0, Attribute v0,
-				     std::string n1, Attribute v1,
-				     std::string n2, Attribute v2,
-				     std::string n3, Attribute v3,
-				     std::string n4, Attribute v4,
-				     std::string n5, Attribute v5,
-				     std::string n6, Attribute v6,
-				     std::string n7, Attribute v7)
+				     std::string n0, const AttributeValue &v0,
+				     std::string n1, const AttributeValue &v1,
+				     std::string n2, const AttributeValue &v2,
+				     std::string n3, const AttributeValue &v3,
+				     std::string n4, const AttributeValue &v4,
+				     std::string n5, const AttributeValue &v5,
+				     std::string n6, const AttributeValue &v6,
+				     std::string n7, const AttributeValue &v7)
 {
   m_stationManager = ObjectFactory ();
   m_stationManager.SetTypeId (type);
@@ -101,14 +101,14 @@
 
 void 
 WifiHelper::SetMac (std::string type,
-		    std::string n0, Attribute v0,
-		    std::string n1, Attribute v1,
-		    std::string n2, Attribute v2,
-		    std::string n3, Attribute v3,
-		    std::string n4, Attribute v4,
-		    std::string n5, Attribute v5,
-		    std::string n6, Attribute v6,
-		    std::string n7, Attribute v7)
+		    std::string n0, const AttributeValue &v0,
+		    std::string n1, const AttributeValue &v1,
+		    std::string n2, const AttributeValue &v2,
+		    std::string n3, const AttributeValue &v3,
+		    std::string n4, const AttributeValue &v4,
+		    std::string n5, const AttributeValue &v5,
+		    std::string n6, const AttributeValue &v6,
+		    std::string n7, const AttributeValue &v7)
 {
   m_mac = ObjectFactory ();
   m_mac.SetTypeId (type);
@@ -124,14 +124,14 @@
 
 void 
 WifiHelper::SetPhy (std::string type,
-		    std::string n0, Attribute v0,
-		    std::string n1, Attribute v1,
-		    std::string n2, Attribute v2,
-		    std::string n3, Attribute v3,
-		    std::string n4, Attribute v4,
-		    std::string n5, Attribute v5,
-		    std::string n6, Attribute v6,
-		    std::string n7, Attribute v7)
+		    std::string n0, const AttributeValue &v0,
+		    std::string n1, const AttributeValue &v1,
+		    std::string n2, const AttributeValue &v2,
+		    std::string n3, const AttributeValue &v3,
+		    std::string n4, const AttributeValue &v4,
+		    std::string n5, const AttributeValue &v5,
+		    std::string n6, const AttributeValue &v6,
+		    std::string n7, const AttributeValue &v7)
 {
   m_phy = ObjectFactory ();
   m_phy.SetTypeId (type);