move VM into their namespace, and greatly reduce the amount of sg_host_get_name ...

[simgrid.git] / src / simgrid / host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 09bb732..77e84c3 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -16,7 +16,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
-extern std::unordered_map<simgrid::xbt::string, simgrid::s4u::Host*>
+extern std::unordered_map<std::string, simgrid::s4u::Host*>
     host_list; // FIXME: don't dupplicate the content of s4u::Host this way
 
 void sg_host_exit()
@@ -61,7 +61,7 @@ sg_host_t *sg_host_list() {
 
 const char *sg_host_get_name(sg_host_t host)
 {
-  return host->name().c_str();
+  return host->cname();
 }
 
 void* sg_host_extension_get(sg_host_t host, size_t ext)
@@ -198,10 +198,10 @@ void sg_host_dump(sg_host_t host)
   xbt_dict_cursor_t cursor=nullptr;
   char *key,*data;
 
-  XBT_INFO("Displaying host %s", sg_host_get_name(host));
+  XBT_INFO("Displaying host %s", host->cname());
   XBT_INFO("  - speed: %.0f", host->speed());
   XBT_INFO("  - available speed: %.2f", sg_host_get_available_speed(host));
-  props = sg_host_get_properties(host);
+  props = host->properties();
 
   if (!xbt_dict_is_empty(props)){
     XBT_INFO("  - properties:");