Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / include / simgrid / simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index ff4625b..eee08fc 100644 (file)
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -49,8 +49,7 @@ namespace simix {
  *  More importantly, this enforces a deterministic/reproducible ordering
  *  of the operation with respect to other simcalls.
  */
-template<class F>
-typename std::result_of<F()>::type kernelImmediate(F&& code)
+template <class F> typename std::result_of<F()>::type simcall(F&& code)
 {
   // If we are in the maestro, we take the fast path and execute the
   // code directly without simcall mashalling/unmarshalling/dispatch:
@@ -63,7 +62,6 @@ typename std::result_of<F()>::type kernelImmediate(F&& code)
   typedef typename std::result_of<F()>::type R;
   simgrid::xbt::Result<R> result;
   simcall_run_kernel([&]{
-    xbt_assert(SIMIX_is_maestro(), "Not in maestro");
     simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
   });
   return result.get();