From: alebre <adrien.lebre@inria.fr>
Date: Tue, 2 Apr 2013 13:26:27 +0000 (+0200)
Subject: git checkout hypervisor
X-Git-Tag: v3_11_beta~297^2^2~40^2~4^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c980557f74f6d9ab5768643b861fba927faf0175?hp=9201096042d3e409c3a5e795418027266d4008fc

git checkout hypervisor
error: Your local changes to the following files would be overwritten by checkout:
src/smpi/colls/allgather-RDB.c
src/smpi/colls/allgather-SMP-simple.c
---

diff --git a/src/smpi/colls/allgather-RDB.c b/src/smpi/colls/allgather-RDB.c
index 9a9a925ba9..fc1b36d621 100644
--- a/src/smpi/colls/allgather-RDB.c
+++ b/src/smpi/colls/allgather-RDB.c
@@ -1,11 +1,10 @@
 #include "colls.h"
 
 int
-smpi_coll_tuned_allgather_RDB(void *sbuf, int send_count,
-                                              MPI_Datatype send_type,
-                                              void *rbuf, int recv_count,
-                                              MPI_Datatype recv_type,
-                                              MPI_Comm comm)
+smpi_coll_tuned_allgather_rdb(void *sbuf, int send_count,
+                              MPI_Datatype send_type, void *rbuf,
+                              int recv_count, MPI_Datatype recv_type,
+                              MPI_Comm comm)
 {
   // MPI variables
   MPI_Status status;