[mc] Multiple .so support for region snapshots

[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 e62c778..1ea0e4a 100644 (file)
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team.
+/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,9 +6,7 @@
 
 #include "surf_routing_none.hpp"
 
-extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
-}
 
 AS_t model_none_create(void)
 {
@@ -35,14 +33,14 @@ sg_platf_route_cbarg_t AsNone::getBypassRoute(RoutingEdgePtr /*src*/, RoutingEdg
 }
 
 int AsNone::parsePU(RoutingEdgePtr elm) {
-  XBT_DEBUG("Load process unit \"%s\"", elm->p_name);
+  XBT_DEBUG("Load process unit \"%s\"", elm->getName());
   xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm);
   /* don't care about PUs */
   return -1;
 }
 
 int AsNone::parseAS(RoutingEdgePtr elm) {
-  XBT_DEBUG("Load Autonomous system \"%s\"", elm->p_name);
+  XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
   xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm);
   /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
   return -1;
@@ -63,6 +61,7 @@ void AsNone::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
 AsNone::AsNone() {
   p_routingSons = xbt_dict_new_homogeneous(NULL);
   p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
+  p_linkUpDownList = NULL;
 }
 
 AsNone::~AsNone() {