Merge remote-tracking branch 'github/master'

[simgrid.git] / src / kernel / context / Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index dfba34cf39cd47e7679133404b7619337c22e293..b0c22c250d0af307571c64c2aaabb96a686f9147 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -33,7 +33,7 @@ public:
   /** Turn the current thread into maestro (the old maestro becomes a regular actor) */
   virtual Context* create_maestro(std::function<void()>&& code, actor::ActorImpl* actor);
 
-  virtual void run_all() = 0;
+  virtual void run_all(std::vector<actor::ActorImpl*> const& actors_list) = 0;
 
 protected:
   template <class T, class... Args> T* new_context(Args&&... args)
@@ -51,7 +51,6 @@ class XBT_PUBLIC Context {
 
   std::function<void()> code_;
   actor::ActorImpl* actor_ = nullptr;
-  bool iwannadie_          = false;
   bool is_maestro_;
   void declare_context(std::size_t size);
 
@@ -65,8 +64,6 @@ public:
   Context& operator=(const Context&) = delete;
   virtual ~Context();
 
-  bool wannadie() const { return iwannadie_; }
-  void set_wannadie(bool value = true) { iwannadie_ = value; }
   bool is_maestro() const { return is_maestro_; }
   void operator()() const { code_(); }
   bool has_code() const { return static_cast<bool>(code_); }