From c980557f74f6d9ab5768643b861fba927faf0175 Mon Sep 17 00:00:00 2001 From: alebre Date: Tue, 2 Apr 2013 15:26:27 +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-RDB.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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; -- 2.20.1