From fa41ef4985e0870352f1d8cfb037ad6f03ccd591 Mon Sep 17 00:00:00 2001 From: James Laird Date: Mon, 4 Dec 2006 12:56:10 -0500 Subject: [svn-r13021] Cleaned up some mismatched types that were causing errors on copper in 64-bit mode. Tested on copper. --- src/H5Fsuper.c | 4 ++-- src/H5SM.c | 2 +- src/H5SMprivate.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index f1d2797..08eab0e 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -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); diff --git a/src/H5SM.c b/src/H5SM.c index e84490b..409c94b 100755 --- a/src/H5SM.c +++ b/src/H5SM.c @@ -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; diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h index 4430822..1c90e80 100755 --- a/src/H5SMprivate.h +++ b/src/H5SMprivate.h @@ -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*/ -- cgit v0.12