From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 31 Jul 2017 08:26:42 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_17~307
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b0e774cbc68a56647880e5522f2cf3216fa1d50a?hp=80eb7f52582553eb31ce81b93f359152499c3091

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/src/smpi/bindings/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp
index c8f0680729..ac716095c0 100644
--- a/src/smpi/bindings/smpi_f77.cpp
+++ b/src/smpi/bindings/smpi_f77.cpp
@@ -239,8 +239,8 @@ void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr){
 }
 
 void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr){
-  *ierr = MPI_Win_create_keyval(reinterpret_cast<MPI_Win_copy_attr_function*>(copy_fn),  reinterpret_cast<MPI_Win_delete_attr_function*>(delete_fn),
-         keyval,  extra_state) ;
+  *ierr = MPI_Win_create_keyval(reinterpret_cast<MPI_Win_copy_attr_function*>(copy_fn),
+                                reinterpret_cast<MPI_Win_delete_attr_function*>(delete_fn), keyval, extra_state);
 }
 
 void mpi_win_free_keyval_(int* keyval, int* ierr){
diff --git a/src/smpi/include/smpi_f2c.hpp b/src/smpi/include/smpi_f2c.hpp
index 5b77cab24b..49f7828fd0 100644
--- a/src/smpi/include/smpi_f2c.hpp
+++ b/src/smpi/include/smpi_f2c.hpp
@@ -38,9 +38,8 @@ class F2C {
     static void free_f(int id);
     int c2f();
 
-    //This method should be overriden in all subclasses
-    //to avoid casting the result when calling it.
-    //For the default one, the MPI_*_NULL returned is assumed to be NULL.
+    // This method should be overridden in all subclasses to avoid casting the result when calling it.
+    // For the default one, the MPI_*_NULL returned is assumed to be NULL.
     static F2C* f2c(int id);
 };
 
diff --git a/src/smpi/include/smpi_info.hpp b/src/smpi/include/smpi_info.hpp
index ec95363240..2812182e34 100644
--- a/src/smpi/include/smpi_info.hpp
+++ b/src/smpi/include/smpi_info.hpp
@@ -9,6 +9,7 @@
 
 #include "smpi/smpi.h"
 #include "smpi_f2c.hpp"
+#include <string>
 #include <unordered_map>
 
 namespace simgrid{