summaryrefslogtreecommitdiffstats
path: root/src/H5Ocont.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-07-26 20:03:12 (GMT)
commit0728b38ddd4d0c31269f26f5b600f4e569670f6f (patch)
treedc6495de1a103f179a3cdae43ce6410468c1cee1 /src/H5Ocont.c
parent0ea9a38644765aa4045b9110e86c5e50a5f24dac (diff)
downloadhdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.zip
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.gz
hdf5-0728b38ddd4d0c31269f26f5b600f4e569670f6f.tar.bz2
[svn-r22609] Description:
Bring r22608 from trunk to 1.8 branch: Switch propert list/class iteration from internal to external form of iteration, cleaning up and simplifying the code a bit. Bring other general improvements from plist_encode_decode branch back to trunk. Clean up many warnings. Tested on: Mac OSX/64 10.7.4 (amazon) w/gcc 4.7, debug and C++ & FORTRAN (too minor to require h5committest)
Diffstat (limited to 'src/H5Ocont.c')
-rw-r--r--src/H5Ocont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index b609bfd..647532b 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -179,8 +179,8 @@ H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
- ret_value = H5F_SIZEOF_ADDR(f) + /* Continuation header address */
- H5F_SIZEOF_SIZE(f); /* Continuation header length */
+ ret_value = (size_t)(H5F_SIZEOF_ADDR(f) + /* Continuation header address */
+ H5F_SIZEOF_SIZE(f)); /* Continuation header length */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O_cont_size() */