Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / msg / msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 1c3ea9b..8399065 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -25,7 +25,7 @@ SG_BEGIN_DECL()
  *
  *     \include simgrid.dtd
  *
- * Here is a small example of such a platform 
+ * Here is a small example of such a platform
  *
  *     \include small_platform.xml
  *
@@ -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<void*>(elem), nullptr);
+  for (auto const& elem : *netzone->getChildren()) {
+    xbt_dict_set(whereto, elem->getCname(), static_cast<void*>(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<simgrid::s4u::Host*> hosts;
-  netzone->hosts(&hosts);
-  for (auto host : hosts)
+  netzone->getHosts(&hosts);
+  for (auto const& host : hosts)
     xbt_dynar_push(whereto, &host);
 }