X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7ed19dfcc221d7b3eca182abb5c4a3946671172..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/smpi/colls/allgather/allgather-rdb.cpp

diff --git a/src/smpi/colls/allgather/allgather-rdb.cpp b/src/smpi/colls/allgather/allgather-rdb.cpp
index 6d2950aa42..5811d72370 100644
--- a/src/smpi/colls/allgather/allgather-rdb.cpp
+++ b/src/smpi/colls/allgather/allgather-rdb.cpp
@@ -1,17 +1,16 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "../colls_private.h"
+#include "../colls_private.hpp"
+#include "smpi_status.hpp"
 
 namespace simgrid{
 namespace smpi{
 
-
 int
-Coll_allgather_rdb::allgather(void *sbuf, int send_count,
+Coll_allgather_rdb::allgather(const void *sbuf, int send_count,
                               MPI_Datatype send_type, void *rbuf,
                               int recv_count, MPI_Datatype recv_type,
                               MPI_Comm comm)
@@ -33,7 +32,7 @@ Coll_allgather_rdb::allgather(void *sbuf, int send_count,
   char *send_ptr = (char *) sbuf;
   char *recv_ptr = (char *) rbuf;
 
-  // get size of the communicator, followed by rank 
+  // get size of the communicator, followed by rank
   unsigned int num_procs = comm->size();
   unsigned int rank = comm->rank();
 
@@ -64,7 +63,7 @@ Coll_allgather_rdb::allgather(void *sbuf, int send_count,
       Request::sendrecv(recv_ptr + send_offset, curr_count, send_type, dst,
                    tag, recv_ptr + recv_offset, mask * recv_count,
                    recv_type, dst, tag, comm, &status);
-      last_recv_count = smpi_mpi_get_count(&status, recv_type);
+      last_recv_count = Status::get_count(&status, recv_type);
       curr_count += last_recv_count;
     }
 
@@ -117,7 +116,7 @@ Coll_allgather_rdb::allgather(void *sbuf, int send_count,
                    recv_type, dst, tag, comm, &status);
           // num_procs_completed is also equal to the no. of processes
           // whose data we don't have
-          last_recv_count = smpi_mpi_get_count(&status, recv_type);
+          last_recv_count = Status::get_count(&status, recv_type);
           curr_count += last_recv_count;
         }
         tmp_mask >>= 1;