X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41f97f763bc1771fe15e96ffcd4ff3e7c76a9a63..5fa46b25d81881c427ca3233a43ce12aad4a0242:/src/kernel/EngineImpl.cpp diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 9fa10c8a12..77390cb070 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,23 +7,20 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Link.hpp" #include "src/surf/StorageImpl.hpp" +#include "src/surf/network_interface.hpp" #include namespace simgrid { namespace kernel { -EngineImpl::EngineImpl() = default; 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. + * 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. */ std::vector names; for (auto const& kv : hosts_) @@ -41,10 +38,11 @@ EngineImpl::~EngineImpl() for (auto const& kv : storages_) if (kv.second) - kv.second->getImpl()->destroy(); + kv.second->get_impl()->destroy(); + for (auto const& kv : links_) if (kv.second) - (kv.second)->destroy(); + kv.second->get_impl()->destroy(); } } }