constify MPI_Group*

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 1e1baf8..cdd6fe0 100644 (file)
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -492,13 +492,13 @@ MPI_CALL(XBT_PUBLIC int, MPI_Group_free, (MPI_Group * group));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_size, (MPI_Group group, int* size));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_rank, (MPI_Group group, int* rank));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_translate_ranks,
 MPI_CALL(XBT_PUBLIC int, MPI_Group_size, (MPI_Group group, int* size));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_rank, (MPI_Group group, int* rank));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_translate_ranks,

-         (MPI_Group group1, int n, int* ranks1, MPI_Group group2, int* ranks2));
+         (MPI_Group group1, int n, const int* ranks1, MPI_Group group2, int* ranks2));

 MPI_CALL(XBT_PUBLIC int, MPI_Group_compare, (MPI_Group group1, MPI_Group group2, int* result));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_union, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_intersection, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_difference, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_compare, (MPI_Group group1, MPI_Group group2, int* result));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_union, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_intersection, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_difference, (MPI_Group group1, MPI_Group group2, MPI_Group* newgroup));

-MPI_CALL(XBT_PUBLIC int, MPI_Group_incl, (MPI_Group group, int n, int* ranks, MPI_Group* newgroup));
-MPI_CALL(XBT_PUBLIC int, MPI_Group_excl, (MPI_Group group, int n, int* ranks, MPI_Group* newgroup));
+MPI_CALL(XBT_PUBLIC int, MPI_Group_incl, (MPI_Group group, int n, const int* ranks, MPI_Group* newgroup));
+MPI_CALL(XBT_PUBLIC int, MPI_Group_excl, (MPI_Group group, int n, const int* ranks, MPI_Group* newgroup));

 MPI_CALL(XBT_PUBLIC int, MPI_Group_range_incl, (MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_range_excl, (MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC MPI_Group, MPI_Group_f2c, (MPI_Fint group));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_range_incl, (MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC int, MPI_Group_range_excl, (MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup));
 MPI_CALL(XBT_PUBLIC MPI_Group, MPI_Group_f2c, (MPI_Fint group));

diff --git a/src/smpi/bindings/smpi_mpi.cpp b/src/smpi/bindings/smpi_mpi.cpp
index 5ee0555..31bbc2c 100644 (file)
--- a/src/smpi/bindings/smpi_mpi.cpp
+++ b/src/smpi/bindings/smpi_mpi.cpp
@@ -134,15 +134,15 @@ WRAPPED_PMPI_CALL(int,MPI_Get_accumulate, (void *origin_addr, int origin_count,
 WRAPPED_PMPI_CALL(int,MPI_Fetch_and_op, (void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win),(origin_addr, result_addr, datatype, target_rank, target_disp, op, win))
 WRAPPED_PMPI_CALL(int,MPI_Group_compare,(MPI_Group group1, MPI_Group group2, int *result),(group1, group2, result))
 WRAPPED_PMPI_CALL(int,MPI_Group_difference,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Fetch_and_op, (void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win),(origin_addr, result_addr, datatype, target_rank, target_disp, op, win))
 WRAPPED_PMPI_CALL(int,MPI_Group_compare,(MPI_Group group1, MPI_Group group2, int *result),(group1, group2, result))
 WRAPPED_PMPI_CALL(int,MPI_Group_difference,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))

-WRAPPED_PMPI_CALL(int,MPI_Group_excl,(MPI_Group group, int n, int *ranks, MPI_Group * newgroup),(group, n, ranks, newgroup))
+WRAPPED_PMPI_CALL(int,MPI_Group_excl,(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup),(group, n, ranks, newgroup))

 WRAPPED_PMPI_CALL(int,MPI_Group_free,(MPI_Group * group),(group))
 WRAPPED_PMPI_CALL(int,MPI_Group_free,(MPI_Group * group),(group))

-WRAPPED_PMPI_CALL(int,MPI_Group_incl,(MPI_Group group, int n, int *ranks, MPI_Group * newgroup),(group, n, ranks, newgroup))
+WRAPPED_PMPI_CALL(int,MPI_Group_incl,(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup),(group, n, ranks, newgroup))

 WRAPPED_PMPI_CALL(int,MPI_Group_intersection,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_range_excl,(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup),(group, n, ranges, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_range_incl,(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup),(group, n, ranges, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_rank,(MPI_Group group, int *rank),(group, rank))
 WRAPPED_PMPI_CALL(int,MPI_Group_size,(MPI_Group group, int *size),(group, size))
 WRAPPED_PMPI_CALL(int,MPI_Group_intersection,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_range_excl,(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup),(group, n, ranges, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_range_incl,(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup),(group, n, ranges, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Group_rank,(MPI_Group group, int *rank),(group, rank))
 WRAPPED_PMPI_CALL(int,MPI_Group_size,(MPI_Group group, int *size),(group, size))

-WRAPPED_PMPI_CALL(int,MPI_Group_translate_ranks,(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2),(group1, n, ranks1, group2, ranks2))
+WRAPPED_PMPI_CALL(int,MPI_Group_translate_ranks,(MPI_Group group1, int n, const int *ranks1, MPI_Group group2, int *ranks2),(group1, n, ranks1, group2, ranks2))

 WRAPPED_PMPI_CALL(int,MPI_Group_union,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Ibarrier,(MPI_Comm comm, MPI_Request *request),(comm,request))
 WRAPPED_PMPI_CALL(int,MPI_Ibcast,(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request),(buf, count, datatype, root, comm, request))
 WRAPPED_PMPI_CALL(int,MPI_Group_union,(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup),(group1, group2, newgroup))
 WRAPPED_PMPI_CALL(int,MPI_Ibarrier,(MPI_Comm comm, MPI_Request *request),(comm,request))
 WRAPPED_PMPI_CALL(int,MPI_Ibcast,(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request),(buf, count, datatype, root, comm, request))

diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp
index 5abc6eb..4155bf6 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_group.cpp
+++ b/src/smpi/bindings/smpi_pmpi_group.cpp
@@ -50,7 +50,7 @@ int PMPI_Group_rank(MPI_Group group, int *rank)
   }
 }
 
   }
 }
 

-int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1, MPI_Group group2, int *ranks2)
+int PMPI_Group_translate_ranks(MPI_Group group1, int n, const int *ranks1, MPI_Group group2, int *ranks2)

 {
   if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;
 {
   if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;


@@ -114,7 +114,7 @@ int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgro
   }
 }
 
   }
 }
 

-int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+int PMPI_Group_incl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)

 {
   if (group == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;
 {
   if (group == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;


@@ -125,7 +125,7 @@ int PMPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
   }
 }
 
   }
 }
 

-int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+int PMPI_Group_excl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)

 {
   if (group == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;
 {
   if (group == MPI_GROUP_NULL) {
     return MPI_ERR_GROUP;

diff --git a/src/smpi/include/smpi_group.hpp b/src/smpi/include/smpi_group.hpp
index cdbf4b8..e033edc 100644 (file)
--- a/src/smpi/include/smpi_group.hpp
+++ b/src/smpi/include/smpi_group.hpp
@@ -38,8 +38,8 @@ public:
   static void unref(MPI_Group group);
   int size() { return size_; }
   int compare(MPI_Group group2);
   static void unref(MPI_Group group);
   int size() { return size_; }
   int compare(MPI_Group group2);

-  int incl(int n, int* ranks, MPI_Group* newgroup);
-  int excl(int n, int* ranks, MPI_Group* newgroup);
+  int incl(int n, const int* ranks, MPI_Group* newgroup);
+  int excl(int n, const int* ranks, MPI_Group* newgroup);

   int group_union(MPI_Group group2, MPI_Group* newgroup);
   int intersection(MPI_Group group2, MPI_Group* newgroup);
   int difference(MPI_Group group2, MPI_Group* newgroup);
   int group_union(MPI_Group group2, MPI_Group* newgroup);
   int intersection(MPI_Group group2, MPI_Group* newgroup);
   int difference(MPI_Group group2, MPI_Group* newgroup);

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index f8eb81c..68d86f8 100644 (file)
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -106,7 +106,7 @@ int Group::compare(MPI_Group group2)
   return result;
 }
 
   return result;
 }
 

-int Group::incl(int n, int* ranks, MPI_Group* newgroup)
+int Group::incl(int n, const int* ranks, MPI_Group* newgroup)

 {
   int i=0;
   if (n == 0) {
 {
   int i=0;
   if (n == 0) {


@@ -206,7 +206,7 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup)
   return MPI_SUCCESS;
 }
 
   return MPI_SUCCESS;
 }
 

-int Group::excl(int n, int *ranks, MPI_Group * newgroup){
+int Group::excl(int n, const int *ranks, MPI_Group * newgroup){

   int oldsize = size_;
   int newsize = oldsize - n;
   *newgroup = new  Group(newsize);
   int oldsize = size_;
   int newsize = oldsize - n;
   *newgroup = new  Group(newsize);