X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/364eee0fc6ab77fddc5437ac273527bd27711724..3cbf54871089cc3dc50b6832652b5765e1601039:/src/simix/popping_private.hpp diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index e0c200a3d6..52ca2e7274 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -18,7 +18,7 @@ extern "C" { /********************************* Simcalls *********************************/ -XBT_PUBLIC_DATA(const char*) simcall_names[]; /* Name of each simcall */ +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 */ @@ -143,8 +143,8 @@ inline void marshal(type>, u_smx_scalar& simcall, boost: if (value.get() == nullptr) { // Sometimes we return nullptr in an intrusive_ptr... simcall.dp = nullptr; } else { - intrusive_ptr_add_ref(&*value); - simcall.dp = static_cast(&*value); + intrusive_ptr_add_ref(value.get()); + simcall.dp = static_cast(value.get()); } } template inline boost::intrusive_ptr unmarshal(type>, u_smx_scalar const& simcall)