Rename RoutingEdge into NetCard

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

diff --git a/src/surf/surf_routing_none.cpp b/src/surf/surf_routing_none.cpp
index 4652b56..28c64fb 100644 (file)
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -10,14 +10,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
 AS_t model_none_create(void)
 {
-  return new AsNone();
+  return new simgrid::surf::AsNone();
 }
 
+namespace simgrid {
+namespace surf {
+
 xbt_dynar_t AsNone::getOneLinkRoutes() {
   return NULL;
 }
 
-void AsNone::getRouteAndLatency(RoutingEdge * /*src*/, RoutingEdge * /*dst*/,
+void AsNone::getRouteAndLatency(NetCard * /*src*/, NetCard * /*dst*/,
                                 sg_platf_route_cbarg_t /*res*/, double *lat)
 {
   *lat = 0.0;
@@ -28,20 +31,20 @@ void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*
        XBT_INFO("No routing no graph");
 }
 
-sg_platf_route_cbarg_t AsNone::getBypassRoute(RoutingEdge * /*src*/, RoutingEdge * /*dst*/, double * /*lat*/) {
+sg_platf_route_cbarg_t AsNone::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {
   return NULL;
 }
 
-int AsNone::parsePU(RoutingEdge *elm) {
+int AsNone::parsePU(NetCard *elm) {
   XBT_DEBUG("Load process unit \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
+  xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
   /* don't care about PUs */
   return -1;
 }
 
-int AsNone::parseAS(RoutingEdge *elm) {
+int AsNone::parseAS(NetCard *elm) {
   XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
+  xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
   /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
   return -1;
 }
@@ -70,3 +73,5 @@ AsNone::~AsNone() {
   xbt_dynar_free(&p_linkUpDownList);
 }
 
+}
+}