X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..d50a590cfb08f9f45bab9fd355eed8dbdcf765ea:/src/simix/popping_private.hpp diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index 63422324f2..b6a60d9669 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -17,12 +17,13 @@ XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */ #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */ typedef int (*simix_match_func_t)(void*, void*, simgrid::kernel::activity::CommImpl*); -typedef void (*simix_copy_data_func_t)(smx_activity_t, void*, size_t); +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 /* Pack all possible scalar types in an union */ union u_smx_scalar { + bool b; char c; short s; int i; @@ -94,6 +95,7 @@ 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);