From 66150cac82e5c723ee69237a008fc27023c73def Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Mon, 4 Jan 2016 17:36:18 +0100
Subject: [PATCH] [simix] Fix forwarding of function in run_kernel

---
 include/simgrid/simix.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 8dc10836e1..25d8a917b9 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -28,7 +28,7 @@ template<class R, class F>
 void fulfill_promise(std::promise<R>& promise, F&& code)
 {
   try {
-    promise.set_value(code());
+    promise.set_value(std::forward<F>(code)());
   }
   catch(...) {
     promise.set_exception(std::current_exception());
@@ -41,7 +41,7 @@ template<class F>
 void fulfill_promise(std::promise<void>& promise, F&& code)
 {
   try {
-    code();
+    std::forward<F>(code)();
     promise.set_value();
   }
   catch(...) {
@@ -56,7 +56,7 @@ typename std::result_of<F()>::type kernel(F&& code)
   std::promise<R> promise;
   simcall_run_kernel([&]{
     xbt_assert(SIMIX_is_maestro(), "Not in maestro");
-    fulfill_promise(promise, code);
+    fulfill_promise(promise, std::forward<F>(code));
   });
   return promise.get_future().get();
 }
-- 
2.20.1