Merge pull request #228 from Takishipp/actor-execute

[simgrid.git] / src / kernel / context / ContextThread.cpp

diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index 395e730cdb2169b74000d8e4198485a78cd272e9..ebcdfbef65ff675b24296294a92eeddedb993a2a 100644 (file)
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -6,12 +6,12 @@
 #include <utility>
 #include <functional>
 
+#include "src/internal_config.h" /* loads context system definitions */
+#include "src/simix/smx_private.hpp"
+#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
 #include "xbt/function_types.h"
-#include "src/simix/smx_private.h"
-#include "src/internal_config.h"           /* loads context system definitions */
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
-#include "src/xbt_modinter.h"       /* prototype of os thread module's init/exit in XBT */
 
 #include "src/kernel/context/ContextThread.hpp"
 
@@ -153,8 +153,8 @@ void *ThreadContext::wrapper(void *param)
 
   try {
     (*context)();
-    context->stop();
-  } catch (StopRequest) {
+    context->Context::stop();
+  } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
   }