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 c8f0680..ac71609 100644 (file)
--- 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 5b77cab..49f7828 100644 (file)
--- 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 ec95363..2812182 100644 (file)
--- 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{