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
e_smx_state_t is now kernel::activity::State
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index
d9d6c6c
..
d9b5410
100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-48,10
+48,10
@@
bool Mailbox::ready()
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
- comm_ready = pimpl_->comm_queue_.front()->state_ ==
SIMIX_
DONE;
-
+ comm_ready = pimpl_->comm_queue_.front()->state_ ==
kernel::activity::State::
DONE;
+
} else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
- comm_ready = pimpl_->done_comm_queue_.front()->state_ ==
SIMIX_
DONE;
+ comm_ready = pimpl_->done_comm_queue_.front()->state_ ==
kernel::activity::State::
DONE;
}
return comm_ready;
}