kill dead code

[simgrid.git] / src / surf / network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 5e38359..9ccded3 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -57,13 +57,13 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
                                      link->bandwidth_trace,
                                      link->latency,
                                      link->latency_trace,
-                                     link->state,
+                                     link->initiallyOn,
                                      link->state_trace,
                                      link->policy,
                                      link->properties);
 }
 
-static void simgrid_ns3_add_router(simgrid::surf::RoutingEdge* router)
+static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
 {
   const char* router_id = router->getName();
   XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
@@ -288,7 +288,7 @@ Link* NetworkNS3Model::createLink(const char *name,
                                         tmgr_trace_t bw_trace,
                                         double lat_initial,
                                         tmgr_trace_t lat_trace,
-                                        e_surf_resource_state_t state_initial,
+                                        int initiallyOn,
                                         tmgr_trace_t state_trace,
                                         e_surf_link_sharing_policy_t policy,
                                         xbt_dict_t properties){
@@ -303,7 +303,7 @@ Link* NetworkNS3Model::createLink(const char *name,
   return link;
 }
 
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
+xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
 {
   xbt_dynar_t route = NULL;
   routing_get_route_and_latency(src, dst, &route, NULL);
@@ -311,7 +311,7 @@ xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
   return route;
 }
 
-Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
                                               double size, double rate)
 {
   XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());