mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
Found pre-existing call to H5Pset_libver_bounds, modified it so that the generated files would be created without the 1.10 specific things.
This commit is contained in:
parent
fc49992012
commit
493a6e5d62
@ -631,7 +631,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
ENDIF(NOT MSVC)
|
||||
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5free_memory "" HDF5_HAS_H5FREE)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pset_libver_bounds " HDF5_HAS_LIBVER_BOUNDS)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pset_libver_bounds "" HDF5_HAS_LIBVER_BOUNDS)
|
||||
|
||||
IF(HDF5_PARALLEL)
|
||||
SET(HDF5_CC h5pcc)
|
||||
|
@ -19,7 +19,7 @@ COPYRIGHT file for copying and redistribution conditions.
|
||||
|
||||
/* must be after nc4internal.h */
|
||||
#include <H5DSpublic.h>
|
||||
|
||||
#include <H5Fpublic.h>
|
||||
#ifdef USE_HDF4
|
||||
#include <mfhdf.h>
|
||||
#endif
|
||||
@ -386,8 +386,10 @@ nc4_create_file(const char *path, int cmode, MPI_Comm comm, MPI_Info info,
|
||||
__func__, nc4_chunk_cache_size, nc4_chunk_cache_nelems, nc4_chunk_cache_preemption));
|
||||
#endif /* USE_PARALLEL4 */
|
||||
|
||||
if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
|
||||
#ifdef HDF5_HAS_LIBVER_BOUNDS
|
||||
if (H5Pset_libver_bounds(fapl_id, H5F_LIBVER_EARLIEST, H5F_LIBVER_LATEST) < 0)
|
||||
BAIL(NC_EHDFERR);
|
||||
#endif
|
||||
|
||||
/* Create the property list. */
|
||||
if ((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0)
|
||||
@ -668,7 +670,7 @@ read_coord_dimids(NC_GRP_INFO_T *grp, NC_VAR_INFO_T *var)
|
||||
hssize_t npoints;
|
||||
int ret = 0;
|
||||
int d;
|
||||
|
||||
|
||||
/* There is a hidden attribute telling us the ids of the
|
||||
* dimensions that apply to this multi-dimensional coordinate
|
||||
* variable. Read it. */
|
||||
@ -2215,6 +2217,7 @@ nc4_open_file(const char *path, int mode, void* parameters, NC *nc)
|
||||
* fail if there are any open objects in the file. */
|
||||
if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
|
||||
BAIL(NC_EHDFERR);
|
||||
|
||||
#ifdef EXTRA_TESTS
|
||||
num_plists++;
|
||||
#endif
|
||||
@ -2226,6 +2229,7 @@ nc4_open_file(const char *path, int mode, void* parameters, NC *nc)
|
||||
BAIL(NC_EHDFERR);
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef USE_PARALLEL4
|
||||
/* If this is a parallel file create, set up the file creation
|
||||
property list. */
|
||||
@ -3286,7 +3290,7 @@ NC4_set_content(int ncid, size_t size, void* memory)
|
||||
BAIL(NC_EHDFERR);
|
||||
#else
|
||||
retval = NC_EDISKLESS;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
done:
|
||||
return retval;
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user