Merge branch 'master' of framagit.org:simgrid/simgrid

diff --cc src/mc/inspect/Frame.hpp
Simple merge

diff --cc src/smpi/include/smpi_comm.hpp
index 1febed3,5c9c915..06280b2
--- 1/src/smpi/include/smpi_comm.hpp
--- 2/src/smpi/include/smpi_comm.hpp
+++ b/src/smpi/include/smpi_comm.hpp
@@@ -32,9 -32,9 +32,9 @@@ class Comm : public F2C, public Keyval
    int is_smp_comm_;             // set to 0 in case this is already an intra-comm or a leader-comm to avoid recursion
    std::list<MPI_Win> rma_wins_; // attached windows for synchronization.
    std::string name_;
 -  MPI_Info info_;
 +  MPI_Info info_ = MPI_INFO_NULL;
    int id_;
-   MPI_Errhandler errhandler_;
+   MPI_Errhandler errhandler_ = MPI_ERRORS_ARE_FATAL;
  
  public:
    static std::unordered_map<int, smpi_key_elem> keyvals_;

diff --cc src/smpi/mpi/smpi_comm.cpp
index ac061c0,b9cee01..85267e8
--- 1/src/smpi/mpi/smpi_comm.cpp
--- 2/src/smpi/mpi/smpi_comm.cpp
+++ b/src/smpi/mpi/smpi_comm.cpp
@@@ -30,7 -30,9 +30,6 @@@ int Comm::keyval_id_=0
  
  Comm::Comm(MPI_Group group, MPI_Topology topo, int smp, int in_id) : group_(group), topo_(topo),is_smp_comm_(smp), id_(in_id)
  {
-   errhandler_      = MPI_ERRORS_ARE_FATAL;
 -  intra_comm_      = MPI_COMM_NULL;
 -  leaders_comm_    = MPI_COMM_NULL;
 -  info_            = MPI_INFO_NULL;
    errhandler_->ref();
    //First creation of comm is done before SIMIX_run, so only do comms for others
    if(in_id==MPI_UNDEFINED && smp==0 && this->rank()!=MPI_UNDEFINED ){