X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90603961312ebafdfa7b490bc720baed0a69f76c..e10bc953babfe63c53950e1df818e042cb1e992f:/src/bindings/lua/lua_platf.cpp diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index 52510d889b..98d866ef48 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -19,7 +19,7 @@ extern "C" { #include "src/surf/surf_private.h" #include #include -#include +#include #include #include @@ -101,7 +101,7 @@ int console_add_backbone(lua_State *L) { } sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str())); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); return 0; } @@ -342,7 +342,7 @@ int console_add_route(lua_State *L) { // Several names separated by , \t\r\n for (auto name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str()); + simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name); route.link_list->push_back(link); } } @@ -423,7 +423,7 @@ int console_add_ASroute(lua_State *L) { // Several names separated by , \t\r\n for (auto name : names) { if (name.length() > 0) { - simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name.c_str()); + simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name); ASroute.link_list->push_back(link); } } @@ -483,10 +483,10 @@ int console_AS_open(lua_State *L) { mode_int = A_surfxml_AS_routing_None; else xbt_die("Don't have the model name '%s'",mode); - s_sg_platf_AS_cbarg_t AS; + ZoneCreationArgs AS; AS.id = id; AS.routing = mode_int; - simgrid::s4u::NetZone* new_as = sg_platf_new_AS_begin(&AS); + simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_begin(&AS); /* Build a Lua representation of the new AS on the stack */ lua_newtable(L); @@ -501,7 +501,7 @@ int console_AS_open(lua_State *L) { } int console_AS_seal(lua_State *L) { XBT_DEBUG("Sealing AS"); - sg_platf_new_AS_seal(); + sg_platf_new_Zone_seal(); return 0; }