From 32fce378217eb6c3ea29b936cac8e231e4e3b184 Mon Sep 17 00:00:00 2001 From: alebre Date: Tue, 2 Apr 2013 15:26:39 +0200 Subject: [PATCH] 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 --- src/smpi/colls/allgather-SMP-simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.20.1