X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3a267e5ba376a0f0313767a12d518ffdeaa7196..9286635df68ffd6c2d5549867647eac7a3ceb81c:/include/simgrid/kernel/routing/NetZoneImpl.hpp?ds=sidebyside

diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
index 18a525bfa9..fd6aff2596 100644
--- a/include/simgrid/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -55,11 +55,11 @@ protected:
 
 public:
   /** @brief Make an host within that NetZone */
-  simgrid::s4u::Host* create_host(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
+  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 */
   void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                        std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
+                        std::vector<resource::LinkImpl*>& link_list, bool symmetrical) override;
 
 protected:
   /**
@@ -74,7 +74,7 @@ protected:
   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
   /* returns whether we found a bypass path */
   bool get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst,
-                        /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
+                        /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
 public:
   /* @brief get the route between two nodes in the full platform
@@ -85,7 +85,7 @@ public:
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
   static void get_global_route(routing::NetPoint* src, routing::NetPoint* dst,
-                               /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
+                               /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
 
   virtual void get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
                          std::map<std::string, xbt_edge_t>* edges) = 0;