diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-10 16:25:07 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-12-10 16:25:07 (GMT) |
| commit | d19927898d6aed66d3f46ca5e72bba2469372820 (patch) | |
| tree | 0feb98c987a5e5616d6a5cb76effe2122f0c8de3 | |
| parent | 7aee827e453f31d5fbfb2eb7133062a10cc45b90 (diff) | |
| download | hdf5-d19927898d6aed66d3f46ca5e72bba2469372820.zip hdf5-d19927898d6aed66d3f46ca5e72bba2469372820.tar.gz hdf5-d19927898d6aed66d3f46ca5e72bba2469372820.tar.bz2 | |
[svn-r7921] Purpose:
Bug fix
Description:
Fix a couple of 1.4 compat bogons that crept in.
Platforms tested:
FreeBSD 4.9 (sleipnir)
config not tested with h5committest
| -rw-r--r-- | perform/perf_meta.c | 4 | ||||
| -rw-r--r-- | test/titerate.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/perform/perf_meta.c b/perform/perf_meta.c index f50b07d..9609b62 100644 --- a/perform/perf_meta.c +++ b/perform/perf_meta.c @@ -807,7 +807,11 @@ main(int argc, char **argv) if(facc_type == FACC_DEFAULT || facc_type == FACC_MPIO) H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL); else if(facc_type == FACC_MPIPOSIX) +#ifdef H5_WANT_H5_V1_4_COMPAT + H5Pset_fapl_mpiposix(fapl, MPI_COMM_WORLD); +#else /* H5_WANT_H5_V1_4_COMPAT */ H5Pset_fapl_mpiposix(fapl, MPI_COMM_WORLD, FALSE); +#endif /* H5_WANT_H5_V1_4_COMPAT */ #endif /*H5_HAVE_PARALLEL*/ } diff --git a/test/titerate.c b/test/titerate.c index 645bea3..5a6275e 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -223,7 +223,11 @@ static void test_iter_group(void) VERIFY(num_membs,NDATASETS+2,"H5Gget_num_objs"); for(i=0; i< (int)num_membs; i++) { +#ifdef H5_WANT_H5_V1_4_COMPAT + int obj_type; /* Type of object in file */ +#else /*H5_WANT_H5_V1_4_COMPAT*/ H5G_obj_t obj_type; /* Type of object in file */ +#endif /*H5_WANT_H5_V1_4_COMPAT*/ ret = H5Gget_objname_by_idx(file, (hsize_t)i, dataset_name, NAMELEN); CHECK(ret, FAIL, "H5Gget_objname_by_idx"); |