diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-06-03 13:52:32 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-06-03 13:52:32 (GMT) |
| commit | cb461d0ece516c114670a932c016c7142a9c4f79 (patch) | |
| tree | 3fb9e8e2d65309a3e951a0cdabe2ab472e625eb6 /fortran/src/H5_f.c | |
| parent | c8243334b02ecc77ad7a0a36e587a21a86f51c55 (diff) | |
| download | hdf5-cb461d0ece516c114670a932c016c7142a9c4f79.zip hdf5-cb461d0ece516c114670a932c016c7142a9c4f79.tar.gz hdf5-cb461d0ece516c114670a932c016c7142a9c4f79.tar.bz2 | |
[svn-r25237] Merged changes from the trunk to the branch,
svn merge -r25009:25235 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested: jam (gnu, intel, pgi)
Diffstat (limited to 'fortran/src/H5_f.c')
| -rw-r--r-- | fortran/src/H5_f.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index dcfcfc4..05e525d 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -460,13 +460,13 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, /* * H5FD flags of type hid_t */ - h5fd_hid_flags[0] = (int_f)H5FD_CORE; - h5fd_hid_flags[1] = (int_f)H5FD_FAMILY; - h5fd_hid_flags[2] = (int_f)H5FD_LOG; - h5fd_hid_flags[3] = (int_f)H5FD_MPIO; - h5fd_hid_flags[4] = (int_f)H5FD_MULTI; - h5fd_hid_flags[5] = (int_f)H5FD_SEC2; - h5fd_hid_flags[6] = (int_f)H5FD_STDIO; + h5fd_hid_flags[0] = (hid_t_f)H5FD_CORE; + h5fd_hid_flags[1] = (hid_t_f)H5FD_FAMILY; + h5fd_hid_flags[2] = (hid_t_f)H5FD_LOG; + h5fd_hid_flags[3] = (hid_t_f)H5FD_MPIO; + h5fd_hid_flags[4] = (hid_t_f)H5FD_MULTI; + h5fd_hid_flags[5] = (hid_t_f)H5FD_SEC2; + h5fd_hid_flags[6] = (hid_t_f)H5FD_STDIO; /* * H5G flags |