merge with trunk
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 28 Aug 2007 14:32:44 +0200
changeset 1382 61584c0c60f6
parent 1381 6dd346ffeddc (current diff)
parent 1302 7dd6ea991e80 (diff)
child 1383 12f30b7defb4
merge with trunk
src/routing/global-routing/global-route-manager-impl.cc
--- a/src/routing/global-routing/global-route-manager-impl.cc	Tue Aug 28 14:10:54 2007 +0200
+++ b/src/routing/global-routing/global-route-manager-impl.cc	Tue Aug 28 14:32:44 2007 +0200
@@ -1110,7 +1110,7 @@
 // the node at the root of the SPF tree.  This is the node for which we are
 // building the routing table.
 //
-  std::vector<Ptr<Node> >::iterator i = NodeList::Begin (); 
+  NodeList::Iterator i = NodeList::Begin (); 
   for (; i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
@@ -1183,7 +1183,7 @@
 // the node at the root of the SPF tree.  This is the node for which we are
 // building the routing table.
 //
-  std::vector<Ptr<Node> >::iterator i = NodeList::Begin (); 
+  NodeList::Iterator i = NodeList::Begin (); 
   for (; i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
@@ -1274,7 +1274,7 @@
 // ID corresponding to the root vertex.  This is the one we're going to write
 // the routing information to.
 //
-  std::vector<Ptr<Node> >::iterator i = NodeList::Begin (); 
+  NodeList::Iterator i = NodeList::Begin (); 
   for (; i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;
@@ -1395,7 +1395,7 @@
 // ID corresponding to the root vertex.  This is the one we're going to write
 // the routing information to.
 //
-  std::vector<Ptr<Node> >::iterator i = NodeList::Begin (); 
+  NodeList::Iterator i = NodeList::Begin (); 
   for (; i != NodeList::End (); i++)
     {
       Ptr<Node> node = *i;