[svn-r29079] rename the coll read requirement function.

7 files changed, 11 insertions, 10 deletions

diff --git a/UserMacros.cmake b/UserMacros.cmake
index 65ea5d4..cb8739f 100644
--- a/UserMacros.cmake
+++ b/UserMacros.cmake
@@ -19,4 +19,4 @@ endif (BUILD_USER_DEFINED_LIBS)
 #-----------------------------------------------------------------------------
 #------------------- E X A M P L E   E N D -----------------------------------
 #-----------------------------------------------------------------------------
- 
\ No newline at end of file
+ 
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 75f9e7c..d90dcd5 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -3581,7 +3581,7 @@ H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value)
 #ifdef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_coll_metadata_read
+ * Function:	H5Pset_all_coll_metadata_ops
  *
  * Purpose:	Tell the library whether the metadata read operations will
  *		be done collectively (1) or not (0). Default is independent.
@@ -3602,7 +3602,7 @@ H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_coll_metadata_read(hid_t plist_id, hbool_t is_collective)
+H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective)
 {
     H5P_genplist_t *plist;        /* Property list pointer */
     H5P_coll_md_read_flag_t coll_meta_read;     /* Property value */
@@ -3636,7 +3636,7 @@ H5Pset_coll_metadata_read(hid_t plist_id, hbool_t is_collective)
 
 done:
     FUNC_LEAVE_API(ret_value)
-} /* end H5Pset_coll_metadata_read() */
+} /* end H5Pset_all_coll_metadata_ops() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 1820625..9308339 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -352,7 +352,7 @@ H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id,
 H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
 H5_DLL herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size);
 #ifdef H5_HAVE_PARALLEL
-H5_DLL herr_t H5Pset_coll_metadata_read(hid_t plist_id, hbool_t is_collective);
+H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective);
 H5_DLL herr_t H5Pget_coll_metadata_read(hid_t plist_id, hbool_t *is_collective);
 H5_DLL herr_t H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective);
 H5_DLL herr_t H5Pget_coll_metadata_write(hid_t plist_id, hbool_t *is_collective);
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 48beb80..a5db9d7 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -7595,11 +7595,11 @@ main(int argc, char **argv)
 #endif
     /* enable the collective metadata read property */
     if ( world_mpi_rank != world_server_mpi_rank ) {
-        if ( H5Pset_coll_metadata_read(fapl, TRUE) < 0 ) {
+        if ( H5Pset_all_coll_metadata_ops(fapl, TRUE) < 0 ) {
 
             nerrors++;
             if ( verbose ) {
-                HDfprintf(stdout, "%d:%s: H5Pset_coll_metadata_read() failed 1.\n",
+                HDfprintf(stdout, "%d:%s: H5Pset_all_coll_metadata_ops() failed 1.\n",
                           world_mpi_rank, FUNC);
             }
         }
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 66d6f49..c88cb86 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -888,7 +888,8 @@ void independent_group_read(void)
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     plist = create_faccess_plist(MPI_COMM_WORLD, MPI_INFO_NULL, facc_type);
-    H5Pset_coll_metadata_read(plist, FALSE);
+    H5Pset_all_coll_metadata_ops(plist, FALSE);
+
     fid = H5Fopen(filename, H5F_ACC_RDONLY, plist);
     H5Pclose(plist);
 
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index 106dd7b..8be1610 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -4948,7 +4948,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
 	/* set Parallel access with communicator */
 	ret = H5Pset_fapl_mpio(ret_pl, comm, info);
 	VRFY((ret >= 0), "");
-        ret = H5Pset_coll_metadata_read(ret_pl, TRUE);
+        ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE);
 	VRFY((ret >= 0), "");
         ret = H5Pset_coll_metadata_write(ret_pl, TRUE);
 	VRFY((ret >= 0), "");
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 8ff0dc6..abe074a 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -272,7 +272,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
 	/* set Parallel access with communicator */
 	ret = H5Pset_fapl_mpio(ret_pl, comm, info);
 	VRFY((ret >= 0), "");
-        ret = H5Pset_coll_metadata_read(ret_pl, TRUE);
+        ret = H5Pset_all_coll_metadata_ops(ret_pl, TRUE);
 	VRFY((ret >= 0), "");
         ret = H5Pset_coll_metadata_write(ret_pl, TRUE);
 	VRFY((ret >= 0), "");