X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..2dacd344720d07a79a3116387618bee9c0b63fa2:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index d667710c46..e39b3e733a 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011. The SimGrid Team. +/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -132,7 +132,7 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); // If dynar is is greater than edge id and if the host_link is already defined - if(xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id && + if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->m_id && xbt_dynar_get_as(current_routing->p_linkUpDownList, info->m_id, void*)) xbt_die("Host_link for '%s' is already defined!",host->id); @@ -420,7 +420,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) * even if you add stuff to a closed AS * */ -void routing_AS_end(sg_platf_AS_cbarg_t AS) +void routing_AS_end(sg_platf_AS_cbarg_t /*AS*/) { if (current_routing == NULL) { @@ -1267,7 +1267,7 @@ void routing_exit(void) { return; xbt_dynar_free(&routing_platf->p_lastRoute); finalize_rec(routing_platf->p_root); - xbt_free(routing_platf); + delete routing_platf; } AS_t surf_AS_get_routing_root() {