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
Add debug log for ODPOR + required explaining comments
[simgrid.git]
/
src
/
mc
/
transition
/
TransitionSynchro.cpp
diff --git
a/src/mc/transition/TransitionSynchro.cpp
b/src/mc/transition/TransitionSynchro.cpp
index
bd57886
..
5e7ded2
100644
(file)
--- a/
src/mc/transition/TransitionSynchro.cpp
+++ b/
src/mc/transition/TransitionSynchro.cpp
@@
-128,11
+128,7
@@
bool SemaphoreTransition::depends(const Transition* o) const
// Actions executed by the same actor are always dependent
if (o->aid_ == aid_)
return true;
// Actions executed by the same actor are always dependent
if (o->aid_ == aid_)
return true;
-<<<<<<< HEAD
-
-=======
->>>>>>> dfafe652e9ae62c35cd0fc084b117fc987b3e8dc
if (const auto* other = dynamic_cast<const SemaphoreTransition*>(o)) {
if (sem_ != other->sem_)
return false;
if (const auto* other = dynamic_cast<const SemaphoreTransition*>(o)) {
if (sem_ != other->sem_)
return false;