X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f740d769f956cbaa52d518358e9a65ecce196d7..e9f0018b823e34405847177b25a85d3facc30ae1:/src/smpi/smpi_comm.c

diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c
index 7518c1582d..9f38c44267 100644
--- a/src/smpi/smpi_comm.c
+++ b/src/smpi/smpi_comm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,7 +10,7 @@
 #include "xbt/dict.h"
 #include "smpi_mpi_dt_private.h"
 #include "limits.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "colls/colls.h"
 #include "xbt/ex.h"
 
@@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi,
                                 "Logging specific to SMPI (comm)");
 
 xbt_dict_t smpi_comm_keyvals = NULL;
-int comm_keyval_id=MPI_TAG_UB+1;//avoid collisions
+int comm_keyval_id = 0;//avoid collisions
 
 /* Support for cartesian topology was added, but there are 2 other types of
  * topology, graph et dist graph. In order to support them, we have to add a
@@ -386,7 +386,7 @@ void smpi_comm_init_smp(MPI_Comm comm){
 
   int i =0;
   int min_index=INT_MAX;//the minimum index will be the leader
-  msg_process_t process = NULL;
+  smx_process_t process = NULL;
   xbt_swag_foreach(process, process_list) {
     //is_in_comm=0;
     int index = SIMIX_process_get_PID(process) -1;
@@ -617,4 +617,3 @@ int smpi_comm_keyval_free(int* keyval){
   xbt_free(elem);
   return MPI_SUCCESS;
 }
-