diff options
| -rw-r--r-- | fortran/src/H5Git.c | 4 | ||||
| -rw-r--r-- | fortran/src/H5_f.c | 2 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 2 | ||||
| -rw-r--r-- | fortran/test/tH5T.f90 | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/fortran/src/H5Git.c b/fortran/src/H5Git.c index 2998753..b4e41fc 100644 --- a/fortran/src/H5Git.c +++ b/fortran/src/H5Git.c @@ -9,8 +9,8 @@ #include "H5Git.h" #define FALSE 0 -herr_t count_elems(hid_t loc_id, const char *name, void *opdata); -herr_t obj_info(hid_t loc_id, const char *name, void *opdata); +static herr_t count_elems(hid_t loc_id, const char *name, void *opdata); +static herr_t obj_info(hid_t loc_id, const char *name, void *opdata); typedef struct retval { char * name; diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 83eb113..08c3a9e 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -268,7 +268,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5e_flags, int_f *h5f_flags, h5s_flags[1] = H5S_SIMPLE; h5s_flags[2] = H5S_SELECT_SET; h5s_flags[3] = H5S_SELECT_OR; - h5s_flags[4] = H5S_UNLIMITED; + h5s_flags[4] = (int_f)H5S_UNLIMITED; h5s_flags[5] = H5S_ALL; /* diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 492eec7..253c819 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -3,7 +3,7 @@ #include "H5Git.h" __DLL__ int HD5c2fstr(char *str, int len); -__DLL__ char * HD5fcstring (_fcd fdesc, int len); +__DLL__ char * HD5f2cstring (_fcd fdesc, int len); __DLL__ int HDpackFstring(char *src, char *dest, int len); /* diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90 index 1182429..0f9a39c 100644 --- a/fortran/test/tH5T.f90 +++ b/fortran/test/tH5T.f90 @@ -66,6 +66,7 @@ INTEGER :: len ! Lenght of the name of the compound datatype member LOGICAL :: flag INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/) + INTEGER :: array_dims_range = 3 INTEGER :: elements = 24 ! number of elements in the array_dims array. INTEGER(SIZE_T) :: sizechar INTEGER, DIMENSION(7) :: data_dims @@ -243,7 +244,7 @@ CALL h5tinsert_f(dtarray_id, "char_field", offset, H5T_NATIVE_CHARACTER, error) CALL check("h5tinsert_f", error, total_error) offset = type_sizec - CALL h5tarray_create_f(H5T_NATIVE_REAL, size(array_dims), array_dims, arrayt_id, error) + CALL h5tarray_create_f(H5T_NATIVE_REAL, array_dims_range, array_dims, arrayt_id, error) CALL check("h5tarray_create_f", error, total_error) CALL h5tinsert_f(dtarray_id,"array_field", offset, arrayt_id, error) CALL check("h5tinsert_f", error, total_error) |