X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82e2aa78964d9150810411ce80fa62ab3aa4aaa9..a76526cb68465af7b566a4afc6fff7893be6a94d:/src/kernel/context/ContextBoost.hpp

diff --git a/src/kernel/context/ContextBoost.hpp b/src/kernel/context/ContextBoost.hpp
index c0adb53141..64456350d0 100644
--- a/src/kernel/context/ContextBoost.hpp
+++ b/src/kernel/context/ContextBoost.hpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2020. 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. */
 
-#ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
-#define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_BOOST_CONTEXT_HPP
 
 #include <boost/version.hpp>
 #if BOOST_VERSION < 106100
@@ -33,15 +33,11 @@ namespace 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
+#if BOOST_VERSION < 106100
   boost::context::fcontext_t fc_;
   typedef intptr_t arg_type;
 #else
@@ -49,7 +45,7 @@ private:
   typedef boost::context::detail::transfer_t arg_type;
 #endif
 
-  static void wrapper(arg_type arg);
+  XBT_ATTRIB_NORETURN static void wrapper(arg_type arg);
 };
 
 class BoostContextFactory : public SwappedContextFactory {