X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/863aeead864a309c494893a1b06ec33ed2b7daf1..e6b086a2fdd22931c0a2c75fbba13c50821d108c:/src/msg/msg_environment.cpp diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp index 1a62573380..83990658c2 100644 --- a/src/msg/msg_environment.cpp +++ b/src/msg/msg_environment.cpp @@ -38,29 +38,29 @@ void MSG_create_environment(const char *file) msg_netzone_t MSG_zone_get_root() { - return simgrid::s4u::Engine::instance()->netRoot(); + return simgrid::s4u::Engine::getInstance()->getNetRoot(); } const char* MSG_zone_get_name(msg_netzone_t netzone) { - return netzone->name(); + return netzone->getCname(); } msg_netzone_t MSG_zone_get_by_name(const char* name) { - return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name); + return simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(name); } void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto) { - for (auto elem : *netzone->children()) { - xbt_dict_set(whereto, elem->name(), static_cast(elem), nullptr); + for (auto const& elem : *netzone->getChildren()) { + xbt_dict_set(whereto, elem->getCname(), static_cast(elem), nullptr); } } const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name) { - return netzone->property(name); + return netzone->getProperty(name); } void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value) @@ -72,8 +72,8 @@ void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto) { /* converts vector to dynar */ std::vector hosts; - netzone->hosts(&hosts); - for (auto host : hosts) + netzone->getHosts(&hosts); + for (auto const& host : hosts) xbt_dynar_push(whereto, &host); }