Change smpi::Colls static class into a namespace of functions

[simgrid.git] / src / smpi / colls / alltoallv / alltoallv-pair-mpi-barrier.cpp

diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
index d942226..c209f5b 100644 (file)
--- a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
@@ -24,16 +24,15 @@
            phases, nodes in pair communicate their data. MPI barriers are
            inserted between each two phases.
 
            phases, nodes in pair communicate their data. MPI barriers are
            inserted between each two phases.
 

- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj

 
  ****************************************************************************/
 
  ****************************************************************************/

-namespace simgrid{
-namespace smpi{
-int
-Coll_alltoallv_pair_mpi_barrier::alltoallv(const void *send_buff, const int *send_counts, const int *send_disps,
-                                          MPI_Datatype send_type,
-                                          void *recv_buff, const int *recv_counts, const int *recv_disps,
-                                          MPI_Datatype recv_type, MPI_Comm comm)
+namespace simgrid {
+namespace smpi {
+int alltoallv__pair_mpi_barrier(const void *send_buff, const int *send_counts, const int *send_disps,
+                                MPI_Datatype send_type,
+                                void *recv_buff, const int *recv_counts, const int *recv_disps,
+                                MPI_Datatype recv_type, MPI_Comm comm)

 {
   MPI_Status s;
   MPI_Aint send_chunk, recv_chunk;
 {
   MPI_Status s;
   MPI_Aint send_chunk, recv_chunk;


@@ -53,7 +52,7 @@ Coll_alltoallv_pair_mpi_barrier::alltoallv(const void *send_buff, const int *sen
 
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;
 
   for (i = 0; i < num_procs; i++) {
     src = dst = rank ^ i;

-    Colls::barrier(comm);
+    colls::barrier(comm);

     Request::sendrecv(send_ptr + send_disps[dst] * send_chunk, send_counts[dst], send_type, dst,
                  tag, recv_ptr + recv_disps[src] * recv_chunk, recv_counts[src], recv_type,
                  src, tag, comm, &s);
     Request::sendrecv(send_ptr + send_disps[dst] * send_chunk, send_counts[dst], send_type, dst,
                  tag, recv_ptr + recv_disps[src] * recv_chunk, recv_counts[src], recv_type,
                  src, tag, comm, &s);