X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..4a4d0d50d8a6fbd0b50172905f7ad5cf5ed0f9a0:/src/kernel/activity/ExecImpl.hpp diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp index 86ac8a3cb8..fe4b94a120 100644 --- a/src/kernel/activity/ExecImpl.hpp +++ b/src/kernel/activity/ExecImpl.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ -#ifndef SIMIX_SYNCHRO_EXEC_HPP -#define SIMIX_SYNCHRO_EXEC_HPP +#ifndef SIMGRID_KERNEL_ACTIVITY_EXEC_HPP +#define SIMGRID_KERNEL_ACTIVITY_EXEC_HPP #include "src/kernel/activity/ActivityImpl.hpp" #include "src/kernel/context/Context.hpp" @@ -15,13 +15,13 @@ namespace kernel { namespace activity { class XBT_PUBLIC ExecImpl : public ActivityImpl_T { - resource::Action* timeout_detector_ = nullptr; + std::unique_ptr> timeout_detector_{ + nullptr, [](resource::Action* a) { a->unref(); }}; double sharing_penalty_ = 1.0; double bound_ = 0.0; std::vector hosts_; std::vector flops_amounts_; std::vector bytes_amounts_; - ~ExecImpl(); public: ExecImpl& set_timeout(double timeout);