X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31a818b15a9657dd08268d473255481b2a2d197b..fa0bb7e4203ef24f51ea4f8d1a8abe376e4885d5:/src/kernel/context/ContextSwapped.cpp diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 2fd0f477a9..0b59cd8237 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -43,10 +43,6 @@ SwappedContextFactory::SwappedContextFactory() : ContextFactory(), parallel_(SIM parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel) workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr); } -SwappedContextFactory::~SwappedContextFactory() -{ - delete parmap_; -} SwappedContext::SwappedContext(std::function&& code, smx_actor_t actor, SwappedContextFactory* factory) : Context(std::move(code), actor), factory_(factory) @@ -164,7 +160,8 @@ void SwappedContextFactory::run_all() // We lazily create the parmap so that all options are actually processed when doing so. if (parmap_ == nullptr) - parmap_ = new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()); + parmap_.reset( + new simgrid::xbt::Parmap(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode())); // Usually, Parmap::apply() executes the provided function on all elements of the array. // Here, the executed function does not return the control to the parmap before all the array is processed: