From db3632444bbbba2fdbe60516c89fb83ee4892c23 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 6 Nov 2006 21:48:39 -0500 Subject: [svn-r12871] Description: Clean up a couple of warnings... Tested on: Linux/64 2.6 (chicago2) --- src/H5Gname.c | 4 ++++ tools/h5ls/h5ls.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/H5Gname.c b/src/H5Gname.c index d26c74b..944456a 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -1065,7 +1065,11 @@ H5G_refname_iterator(hid_t group, const char *name, void *_udata) /* Get information for object in group */ if(H5G_get_objinfo(&loc, name, 0, &sb, udata->dxpl_id) < 0) HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object") +#if H5_SIZEOF_UINT64_T > H5_SIZEOF_LONG objno = (haddr_t)sb.objno[0] | ((haddr_t)sb.objno[1] << (8 * sizeof(long))); +#else + objno = (haddr_t)sb.objno[0]; +#endif /* Check for finding the object */ /* (checks against the file in the location as well, to make certain that diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index e5117dc..46d4bf3 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -161,7 +161,11 @@ sym_insert(H5G_stat_t *sb, const char *name) /* Insert the entry */ n = idtab_g.nobjs++; +#if H5_SIZEOF_UINT64_T > H5_SIZEOF_LONG objno = (haddr_t)sb->objno[0] | ((haddr_t)sb->objno[1] << (8 * sizeof(long))); +#else + objno = (haddr_t)sb->objno[0]; +#endif idtab_g.obj[n].id = objno; idtab_g.obj[n].name = HDstrdup(name); } -- cgit v0.12