Merge branch 'master' into xbt_random

[simgrid.git] / src / smpi / colls / allreduce / allreduce-rdb.cpp

diff --git a/src/smpi/colls/allreduce/allreduce-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rdb.cpp
index 4afddb4..ba19511 100644 (file)
--- a/src/smpi/colls/allreduce/allreduce-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rdb.cpp
@@ -15,7 +15,6 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
   int mask, dst, pof2, newrank, rem, newdst;
   MPI_Aint extent, lb;
   MPI_Status status;
-  void *tmp_buf = NULL;
   /*
      #ifdef MPICH2_REDUCTION
      MPI_User_function * uop = MPIR_Op_table[op % 16 - 1];
@@ -30,7 +29,7 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
   rank=comm->rank();
 
   dtype->extent(&lb, &extent);
-  tmp_buf = (void *) smpi_get_tmp_sendbuffer(count * extent);
+  unsigned char* tmp_buf = smpi_get_tmp_sendbuffer(count * extent);
 
   Request::sendrecv(sbuff, count, dtype, rank, 500,
                rbuff, count, dtype, rank, 500, comm, &status);
@@ -56,7 +55,7 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
       Request::send(rbuff, count, dtype, rank + 1, tag, comm);
 
       // temporarily set the rank to -1 so that this
-      // process does not pariticipate in recursive
+      // process does not participate in recursive
       // doubling
       newrank = -1;
     } else                      // odd
@@ -100,7 +99,7 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
       // recvbuf contains data accumulated so far
 
       // op is commutative OR the order is already right
-      // we assume it is commuttive op
+      // we assume it is commutative op
       //      if (op -> op_commute  || (dst < rank))
       if ((dst < rank)) {
         if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuff, &count, dtype);