X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf680cf3d4a4d3d87dd231833e31c7e23701c6c7..b2fe69328dc3b66ce74894b58f5446514e48d53c:/src/kernel/context/Context.hpp?ds=sidebyside diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index 082677c08c..50f140cfbc 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -52,7 +52,7 @@ class XBT_PUBLIC Context { private: std::function code_; void_pfn_smxprocess_t cleanup_func_ = nullptr; - smx_actor_t process_ = nullptr; + smx_actor_t actor_ = nullptr; public: class StopRequest { @@ -68,7 +68,7 @@ public: private: std::string msg_; }; - bool iwannadie; + bool iwannadie = false; Context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process); Context(const Context&) = delete; @@ -76,7 +76,7 @@ public: void operator()() { code_(); } bool has_code() const { return static_cast(code_); } - smx_actor_t process() { return this->process_; } + smx_actor_t process() { return this->actor_; } void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; } // Virtual methods @@ -87,8 +87,8 @@ public: class XBT_PUBLIC AttachContext : public Context { public: - AttachContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) - : Context(std::move(code), cleanup_func, process) + AttachContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor) + : Context(std::move(code), cleanup_func, actor) { }