X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffeda6173da70f62490fd56bcaec9de30ed9f362..dca78d0426c59e786f1633ef14b3c8b99ab7e9e0:/src/simgrid/host.cpp diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index 21f311f00c..5bf67431eb 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -19,7 +19,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts"); // FIXME: The following duplicates the content of s4u::Host +namespace simgrid { +namespace s4u { extern std::map host_list; +} +} extern "C" { @@ -33,20 +37,20 @@ void sg_host_exit() * the tests. */ std::vector names = std::vector(); - for (auto kv : host_list) + for (auto kv : simgrid::s4u::host_list) names.push_back(kv.second->name()); std::sort(names.begin(), names.end()); for (auto name : names) - host_list.at(name)->destroy(); + simgrid::s4u::host_list.at(name)->destroy(); // host_list.clear(); This would be sufficient if the dict would contain smart_ptr. It's now useless } size_t sg_host_count() { - return host_list.size(); + return simgrid::s4u::host_list.size(); } /** @brief Returns the host list * @@ -93,7 +97,7 @@ xbt_dynar_t sg_hosts_as_dynar() { xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr); - for (auto kv : host_list) { + for (auto kv : simgrid::s4u::host_list) { simgrid::s4u::Host* host = kv.second; if (host && host->pimpl_netpoint && host->pimpl_netpoint->isHost()) xbt_dynar_push(res, &host);