diff options
Diffstat (limited to 'src/H5RA.c')
| -rw-r--r-- | src/H5RA.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -86,12 +86,12 @@ H5RA_init_interface(void) /* The meta dataset type */ if (NULL==(type=H5T_create(H5T_COMPOUND, sizeof(H5RA_meta_t))) || - H5T_insert(type, "nelmts", HOFFSET(H5RA_meta_t, nelmts), - 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))<0 || - H5T_insert(type, "offset", HOFFSET(H5RA_meta_t, offset), - 0, NULL, NULL, H5I_object(H5T_NATIVE_HSSIZE_g))<0 || - H5T_insert(type, "nover", HOFFSET(H5RA_meta_t, nover), - 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))) { + H5T_struct_insert(type, "nelmts", HOFFSET(H5RA_meta_t, nelmts), + 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))<0 || + H5T_struct_insert(type, "offset", HOFFSET(H5RA_meta_t, offset), + 0, NULL, NULL, H5I_object(H5T_NATIVE_HSSIZE_g))<0 || + H5T_struct_insert(type, "nover", HOFFSET(H5RA_meta_t, nover), + 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))) { HRETURN_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL, "unable to define ragged array meta type"); } @@ -1154,7 +1154,7 @@ H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type, /* Copy the part of the row from the raw dataset */ HDmemcpy(buf_out[i], raw_buf+i*raw_read_size[1]*type_size, - MIN(size[i], raw_read_size[1])*type_size); + (size_t)(MIN(size[i], raw_read_size[1])*type_size)); /* Copy the part of the row from the overflow dataset */ if (size[i]>raw_read_size[1]) { |