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

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>

(back-ported from commit open-mpi/ompi@ae17908f35)

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>

ompi/mca/io/romio321/romio/3.diff

@@ -0,0 +1,36 @@
+commit ae17908f35ee614071ec68eb4643286f7b707e86
+Author: Nathan Hjelm <hjelmn@lanl.gov>
+Date:   Tue May 1 15:11:34 2018 -0600
+
+    io/romio314: fix two more MPI-3 compliance issues
+    
+    Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
+
+diff --git a/ompi/mca/io/romio314/romio/adio/common/cb_config_list.c b/ompi/mca/io/romio314/romio/adio/common/cb_config_list.c
+index 718205b..e9f3116 100644
+--- a/ompi/mca/io/romio314/romio/adio/common/cb_config_list.c
++++ b/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 {
+diff --git a/ompi/mca/io/romio314/romio/mpi-io/mpioimpl.h b/ompi/mca/io/romio314/romio/mpi-io/mpioimpl.h
+index a73561a..ff13723 100644
+--- a/ompi/mca/io/romio314/romio/mpi-io/mpioimpl.h
++++ b/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);

ompi/mca/io/romio321/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/romio321/romio/mpi-io/mpioimpl.h

@@ -53,7 +53,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);