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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_network.cpp
diff --git
a/src/simix/smx_network.cpp
b/src/simix/smx_network.cpp
index
ac97e48
..
2da73fd
100644
(file)
--- a/
src/simix/smx_network.cpp
+++ b/
src/simix/smx_network.cpp
@@
-9,7
+9,7
@@
#include <xbt/ex.hpp>
#include <xbt/ex.hpp>
-#include
<simgrid/s4u/host.hpp>
+#include
"simgrid/s4u/Host.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Mailbox.hpp"
#include "mc/mc.h"
#include "simgrid/s4u/Mailbox.hpp"
@@
-17,8
+17,6
@@
#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/surf_interface.hpp"
-#include "xbt/dict.h"
-#include "xbt/log.h"
#include "src/kernel/activity/SynchroComm.hpp"
#include "src/surf/network_interface.hpp"
#include "src/kernel/activity/SynchroComm.hpp"
#include "src/surf/network_interface.hpp"
@@
-61,7
+59,7
@@
_find_matching_comm(boost::circular_buffer_space_optimized<smx_activity_t>* dequ
if (remove_matching)
deque->erase(it);
comm->ref();
if (remove_matching)
deque->erase(it);
comm->ref();
-#if HAVE_MC
+#if
SIMGRID_
HAVE_MC
comm->mbox_cpy = comm->mbox;
#endif
comm->mbox = nullptr;
comm->mbox_cpy = comm->mbox;
#endif
comm->mbox = nullptr;