From 17818decf49f0d537c1f3c90dc555b261fa30a8d Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@inria.fr>
Date: Thu, 11 Aug 2011 08:11:38 +0200
Subject: [PATCH] remove object vector usage to allow object map to work with
 config store

---
 src/config-store/model/attribute-default-iterator.cc | 4 ++--
 src/config-store/model/model-node-creator.h          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/config-store/model/attribute-default-iterator.cc b/src/config-store/model/attribute-default-iterator.cc
index ddf366b39..b0fd39bcb 100644
--- a/src/config-store/model/attribute-default-iterator.cc
+++ b/src/config-store/model/attribute-default-iterator.cc
@@ -19,10 +19,10 @@
  
 #include "attribute-default-iterator.h"
 #include "ns3/attribute.h"
-#include "ns3/object-vector.h"
 #include "ns3/pointer.h"
 #include "ns3/global-value.h"
 #include "ns3/string.h"
+#include "ns3/object-ptr-container.h"
 
 namespace ns3
 {
@@ -70,7 +70,7 @@ AttributeDefaultIterator::Iterate (void)
               //No value, check next attribute
               continue;
             }
-          Ptr<const ObjectVectorValue> vector = DynamicCast<const ObjectVectorValue> (info.initialValue);
+          Ptr<const ObjectPtrContainerValue> vector = DynamicCast<const ObjectPtrContainerValue> (info.initialValue);
           if (vector != 0)
             {
               //a vector value, won't take it
diff --git a/src/config-store/model/model-node-creator.h b/src/config-store/model/model-node-creator.h
index 28bf791b7..822983b40 100644
--- a/src/config-store/model/model-node-creator.h
+++ b/src/config-store/model/model-node-creator.h
@@ -18,7 +18,6 @@
  */
 
 #include "attribute-iterator.h"
-#include "ns3/object-vector.h"
 #include <gtk/gtk.h>
 
 namespace ns3