Merge branch 'smpi_cpp'

[simgrid.git] / src / smpi / smpi_group.cpp

diff --git a/src/smpi/smpi_group.cpp b/src/smpi/smpi_group.cpp
index 6fc5084..d92277b 100644 (file)
--- a/src/smpi/smpi_group.cpp
+++ b/src/smpi/smpi_group.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "private.h"
-#include "smpi_group.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)");
 simgrid::SMPI::Group mpi_MPI_GROUP_EMPTY;
@@ -69,7 +68,7 @@ Group::~Group()
 
 void Group::destroy()
 {
-  if(this != smpi_comm_group(MPI_COMM_WORLD)
+  if(this != MPI_COMM_WORLD->group()
           && this != MPI_GROUP_NULL
           && this != MPI_GROUP_EMPTY)
   this->unuse();
@@ -169,9 +168,9 @@ int Group::incl(int n, int* ranks, MPI_Group* newgroup)
     *newgroup = MPI_GROUP_EMPTY;
   } else if (n == m_size) {
     *newgroup = this;
-    if(this!= smpi_comm_group(MPI_COMM_WORLD)
+    if(this!= MPI_COMM_WORLD->group()
               && this != MPI_GROUP_NULL
-              && this != smpi_comm_group(MPI_COMM_SELF)
+              && this != MPI_COMM_SELF->group()
               && this != MPI_GROUP_EMPTY)
     this->use();
   } else {