- SIMIX_context_set_current(this);
- smx_ctx_boost_jump_fcontext(maestro_context_, this);
+#if BOOST_VERSION < 105600
+ boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+#elif BOOST_VERSION < 106100
+ boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+#else
+ BoostContext* ctx[2] = {from, to};
+ ASAN_ONLY(void* fake_stack = nullptr);
+ ASAN_ONLY(to->asan_ctx_ = from);
+ ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
+ boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);
+ ASAN_ONLY(xbt_assert(from->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]));
+ ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
+ static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
+#endif