diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-10-10 15:25:09 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-10-10 15:25:09 (GMT) |
| commit | de07b2d22435741fa7dc68faa80df3c0207c89fa (patch) | |
| tree | 2588b60a071c816acad615163c646e80a5012032 /fortran/src/H5_f.c | |
| parent | c7fc321a6d4448c59cb621c46968a5245b080fa1 (diff) | |
| download | hdf5-de07b2d22435741fa7dc68faa80df3c0207c89fa.zip hdf5-de07b2d22435741fa7dc68faa80df3c0207c89fa.tar.gz hdf5-de07b2d22435741fa7dc68faa80df3c0207c89fa.tar.bz2 | |
Fix:HDFFV-9987
With HDF5-1.10 you cannot specify default dataspace for Fortran (H5S_ALL_F)
Resolution:
Made H5S_ALL_F INTEGER(HID_T) to match C.
Diffstat (limited to 'fortran/src/H5_f.c')
| -rw-r--r-- | fortran/src/H5_f.c | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index f9fe927..860f9cb 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -334,6 +334,7 @@ h5close_types_c( hid_t_f * types, int_f *lentypes, * h5p_flags_int - H5P interface flags of type integer * h5r_flags - H5R interface flags * h5s_flags - H5S interface flags + * h5s_hid_flags - H5S interface flags of type hid_t * h5s_hsize_flags - H5S interface flags of type hsize_t * h5t_flags - H5T interface flags * h5z_flags - H5Z interface flags @@ -356,6 +357,8 @@ h5close_types_c( hid_t_f * types, int_f *lentypes, * MSB, July 9, 2009 * Added type h5d_flags of type size_t * MSB, Feb. 28, 2014 + * Added type h5s_hid_flags of type hid_t + * MSB, Oct. 10, 2016 * SOURCE */ int_f @@ -363,8 +366,9 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid_t_f *h5e_hid_flags, int_f *h5f_flags, int_f *h5fd_flags, hid_t_f *h5fd_hid_flags, int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags, - hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags, - hsize_t_f *h5s_hsize_flags, int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags, + hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, + int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, + int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags, haddr_t_f *h5_haddr_generic_flags) /******/ { @@ -593,29 +597,32 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, /* * H5S flags */ + + h5s_hid_flags[0] = (hid_t_f)H5S_ALL; + + h5s_hsize_flags[0] = (hsize_t_f)H5S_UNLIMITED; + h5s_flags[0] = (int_f)H5S_SCALAR; h5s_flags[1] = (int_f)H5S_SIMPLE; h5s_flags[2] = (int_f)H5S_NULL; h5s_flags[3] = (int_f)H5S_SELECT_SET; h5s_flags[4] = (int_f)H5S_SELECT_OR; - h5s_flags[5] = (int_f)H5S_ALL; - - h5s_flags[6] = (int_f)H5S_SELECT_NOOP; - h5s_flags[7] = (int_f)H5S_SELECT_AND; - h5s_flags[8] = (int_f)H5S_SELECT_XOR; - h5s_flags[9] = (int_f)H5S_SELECT_NOTB; - h5s_flags[10] = (int_f)H5S_SELECT_NOTA; - h5s_flags[11] = (int_f)H5S_SELECT_APPEND; - h5s_flags[12] = (int_f)H5S_SELECT_PREPEND; - h5s_flags[13] = (int_f)H5S_SELECT_INVALID; - - h5s_flags[14] = (int_f)H5S_SEL_ERROR; - h5s_flags[15] = (int_f)H5S_SEL_NONE; - h5s_flags[16] = (int_f)H5S_SEL_POINTS; - h5s_flags[17] = (int_f)H5S_SEL_HYPERSLABS; - h5s_flags[18] = (int_f)H5S_SEL_ALL; - h5s_hsize_flags[0] = (hsize_t_f)H5S_UNLIMITED; + h5s_flags[5] = (int_f)H5S_SELECT_NOOP; + h5s_flags[6] = (int_f)H5S_SELECT_AND; + h5s_flags[7] = (int_f)H5S_SELECT_XOR; + h5s_flags[8] = (int_f)H5S_SELECT_NOTB; + h5s_flags[9] = (int_f)H5S_SELECT_NOTA; + + h5s_flags[10] = (int_f)H5S_SELECT_APPEND; + h5s_flags[11] = (int_f)H5S_SELECT_PREPEND; + h5s_flags[12] = (int_f)H5S_SELECT_INVALID; + h5s_flags[13] = (int_f)H5S_SEL_ERROR; + h5s_flags[14] = (int_f)H5S_SEL_NONE; + + h5s_flags[15] = (int_f)H5S_SEL_POINTS; + h5s_flags[16] = (int_f)H5S_SEL_HYPERSLABS; + h5s_flags[17] = (int_f)H5S_SEL_ALL; /* * H5T flags |