Merge branch 'master' of github.com:simgrid/simgrid

[simgrid.git] / include / simgrid / kernel / routing / NetZoneImpl.hpp

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 9e80905..8b24af2 100644 (file)
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -51,13 +51,13 @@ class XBT_PUBLIC NetZoneImpl {
   friend simgrid::kernel::EngineImpl; // it destroys netRoot_
 
 protected:
-  explicit NetZoneImpl(NetZoneImpl* father, std::string name);
+  explicit NetZoneImpl(NetZoneImpl* father, std::string name, resource::NetworkModel* network_model);
   virtual ~NetZoneImpl();
 
 public:
   s4u::NetZone* get_iface() { return &piface_; }
 
-  /** @brief Make an host within that NetZone */
+  /** @brief Make a host within that NetZone */
   simgrid::s4u::Host* create_host(const char* name, std::vector<double>* speed_per_pstate, int core_count,
                                   std::map<std::string, std::string>* props);
   /** @brief Creates a new route in this NetZone */
@@ -86,6 +86,9 @@ protected:
   bool get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst,
                         /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
+public:
+  resource::NetworkModel* network_model_;
+
 private:
   s4u::NetZone piface_;