X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/001737a15701027974d89260771284a45013d2cd..34f9387eaac8b66b6f35293ee1aab7f2b7143ee2:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 77390cb070..3a96a578de 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -10,26 +10,16 @@ #include "src/surf/StorageImpl.hpp" #include "src/surf/network_interface.hpp" -#include - namespace simgrid { namespace kernel { EngineImpl::~EngineImpl() { - /* copy all names to not modify the map while iterating over it. - * - * Plus, the hosts are destroyed in the lexicographic order to ensure that the output is reproducible: we don't want - * to kill them in the pointer order as it could be platform-dependent, which would break the tests. + /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is + * reproducible. */ - std::vector names; - for (auto const& kv : hosts_) - names.push_back(kv.second->get_name()); - - std::sort(names.begin(), names.end()); - - for (auto const& name : names) - hosts_.at(name)->destroy(); + while (not hosts_.empty()) + hosts_.begin()->second->destroy(); /* Also delete the other data */ delete netzone_root_;