X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fb33f893495b18dc7a0e13182b901d4cf662150f..6865db1b80d2d06c80ff82e7246821958b56e2d2:/include/simgrid/s4u/NetZone.hpp

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 38cfab22c4..fe9d878cbb 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -40,7 +40,6 @@ 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,8 +47,8 @@ public:
   char* name();
   NetZone* father();
 
-  xbt_dict_t children(); // Sub netzones
-  std::vector<Host*>* hosts(); // my content as a vector of hosts
+  std::vector<NetZone*>* children(); // Sub netzones
+  void hosts(std::vector<s4u::Host*> * whereto); // retrieve my content as a vector of hosts
 
   /** Get the properties assigned to a host */
   std::unordered_map<std::string, std::string>* properties();
@@ -68,6 +67,8 @@ public:
                                    kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                                    std::vector<surf::LinkImpl*>* link_list)>
       onRouteCreation;
+  static simgrid::xbt::signal<void(NetZone&)> onCreation;
+  static simgrid::xbt::signal<void(NetZone&)> onSeal;
 
 protected:
   std::vector<kernel::routing::NetPoint*>
@@ -80,7 +81,7 @@ private:
 
   bool sealed_ = false; // We cannot add more content when sealed
 
-  xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr); // sub-netzones
+  std::vector<NetZone*>* children_ = nullptr; // sub-netzones
 };
 }
 }; // Namespace simgrid::s4u