Merge branch 'master' into actor-yield

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

diff --git a/src/smpi/colls/allgatherv/allgatherv-GB.cpp b/src/smpi/colls/allgatherv/allgatherv-GB.cpp
index 6c41685422633ddb9b2d301718d5b8f69c7914c7..09636066fe349e15bee78785a82c3937c8f3b715 100644 (file)
--- a/src/smpi/colls/allgatherv/allgatherv-GB.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-GB.cpp
@@ -1,10 +1,10 @@
-/* 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{
@@ -15,8 +15,7 @@ int Coll_allgatherv_GB::allgatherv(void *send_buff, int send_count,
                                  int *recv_counts, int *recv_disps, MPI_Datatype recv_type,
                                  MPI_Comm comm)
 {
-  Colls::gatherv(send_buff, send_count, send_type, recv_buff, recv_counts,
-                  recv_disps, recv_type, 0, comm);
+  Colls::gatherv(send_buff, send_count, send_type, recv_buff, recv_counts, recv_disps, recv_type, 0, comm);
   int num_procs, i, current, max = 0;
   num_procs = comm->size();
   for (i = 0; i < num_procs; i++) {