diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
| commit | 4e23c807585ed705173f32e374884a46e4a4f2dd (patch) | |
| tree | df458773252f84a19720b4d8b3588db955f4b6d1 /perform | |
| parent | 2d5f8835fd9851c65d8e33a9c4bbe5da64d5427e (diff) | |
| download | hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.zip hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.gz hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.bz2 | |
[svn-r7181] Purpose:
Version update
Description:
Removed 1.4 compatibility code in the library.
Platforms tested:
FreeBSD 4.8 (sleipnir)
h5committest
Diffstat (limited to 'perform')
| -rw-r--r-- | perform/chunk.c | 12 | ||||
| -rw-r--r-- | perform/pio_engine.c | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/perform/chunk.c b/perform/chunk.c index 0348e6d..3c159ca 100644 --- a/perform/chunk.c +++ b/perform/chunk.c @@ -152,11 +152,7 @@ create_dataset (void) dcpl = H5Pcreate (H5P_DATASET_CREATE); size[0] = size[1] = CH_SIZE; H5Pset_chunk (dcpl, 2, size); -#ifdef H5_WANT_H5_V1_4_COMPAT - H5Zregister (FILTER_COUNTER, "counter", counter); -#else /* H5_WANT_H5_V1_4_COMPAT */ H5Zregister (H5Z_COUNTER); -#endif /* H5_WANT_H5_V1_4_COMPAT */ H5Pset_filter (dcpl, FILTER_COUNTER, 0, 0, NULL); /* The dataset */ @@ -198,12 +194,8 @@ test_rowmaj (int op, size_t cache_size, size_t io_size) signed char *buf = calloc (1, (size_t)(SQUARE(io_size))); hsize_t i, j, hs_size[2]; hssize_t hs_offset[2]; -#ifdef H5_WANT_H5_V1_4_COMPAT - int mdc_nelmts, rdcc_nelmts; -#else /* H5_WANT_H5_V1_4_COMPAT */ int mdc_nelmts; size_t rdcc_nelmts; -#endif /* H5_WANT_H5_V1_4_COMPAT */ double w0; H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0); @@ -279,12 +271,8 @@ test_diag (int op, size_t cache_size, size_t io_size, size_t offset) hsize_t nio = 0; hssize_t hs_offset[2]; signed char *buf = calloc (1, (size_t)(SQUARE (io_size))); -#ifdef H5_WANT_H5_V1_4_COMPAT - int mdc_nelmts, rdcc_nelmts; -#else /* H5_WANT_H5_V1_4_COMPAT */ int mdc_nelmts; size_t rdcc_nelmts; -#endif /* H5_WANT_H5_V1_4_COMPAT */ double w0; H5Pget_cache (fapl_g, &mdc_nelmts, &rdcc_nelmts, NULL, &w0); diff --git a/perform/pio_engine.c b/perform/pio_engine.c index 74e5f02..b4dd5b8 100644 --- a/perform/pio_engine.c +++ b/perform/pio_engine.c @@ -1516,11 +1516,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) /* Use the appropriate VFL driver */ if(param->h5_use_mpi_posix) { /* Set the file driver to the MPI-posix driver */ -#ifdef H5_WANT_H5_V1_4_COMPAT - hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g); -#else /* H5_WANT_H5_V1_4_COMPAT */ hrc = H5Pset_fapl_mpiposix(acc_tpl, pio_comm_g, use_gpfs); -#endif /* H5_WANT_H5_V1_4_COMPAT */ if (hrc < 0) { fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); |