Update copyright lines.

[simgrid.git] / src / smpi / colls / allgather / allgather-ompi-neighborexchange.cpp

diff --git a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
index 4f2707e..d3fc359 100644 (file)
--- a/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
+++ b/src/smpi/colls/allgather/allgather-ompi-neighborexchange.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
+/* Copyright (c) 2013-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -62,13 +62,13 @@
  *         [5]    [5]    [5]    [5]    [5]    [5]
  */
 
- #include "../colls_private.h"
+#include "../colls_private.hpp"
 
 namespace simgrid{
 namespace smpi{
 
 int
-Coll_allgather_ompi_neighborexchange::allgather(void *sbuf, int scount,
+allgather__ompi_neighborexchange(const void *sbuf, int scount,
                                                  MPI_Datatype sdtype,
                                                  void* rbuf, int rcount,
                                                  MPI_Datatype rdtype,
@@ -81,7 +81,7 @@ Coll_allgather_ompi_neighborexchange::allgather(void *sbuf, int scount,
    int i, even_rank;
    int err = 0;
    ptrdiff_t slb, rlb, sext, rext;
-   char *tmpsend = NULL, *tmprecv = NULL;
+   char *tmpsend = nullptr, *tmprecv = nullptr;
 
    size = comm->size();
    rank = comm->rank();
@@ -90,9 +90,9 @@ Coll_allgather_ompi_neighborexchange::allgather(void *sbuf, int scount,
       XBT_DEBUG(
                    "coll:tuned:allgather_intra_neighborexchange WARNING: odd size %d, switching to ring algorithm",
                    size);
-      return Coll_allgather_ring::allgather(sbuf, scount, sdtype,
-                                                  rbuf, rcount, rdtype,
-                                                  comm);
+      return allgather__ring(sbuf, scount, sdtype,
+                             rbuf, rcount, rdtype,
+                             comm);
    }
 
    XBT_DEBUG(
@@ -137,7 +137,7 @@ Coll_allgather_ompi_neighborexchange::allgather(void *sbuf, int scount,
       - Rest of the steps:
         update recv_data_from according to offset, and
         exchange two blocks with appropriate neighbor.
-        the send location becomes previous receve location.
+        the send location becomes previous receive location.
    */
    tmprecv = (char*)rbuf + neighbor[0] * rcount * rext;
    tmpsend = (char*)rbuf + rank * rcount * rext;