A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use method get() instead of &* for intrusive_ptr.
[simgrid.git]
/
src
/
simix
/
popping_private.hpp
diff --git
a/src/simix/popping_private.hpp
b/src/simix/popping_private.hpp
index
d6c0a5c
..
b7d4b5f
100644
(file)
--- a/
src/simix/popping_private.hpp
+++ b/
src/simix/popping_private.hpp
@@
-52,8
+52,8
@@
struct s_smx_simcall {
smx_actor_t issuer;
smx_timer_t timer;
int mc_value;
smx_actor_t issuer;
smx_timer_t timer;
int mc_value;
- u
nion u
_smx_scalar args[11];
- u
nion u
_smx_scalar result;
+ u_smx_scalar args[11];
+ u_smx_scalar result;
};
#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall)->mc_value = (value))
};
#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall)->mc_value = (value))
@@
-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 {
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)
}
}
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)
{
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)
}
template <std::size_t I, class A> inline void marshalArgs(smx_simcall_t simcall, A const& a)