mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[svn-r13021] Cleaned up some mismatched types that were causing errors on copper in
64-bit mode. Tested on copper.
This commit is contained in:
parent
a21800d2f2
commit
fa41ef4985
@ -374,8 +374,8 @@ H5F_read_superblock(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc, haddr_t addr,
|
||||
{
|
||||
unsigned index_flags[H5SM_MAX_NUM_INDEXES] = {0};
|
||||
unsigned minsizes[H5SM_MAX_NUM_INDEXES] = {0};
|
||||
size_t sohm_l2b; /* SOHM list-to-btree cutoff */
|
||||
size_t sohm_b2l; /* SOHM btree-to-list cutoff */
|
||||
unsigned sohm_l2b; /* SOHM list-to-btree cutoff */
|
||||
unsigned sohm_b2l; /* SOHM btree-to-list cutoff */
|
||||
|
||||
HDassert(shared->sohm_nindexes > 0 && shared->sohm_nindexes <= H5SM_MAX_NUM_INDEXES);
|
||||
|
||||
|
@ -1061,7 +1061,7 @@ done:
|
||||
*/
|
||||
herr_t
|
||||
H5SM_get_info(H5F_t *f, unsigned *index_flags, unsigned *minsizes,
|
||||
size_t *list_to_btree, size_t *btree_to_list, hid_t dxpl_id)
|
||||
unsigned *list_to_btree, unsigned *btree_to_list, hid_t dxpl_id)
|
||||
{
|
||||
H5SM_master_table_t *table = NULL;
|
||||
haddr_t table_addr;
|
||||
|
@ -47,7 +47,7 @@ H5_DLL htri_t H5SM_try_share(H5F_t *f, hid_t dxpl_id, unsigned type_id,
|
||||
void *mesg);
|
||||
H5_DLL herr_t H5SM_try_delete(H5F_t *f, hid_t dxpl_id, unsigned type_id, const H5O_shared_t *mesg);
|
||||
H5_DLL herr_t H5SM_get_info(H5F_t *f, unsigned *index_flags, unsigned *minsizes,
|
||||
size_t *list_to_btree, size_t *btree_to_list, hid_t dxpl_id);
|
||||
unsigned *list_to_btree, unsigned *btree_to_list, hid_t dxpl_id);
|
||||
H5_DLL haddr_t H5SM_get_fheap_addr(H5F_t *f, unsigned type_id, hid_t dxpl_id);
|
||||
|
||||
#endif /*_H5SMprivate_H*/
|
||||
|
Loading…
Reference in New Issue
Block a user