Merge branch 'master' into fix-#617-r-flag-conflict

Author: Damian Rouson

src/mpi/CMakeLists.txt

@@ -210,7 +210,7 @@ foreach(symbol ${NEEDED_SYMBOLS})
   CHECK_SYMBOL_EXISTS(${symbol} "${MPI_HEADERS}" HAVE_${symbol})
   if(NOT HAVE_${symbol})
     message( STATUS "\${HAVE_${symbol}} = ${HAVE_${symbol}}")
-    message( WARNING
+    message( STATUS
       "Note: Failed Images not supported by the current MPI implementation! (Needs MPIX experimental features--as of MPI3)")
     set(MPI_HAS_FAULT_TOL_EXT NO)
     break() # no need to keep looking

src/mpi/mpi_caf.c

@@ -6989,8 +6989,8 @@ static void
 redux_char_by_reference_adapter(void *invec, void *inoutvec, int *len,
                                 MPI_Datatype *datatype)
 {
-  MPI_Aint string_len;
-  MPI_Type_extent(*datatype, &string_len);
+  MPI_Aint lb, string_len;
+  MPI_Type_get_extent(*datatype, &lb, &string_len);
   for (int i = 0; i < *len; i++)
   {
     /* The length of the result is fixed, i.e., no deferred string length is

src/openshmem/openshmem_caf.c

@@ -3094,8 +3094,8 @@ static void \
 redux_char_by_reference_adapter (void *invec, void *inoutvec, int *len,
       MPI_Datatype *datatype)
 {
-  long int string_len;
-  MPI_Type_extent(*datatype, &string_len);
+  long int lb, string_len; // this should be MPI_Aint
+  MPI_Type_extent(*datatype, &lb, &string_len);
   for(int i = 0; i < *len; i++)
     {
       /* The length of the result is fixed, i.e., no deferred string length is