Merge branch 'master' into actor-yield

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

diff --git a/src/smpi/colls/allgather/allgather-GB.cpp b/src/smpi/colls/allgather/allgather-GB.cpp
index 1a107b0..1303878 100644 (file)
--- a/src/smpi/colls/allgather/allgather-GB.cpp
+++ b/src/smpi/colls/allgather/allgather-GB.cpp
@@ -1,22 +1,27 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2017. 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"
 
+namespace simgrid{
+namespace smpi{
 // Allgather - gather/bcast algorithm
-int smpi_coll_tuned_allgather_GB(void *send_buff, int send_count,
+int Coll_allgather_GB::allgather(void *send_buff, int send_count,
                                  MPI_Datatype send_type, void *recv_buff,
                                  int recv_count, MPI_Datatype recv_type,
                                  MPI_Comm comm)
 {
   int num_procs;
   num_procs = comm->size();
-  mpi_coll_gather_fun(send_buff, send_count, send_type, recv_buff, recv_count, recv_type,
+  Colls::gather(send_buff, send_count, send_type, recv_buff, recv_count, recv_type,
              0, comm);
-  mpi_coll_bcast_fun(recv_buff, (recv_count * num_procs), recv_type, 0, comm);
+  Colls::bcast(recv_buff, (recv_count * num_procs), recv_type, 0, comm);
 
   return MPI_SUCCESS;
 }
+
+}
+}