Merge branch 'xbt_random' into 'master'

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

diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
index 38bf38c..44a32f4 100644 (file)
--- a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* 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"
 /*****************************************************************************
 
  * Function: alltoall_ring_mpi_barrier
@@ -23,16 +23,15 @@
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
            MPI barriers are added between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
 namespace smpi{
-int
-Coll_alltoallv_ring_mpi_barrier::alltoallv(void *send_buff, int *send_counts, int *send_disps,
-                                          MPI_Datatype send_type,
-                                          void *recv_buff, int *recv_counts, int *recv_disps,
-                                          MPI_Datatype recv_type, MPI_Comm comm)
+int alltoallv__ring_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;