--- a/src/core/enum-value.h	Wed Feb 20 20:24:52 2008 +0100
+++ b/src/core/enum-value.h	Wed Feb 20 20:57:59 2008 +0100
@@ -24,7 +24,7 @@
   int m_v;
 };
 
-class EnumAccessor : public Accessor {};
+class EnumAccessor : public AttributeAccessor {};
 class EnumChecker : public AttributeChecker
 {
 public:
@@ -42,23 +42,23 @@
 };
 
 template <typename T1>
-Ptr<Accessor> MakeEnumAccessor (T1 a1);
+Ptr<const AttributeAccessor> MakeEnumAccessor (T1 a1);
 
 template <typename T1, typename T2>
-Ptr<Accessor> MakeEnumAccessor (T1 a1, T2 a2);
+Ptr<const AttributeAccessor> MakeEnumAccessor (T1 a1, T2 a2);
 
-Ptr<AttributeChecker> MakeEnumChecker (int v1, std::string n1,
-				       int v2 = 0, std::string n2 = "",
-				       int v3 = 0, std::string n3 = "",
-				       int v4 = 0, std::string n4 = "",
-				       int v5 = 0, std::string n5 = "",
-				       int v6 = 0, std::string n6 = "",
-				       int v7 = 0, std::string n7 = "",
-				       int v8 = 0, std::string n8 = "",
-				       int v9 = 0, std::string n9 = "",
-				       int v10 = 0, std::string n10 = "",
-				       int v11 = 0, std::string n11 = "",
-				       int v12 = 0, std::string n12 = "");
+Ptr<const AttributeChecker> MakeEnumChecker (int v1, std::string n1,
+					     int v2 = 0, std::string n2 = "",
+					     int v3 = 0, std::string n3 = "",
+					     int v4 = 0, std::string n4 = "",
+					     int v5 = 0, std::string n5 = "",
+					     int v6 = 0, std::string n6 = "",
+					     int v7 = 0, std::string n7 = "",
+					     int v8 = 0, std::string n8 = "",
+					     int v9 = 0, std::string n9 = "",
+					     int v10 = 0, std::string n10 = "",
+					     int v11 = 0, std::string n11 = "",
+					     int v12 = 0, std::string n12 = "");
 
 
 } // namespace ns3
@@ -66,13 +66,13 @@
 namespace ns3 {
 
 template <typename T1>
-Ptr<Accessor> MakeEnumAccessor (T1 a1)
+Ptr<const AttributeAccessor> MakeEnumAccessor (T1 a1)
 {
   return MakeAccessorHelper<EnumAccessor,EnumValue> (a1);
 }
 
 template <typename T1, typename T2>
-Ptr<Accessor> MakeEnumAccessor (T1 a1, T2 a2)
+Ptr<const AttributeAccessor> MakeEnumAccessor (T1 a1, T2 a2)
 {
   return MakeAccessorHelper<EnumAccessor,EnumValue> (a1, a2);
 }