[svn-r7181] Purpose:

    Version update

Description:
    Removed 1.4 compatibility code in the library.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest

3 files changed, 0 insertions, 30 deletions

diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index 3c48a20..7167782 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -1124,11 +1124,7 @@ extend_writeInd(char *filename)
  */
 {
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
@@ -1530,11 +1526,7 @@ extend_writeAll(char *filename)
  */
 {
     int mdc_nelmts;
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    int rdcc_nelmts;
-#else /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nelmts;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     size_t rdcc_nbytes;
     double rdcc_w0;
 
diff --git a/testpar/t_ph5basic.c b/testpar/t_ph5basic.c
index 92c4e61..eb0048b 100644
--- a/testpar/t_ph5basic.c
+++ b/testpar/t_ph5basic.c
@@ -219,9 +219,7 @@ test_fapl_mpiposix_dup(void)
     int mpi_size_tmp, mpi_rank_tmp;
     int mrc;			/* MPI return value */
     hid_t acc_pl;		/* File access properties */
-#ifndef H5_WANT_H5_V1_4_COMPAT
     hbool_t use_gpfs = FALSE;
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     herr_t ret;			/* hdf5 return value */
 
     if (verbose)
@@ -246,11 +244,7 @@ test_fapl_mpiposix_dup(void)
     acc_pl = H5Pcreate (H5P_FILE_ACCESS);
     VRFY((acc_pl >= 0), "H5P_FILE_ACCESS");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pset_fapl_mpiposix(acc_pl, comm);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pset_fapl_mpiposix(acc_pl, comm, use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "");
 
     /* Case 1:
@@ -261,11 +255,7 @@ test_fapl_mpiposix_dup(void)
     mrc = MPI_Comm_free(&comm);
     VRFY((mrc==MPI_SUCCESS), "MPI_Comm_free");
 
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp, &use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix");
     MPI_Comm_size(comm_tmp,&mpi_size_tmp);
     MPI_Comm_rank(comm_tmp,&mpi_rank_tmp);
@@ -285,20 +275,12 @@ test_fapl_mpiposix_dup(void)
     VRFY((mrc==MPI_SUCCESS), "MPI_Comm_free");
 
     /* check NULL argument options. */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, NULL);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, NULL, NULL);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix neither");
 
     /* now get it again and check validity too. */
     /* Don't free the returned object which is used in the next case. */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-    ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp);
-#else /* H5_WANT_H5_V1_4_COMPAT */
     ret = H5Pget_fapl_mpiposix(acc_pl, &comm_tmp, &use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
     VRFY((ret >= 0), "H5Pget_fapl_mpiposix");
     MPI_Comm_size(comm_tmp,&mpi_size_tmp);
     MPI_Comm_rank(comm_tmp,&mpi_rank_tmp);
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 7ab3984..6a4a0b2 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -317,11 +317,7 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type,
 
     if (l_facc_type == FACC_MPIPOSIX) {
 	/* set Parallel access with communicator */
-#ifdef H5_WANT_H5_V1_4_COMPAT
-	ret = H5Pset_fapl_mpiposix(ret_pl, comm);
-#else /* H5_WANT_H5_V1_4_COMPAT */
 	ret = H5Pset_fapl_mpiposix(ret_pl, comm, use_gpfs);
-#endif /* H5_WANT_H5_V1_4_COMPAT */
 	VRFY((ret >= 0), "H5Pset_fapl_mpiposix succeeded");
 	return(ret_pl);
     }