X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..3e9453209f1da7deb92fe629428e49f3528217bd:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index 516b85fda1..22295c55a1 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2023. 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. */
@@ -18,46 +18,34 @@
 #include <functional>
 #include <vector>
 
-#include <simgrid/simix.hpp>
-#include <xbt/parmap.hpp>
-
-#include "src/internal_config.h"
-#include "src/kernel/context/Context.hpp"
 #include "src/kernel/context/ContextSwapped.hpp"
+#include "src/xbt/parmap.hpp"
 
-namespace simgrid {
-namespace kernel {
-namespace context {
+namespace simgrid::kernel::context {
 
 /** @brief Userspace context switching implementation based on Boost.Context */
 class BoostContext : public SwappedContext {
 public:
   BoostContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory);
-  ~BoostContext() override;
-
-  void swap_into(SwappedContext* to) override;
 
 private:
-#if BOOST_VERSION < 105600
-  boost::context::fcontext_t* fc_ = nullptr;
-  typedef intptr_t arg_type;
-#elif BOOST_VERSION < 106100
-  boost::context::fcontext_t fc_;
-  typedef intptr_t arg_type;
+#if BOOST_VERSION < 106100
+  boost::context::fcontext_t fc_{};
+  using arg_type = intptr_t;
 #else
-  boost::context::detail::fcontext_t fc_;
-  typedef boost::context::detail::transfer_t arg_type;
+  boost::context::detail::fcontext_t fc_{};
+  using arg_type = boost::context::detail::transfer_t;
 #endif
 
-  static void wrapper(arg_type arg);
+  XBT_ATTRIB_NORETURN static void wrapper(arg_type arg);
+
+  void swap_into_for_real(SwappedContext* to) override;
 };
 
 class BoostContextFactory : public SwappedContextFactory {
 public:
   BoostContext* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
 };
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::context
 
 #endif