X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..e04e3ae8fec7cb28eef7705e4aebf2370e6fdd6a:/src/simix/popping_private.hpp diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index fce643ccda..1a7ce1c50e 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -16,7 +16,7 @@ XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */ -typedef int (*simix_match_func_t)(void*, void*, simgrid::kernel::activity::CommImpl*); +typedef bool (*simix_match_func_t)(void*, void*, simgrid::kernel::activity::CommImpl*); typedef void (*simix_copy_data_func_t)(simgrid::kernel::activity::CommImpl*, void*, size_t); typedef void (*simix_clean_func_t)(void*); typedef void (*FPtr)(void); // Hide the ugliness @@ -93,20 +93,20 @@ template struct marshal_t { inline T unmarshal_raw(type, u_smx_scalar const& simcall) \ { /* Exactly same as unmarshal. It differs only for intrusive_ptr */ return simcall.field; } -SIMIX_MARSHAL(bool, b); -SIMIX_MARSHAL(char, c); -SIMIX_MARSHAL(short, s); -SIMIX_MARSHAL(int, i); -SIMIX_MARSHAL(long, l); -SIMIX_MARSHAL(unsigned char, uc); -SIMIX_MARSHAL(unsigned short, us); -SIMIX_MARSHAL(unsigned int, ui); -SIMIX_MARSHAL(unsigned long, ul); -SIMIX_MARSHAL(unsigned long long, ull); -SIMIX_MARSHAL(long long, ll); -SIMIX_MARSHAL(float, d); -SIMIX_MARSHAL(double, d); -SIMIX_MARSHAL(FPtr, fp); +SIMIX_MARSHAL(bool, b) +SIMIX_MARSHAL(char, c) +SIMIX_MARSHAL(short, s) +SIMIX_MARSHAL(int, i) +SIMIX_MARSHAL(long, l) +SIMIX_MARSHAL(unsigned char, uc) +SIMIX_MARSHAL(unsigned short, us) +SIMIX_MARSHAL(unsigned int, ui) +SIMIX_MARSHAL(unsigned long, ul) +SIMIX_MARSHAL(unsigned long long, ull) +SIMIX_MARSHAL(long long, ll) +SIMIX_MARSHAL(float, d) +SIMIX_MARSHAL(double, d) +SIMIX_MARSHAL(FPtr, fp) inline void unmarshal(type, u_smx_scalar const& simcall) {