From: alebre Date: Tue, 2 Apr 2013 13:26:39 +0000 (+0200) Subject: git checkout hypervisor X-Git-Tag: v3_11_beta~297^2^2~40^2~4^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/32fce378217eb6c3ea29b936cac8e231e4e3b184 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-SMP-simple.c b/src/smpi/colls/allgather-SMP-simple.c index ee5774778c..c8f0c68d6b 100644 --- a/src/smpi/colls/allgather-SMP-simple.c +++ b/src/smpi/colls/allgather-SMP-simple.c @@ -3,7 +3,7 @@ #define NUM_CORE 8 #endif -int smpi_coll_tuned_allgather_SMP_simple(void *send_buf, int scount, +int smpi_coll_tuned_allgather_smp_simple(void *send_buf, int scount, MPI_Datatype stype, void *recv_buf, int rcount, MPI_Datatype rtype, MPI_Comm comm)