--- a/src/config-store/model/attribute-default-iterator.cc	Mon Oct 10 18:05:18 2011 +0200
+++ b/src/config-store/model/attribute-default-iterator.cc	Mon Oct 24 18:08:24 2011 +0200
@@ -22,7 +22,8 @@
 #include "ns3/pointer.h"
 #include "ns3/global-value.h"
 #include "ns3/string.h"
-#include "ns3/object-ptr-container.h"
+#include "ns3/object-ptr-vector.h"
+#include "ns3/object-ptr-map.h"
 
 namespace ns3
 {
@@ -70,19 +71,25 @@
               //No value, check next attribute
               continue;
             }
-          Ptr<const ObjectPtrContainerValue> vector = DynamicCast<const ObjectPtrContainerValue> (info.initialValue);
+          Ptr<const ObjectPtrVectorValue> vector = DynamicCast<const ObjectPtrVectorValue> (info.initialValue);
           if (vector != 0)
             {
               //a vector value, won't take it
               continue;
             }
+          Ptr<const ObjectPtrMapValue> map = DynamicCast<const ObjectPtrMapValue> (info.initialValue);
+          if (map != 0)
+            {
+              //a map value, won't take it
+              continue;
+            }
           Ptr<const PointerValue> pointer = DynamicCast<const PointerValue> (info.initialValue);
           if (pointer != 0)
             {
               //pointer value, won't take it
               continue;
             }
-          //We take only values, no pointers or vectors
+          //We take only values, no pointers or vectors or maps
           if (!calledStart)
             {
               StartVisitTypeId (tid.GetName ());