Merge s4u wait_any

[simgrid.git] / src / simix / ContextBoost.cpp

diff --git a/src/simix/ContextBoost.cpp b/src/simix/ContextBoost.cpp
index 9108558..605fee7 100644 (file)
--- a/src/simix/ContextBoost.cpp
+++ b/src/simix/ContextBoost.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015. 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. */
 
-/** @file BoostContext.cpp Userspace context switching implementation based on Boost.Context */
-
 #include <cstdint>
 
 #include <functional>
@@ -34,7 +31,6 @@ public:
     : BoostContext(std::move(code), cleanup_func, process) {}
   void stop() override;
   void suspend() override;
-  void resume();
 };
 
 #if HAVE_THREAD_CONTEXTS
@@ -46,7 +42,7 @@ public:
     : BoostContext(std::move(code), cleanup_func, process) {}
   void stop() override;
   void suspend() override;
-  void resume();
+  void resume() override;
 };
 #endif