diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-05-02 06:17:28 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-05-02 06:17:28 (GMT) |
commit | 7d86677dd611adefa12e3229c6494230d4059845 (patch) | |
tree | de2d0e11140c75c7b247b3b2ac76881ec9cfaf95 /fortran | |
parent | 6306c72a0642bb4631e6358ad812f968e56c7a8f (diff) | |
download | hdf5-7d86677dd611adefa12e3229c6494230d4059845.zip hdf5-7d86677dd611adefa12e3229c6494230d4059845.tar.gz hdf5-7d86677dd611adefa12e3229c6494230d4059845.tar.bz2 |
[svn-r26994] Merge of r26986 from trunk.
Removes H5F_ACC_DEBUG and H5FD_DEBUG functionality.
The H5F_ACC_DEBUG symbol remains but has been defined to zero.
Fixes: HDFFV-1074
Tested on:
h5committest
32-bit Linux w/ C++ and Fortran and multi VFD
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/src/H5_f.c | 4 | ||||
-rw-r--r-- | fortran/src/H5f90global.f90 | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index a149109..95f6e21 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -421,12 +421,14 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, /* * H5F flags + * + * H5F_ACC_DEBUG has no effect as of HDF5 1.8.16. */ h5f_flags[0] = (int_f)H5F_ACC_RDWR; h5f_flags[1] = (int_f)H5F_ACC_RDONLY; h5f_flags[2] = (int_f)H5F_ACC_TRUNC; h5f_flags[3] = (int_f)H5F_ACC_EXCL; - h5f_flags[4] = (int_f)H5F_ACC_DEBUG; + h5f_flags[4] = (int_f)H5F_ACC_DEBUG; /* nonfunctional */ h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL; h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL; h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT; diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index ca50e20..c56190e 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -234,6 +234,8 @@ MODULE H5GLOBAL ! ! H5F flags (DO NOT FORGET TO UPDATE WHEN NEW FLAGS ARE ADDED !) ! + ! H5F_ACC_DEBUG_F has no effect as of HDF5 1.8.16 + ! ! H5F flags declaration ! INTEGER, PARAMETER :: H5F_FLAGS_LEN = 19 |