X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e30d391831c58e590aa83dce5f30f218cc3f53ce..5a2092b20ade8cd9ba54125b5528260f123de8ce:/include/simgrid/simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 172ebe9891..ed5e1285cb 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -63,7 +63,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();
@@ -77,7 +76,7 @@ typedef std::function<void()> ActorCode;
 // Create ActorCode based on argv:
 typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
 
-XBT_PUBLIC void registerFunction(const char* name, ActorCodeFactory factory);
+XBT_PUBLIC void register_function(const char* name, ActorCodeFactory factory);
 
 /** These functions will be called when we detect a deadlock: any remaining process is locked on an action
  *