Merge pull request #5125 from hjelmn/romio_mpi3

io/romio314: fix two more MPI-3 compliance issues

ompi/mca/io/romio314/romio/adio/common/cb_config_list.c

@@ -135,8 +135,8 @@ int ADIOI_cb_gather_name_array(MPI_Comm comm,
 
     if (ADIOI_cb_config_list_keyval == MPI_KEYVAL_INVALID) {
         /* cleaned up by ADIOI_End_call */
-	MPI_Comm_create_keyval((MPI_Copy_function *) ADIOI_cb_copy_name_array,
-			  (MPI_Delete_function *) ADIOI_cb_delete_name_array,
+	MPI_Comm_create_keyval((MPI_Comm_copy_attr_function *) ADIOI_cb_copy_name_array,
+			  (MPI_Comm_delete_attr_function *) ADIOI_cb_delete_name_array,
 			  &ADIOI_cb_config_list_keyval, NULL);
     }
     else {

ompi/mca/io/romio314/romio/mpi-io/mpioimpl.h

@@ -58,7 +58,7 @@ struct MPIR_Info {
 
 #define MPIR_INFO_COOKIE 5835657
 
-MPI_Delete_function ADIOI_End_call;
+MPI_Comm_delete_attr_function ADIOI_End_call;
 
 /* common initialization routine */
 void MPIR_MPIOInit(int * error_code);