X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94f511befd8ea7dea78746c1f6ae818a778e67e7..c641d112f8a557b61ff14c261931077773f21fbd:/src/kernel/context/ContextSwapped.hpp

diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp
index 6e56bb166f..77fb48af40 100644
--- a/src/kernel/context/ContextSwapped.hpp
+++ b/src/kernel/context/ContextSwapped.hpp
@@ -45,8 +45,7 @@ public:
 
   virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses
 
-  static SwappedContext* get_maestro() { return maestro_context_; }
-  static void set_maestro(SwappedContext* maestro) { maestro_context_ = maestro; }
+  void set_maestro(SwappedContext* ctx) { factory_->workers_context_[0] = ctx; }
 
   // FIXME: Killme
   static thread_local uintptr_t worker_id_;
@@ -55,7 +54,6 @@ protected:
   void* stack_ = nullptr; /* the thread stack */
 
 private:
-  static SwappedContext* maestro_context_;
   SwappedContextFactory* factory_; // for sequential and parallel run_all()
 };