X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7341151507abf1d7931e8ca2df777541b5f6bfe2..a3f2c3c47a2cdae9e34c468a0b548f085b92a188:/include/simgrid/simix.hpp diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp index 9b48240802..b6b9a1cecf 100644 --- a/include/simgrid/simix.hpp +++ b/include/simgrid/simix.hpp @@ -91,7 +91,7 @@ XBT_PUBLIC(void) registerFunction(const char* name, ActorCodeFactory factory); * * If these functions manage to unlock some of the processes, then the deadlock will be avoided. */ -extern simgrid::xbt::signal onDeadlock; +extern simgrid::xbt::signal onDeadlock; } } @@ -110,7 +110,7 @@ typedef smx_actor_t (*smx_creation_func_t) ( /* name */ const char*, std::function code, /* userdata */ void*, - /* hostname */ const char*, + /* hostname */ sg_host_t, /* kill_time */ double, /* props */ xbt_dict_t, /* auto_restart */ int, @@ -122,7 +122,7 @@ XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t func XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name, std::function code, void *data, - const char *hostname, + sg_host_t host, double kill_time, xbt_dict_t properties, int auto_restart); @@ -130,13 +130,13 @@ XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name, XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task callback); template inline -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback) +smx_timer_t SIMIX_timer_set(double date, F callback) { return SIMIX_timer_set(date, simgrid::xbt::Task(std::move(callback))); } template inline -XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, R(*callback)(T*), T* arg) +smx_timer_t SIMIX_timer_set(double date, R(*callback)(T*), T* arg) { return SIMIX_timer_set(date, [=](){ callback(arg); }); }