From: Tom Cornebize <tom.cornebize@ensimag.grenoble-inp.fr>
Date: Mon, 27 Nov 2017 15:49:33 +0000 (-0600)
Subject: Merge branch 'master' into fix/execute_benched
X-Git-Tag: v3.18~228^2^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec?hp=--cc

Merge branch 'master' into fix/execute_benched
---

ecd5f7562caf1d443bf22788fa5f4fac408776ec
diff --cc src/smpi/internals/smpi_bench.cpp
index 0b68ed98c3,795521e695..21fe9740d2
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@@ -3,14 -3,13 +3,14 @@@
  /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
  
- #include "src/internal_config.h"
- #include "private.h"
  #include "private.hpp"
  #include "simgrid/modelchecker.h"
- #include "src/mc/mc_replay.h"
- #include "smpi_process.hpp"
  #include "smpi_comm.hpp"
 +#include "simgrid/host.h"
+ #include "smpi_process.hpp"
+ #include "src/internal_config.h"
+ #include "src/mc/mc_replay.hpp"
+ #include <unordered_map>
  
  #ifndef WIN32
  #include <sys/mman.h>