diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-10-03 00:53:21 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-10-03 00:53:21 (GMT) |
| commit | 3e59374ccd0c7cbb671dc72c34ec1a6a9123bc5b (patch) | |
| tree | 41023f4827cb254156451092cd4e43ab16fd85f4 /fortran/src | |
| parent | 7648354b80e5e914f99cb6dece5d38d354c5c736 (diff) | |
| download | hdf5-3e59374ccd0c7cbb671dc72c34ec1a6a9123bc5b.zip hdf5-3e59374ccd0c7cbb671dc72c34ec1a6a9123bc5b.tar.gz hdf5-3e59374ccd0c7cbb671dc72c34ec1a6a9123bc5b.tar.bz2 | |
[svn-r22854] Fixed issues with default 8-byte real and default 8-byte integers and the new H5O routines.
Tested: jam (gcc,intel)
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/H5Of.c | 1 | ||||
| -rw-r--r-- | fortran/src/H5Off.f90 | 2 | ||||
| -rw-r--r-- | fortran/src/H5Off_F03.f90 | 4 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c index 59f9a3d..8e75989 100644 --- a/fortran/src/H5Of.c +++ b/fortran/src/H5Of.c @@ -32,7 +32,6 @@ fill_h5o_info_t_f(H5O_info_t Oinfo, H5O_info_t_f *object_info) { object_info->fileno = Oinfo.fileno; object_info->addr = (haddr_t_f)Oinfo.addr; - object_info->type = (int_f)Oinfo.type; object_info->rc = (int_f)Oinfo.rc; diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90 index 2d8509f..ce8c55c 100644 --- a/fortran/src/H5Off.f90 +++ b/fortran/src/H5Off.f90 @@ -647,7 +647,7 @@ CONTAINS INTEGER , INTENT(IN) :: index_type INTEGER , INTENT(IN) :: order INTEGER(HSIZE_T), INTENT(IN) :: n - INTEGER(HID_T) , INTENT(IN) :: obj_id + INTEGER(HID_T) , INTENT(OUT) :: obj_id INTEGER(HID_T) , INTENT(IN) :: lapl_id_default END FUNCTION h5oopen_by_idx_c diff --git a/fortran/src/H5Off_F03.f90 b/fortran/src/H5Off_F03.f90 index dbd674a..f4ddd3e 100644 --- a/fortran/src/H5Off_F03.f90 +++ b/fortran/src/H5Off_F03.f90 @@ -82,9 +82,9 @@ MODULE H5O_PROVISIONAL ENDTYPE meta_size_t TYPE, BIND(C) :: h5o_info_t - INTEGER(c_long) :: fileno ! File number that object is located in + INTEGER(C_LONG) :: fileno ! File number that object is located in INTEGER(haddr_t) :: addr ! Object address in file - INTEGER :: type ! Basic object type (group, dataset, etc.) + INTEGER(C_INT) :: type ! Basic object type (group, dataset, etc.) INTEGER :: rc ! Reference count of object INTEGER, DIMENSION(8) :: atime ! Access time ! -- NOTE -- diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index b1e650a..9340c2a 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -61,7 +61,7 @@ typedef struct H5O_hdr_info_t_f { typedef struct H5O_info_t_f { unsigned long fileno; /* File number that object is located in */ haddr_t_f addr; /* Object address in file */ - int_f type; /* Basic object type (group, dataset, etc.) */ + int type; /* Basic object type (group, dataset, etc.) */ int_f rc; /* Reference count of object */ int_f atime[8]; /* Access time */ int_f mtime[8]; /* Modification time */ |