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/H5f90global.F90 | |
| 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/H5f90global.F90')
| -rw-r--r-- | fortran/src/H5f90global.F90 | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 index b84f6c2..a85ee50 100644 --- a/fortran/src/H5f90global.F90 +++ b/fortran/src/H5f90global.F90 @@ -747,25 +747,29 @@ MODULE H5GLOBAL ! ! H5S flags declaration ! - INTEGER, PARAMETER :: H5S_FLAGS_LEN = 19 + INTEGER, PARAMETER :: H5S_FLAGS_LEN = 18 INTEGER :: H5S_flags(H5S_FLAGS_LEN) INTEGER, PARAMETER :: H5S_HSIZE_FLAGS_LEN = 1 INTEGER(HSIZE_T) H5S_hsize_flags(H5S_HSIZE_FLAGS_LEN) + INTEGER, PARAMETER :: H5S_HID_FLAGS_LEN = 1 + INTEGER(HSIZE_T) H5S_hid_flags(H5S_HID_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/ + !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HID_FLAGS/ !DEC$ATTRIBUTES DLLEXPORT :: /H5S_HSIZE_FLAGS/ !DEC$endif COMMON /H5S_FLAGS/ H5S_flags + COMMON /H5S_HID_FLAGS/ H5S_hid_flags COMMON /H5S_HSIZE_FLAGS/ H5S_hsize_flags INTEGER(HSIZE_T) :: H5S_UNLIMITED_F + INTEGER(HID_T) :: H5S_ALL_F + INTEGER :: H5S_SCALAR_F INTEGER :: H5S_SIMPLE_F INTEGER :: H5S_NULL_F - INTEGER :: H5S_ALL_F - INTEGER :: H5S_SELECT_NOOP_F INTEGER :: H5S_SELECT_SET_F INTEGER :: H5S_SELECT_OR_F @@ -783,29 +787,31 @@ MODULE H5GLOBAL INTEGER :: H5S_SEL_HYPERSLABS_F INTEGER :: H5S_SEL_ALL_F + EQUIVALENCE(H5S_hid_flags(1), H5S_ALL_F) + EQUIVALENCE(H5S_hsize_flags(1), H5S_UNLIMITED_F) + EQUIVALENCE(H5S_flags(1), H5S_SCALAR_F) EQUIVALENCE(H5S_flags(2), H5S_SIMPLE_F) EQUIVALENCE(H5S_flags(3), H5S_NULL_F) EQUIVALENCE(H5S_flags(4), H5S_SELECT_SET_F) EQUIVALENCE(H5S_flags(5), H5S_SELECT_OR_F) - EQUIVALENCE(H5S_flags(6), H5S_ALL_F) - - EQUIVALENCE(H5S_flags(7), H5S_SELECT_NOOP_F) - EQUIVALENCE(H5S_flags(8), H5S_SELECT_AND_F) - EQUIVALENCE(H5S_flags(9), H5S_SELECT_XOR_F) - EQUIVALENCE(H5S_flags(10), H5S_SELECT_NOTB_F) - EQUIVALENCE(H5S_flags(11), H5S_SELECT_NOTA_F) - EQUIVALENCE(H5S_flags(12), H5S_SELECT_APPEND_F) - EQUIVALENCE(H5S_flags(13), H5S_SELECT_PREPEND_F) - EQUIVALENCE(H5S_flags(14), H5S_SELECT_INVALID_F) - - - EQUIVALENCE(H5S_flags(15), H5S_SEL_ERROR_F) - EQUIVALENCE(H5S_flags(16), H5S_SEL_NONE_F) - EQUIVALENCE(H5S_flags(17), H5S_SEL_POINTS_F) - EQUIVALENCE(H5S_flags(18), H5S_SEL_HYPERSLABS_F) - EQUIVALENCE(H5S_flags(19), H5S_SEL_ALL_F) + + EQUIVALENCE(H5S_flags(6), H5S_SELECT_NOOP_F) + EQUIVALENCE(H5S_flags(7), H5S_SELECT_AND_F) + EQUIVALENCE(H5S_flags(8), H5S_SELECT_XOR_F) + EQUIVALENCE(H5S_flags(9), H5S_SELECT_NOTB_F) + EQUIVALENCE(H5S_flags(10), H5S_SELECT_NOTA_F) + + EQUIVALENCE(H5S_flags(11), H5S_SELECT_APPEND_F) + EQUIVALENCE(H5S_flags(12), H5S_SELECT_PREPEND_F) + EQUIVALENCE(H5S_flags(13), H5S_SELECT_INVALID_F) + EQUIVALENCE(H5S_flags(14), H5S_SEL_ERROR_F) + EQUIVALENCE(H5S_flags(15), H5S_SEL_NONE_F) + + EQUIVALENCE(H5S_flags(16), H5S_SEL_POINTS_F) + EQUIVALENCE(H5S_flags(17), H5S_SEL_HYPERSLABS_F) + EQUIVALENCE(H5S_flags(18), H5S_SEL_ALL_F) ! ! H5T flags declaration |