fix jedule and do the right thing for netzone hosts

[simgrid.git] / include / simgrid / s4u / NetZone.hpp

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 155a95c..38cfab2 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -40,6 +40,7 @@ protected:
 
   explicit NetZone(NetZone * father, const char* name);
   virtual ~NetZone();
+  std::vector<Host*>* hosts_ = new std::vector<Host*>();
 
 public:
   /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
@@ -48,7 +49,7 @@ public:
   NetZone* father();
 
   xbt_dict_t children(); // Sub netzones
-  xbt_dynar_t hosts();   // my content as a dynar
+  std::vector<Host*>* hosts(); // my content as a vector of hosts
 
   /** Get the properties assigned to a host */
   std::unordered_map<std::string, std::string>* properties();
@@ -65,7 +66,7 @@ public:
   /*** Called on each newly created regular route (not on bypass routes) */
   static simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                                    kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                                   std::vector<Link*>* link_list)>
+                                   std::vector<surf::LinkImpl*>* link_list)>
       onRouteCreation;
 
 protected: