X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cca09ad88fcaeb49f2637de97df519c3920aaa4..fb87a25b953371e3523b597ee68427d4d590c05a:/src/simix/popping_private.hpp

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index 8dbbec1ba9..b7d4b5fa9e 100644
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -143,8 +143,8 @@ inline void marshal(type<boost::intrusive_ptr<T>>, 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<void*>(&*value);
+    intrusive_ptr_add_ref(value.get());
+    simcall.dp = static_cast<void*>(value.get());
   }
 }
 template <class T> inline boost::intrusive_ptr<T> unmarshal(type<boost::intrusive_ptr<T>>, u_smx_scalar const& simcall)
@@ -186,6 +186,7 @@ template <class T> inline typename std::remove_reference<T>::type unmarshal_raw(
 
 template <std::size_t I> inline void marshalArgs(smx_simcall_t simcall)
 {
+  /* Nothing to do when no args */
 }
 
 template <std::size_t I, class A> inline void marshalArgs(smx_simcall_t simcall, A const& a)