summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-04-22 20:04:44 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-04-22 20:04:44 (GMT)
commit683d60460a94869225094b4efc824258c5b0dcd3 (patch)
tree92f6400d0c7f80046231ad46048227cdf4940a34 /src/H5Fsuper.c
parentcacfe71beb159fc44df256f641d4faac594c802e (diff)
downloadhdf5-683d60460a94869225094b4efc824258c5b0dcd3.zip
hdf5-683d60460a94869225094b4efc824258c5b0dcd3.tar.gz
hdf5-683d60460a94869225094b4efc824258c5b0dcd3.tar.bz2
[svn-r18617] Description:
Bring r18616 from trunk to 1.8 branch: Clean up compiler warnings. Tested on: Mac OS X/32 10.6.3 (amazon) w/debug (too minor to require h5committest)
Diffstat (limited to 'src/H5Fsuper.c')
-rw-r--r--src/H5Fsuper.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index bb5ef3e..01f451a 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -32,6 +32,7 @@
#include "H5Fpkg.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5Iprivate.h" /* IDs */
+#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#include "H5SMprivate.h" /* Shared Object Header Messages */
@@ -452,7 +453,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
sblock->super_vers = super_vers;
/* Compute the size of the superblock */
- superblock_size = H5F_SUPERBLOCK_SIZE(super_vers, f);
+ superblock_size = (size_t)H5F_SUPERBLOCK_SIZE(super_vers, f);
/* Compute the size of the driver information block */
H5_ASSIGN_OVERFLOW(driver_size, H5FD_sb_size(f->shared->lf), hsize_t, size_t);
@@ -698,7 +699,7 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
/* Set the superblock size */
if(super_size)
- *super_size = H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
+ *super_size = (size_t)H5F_SUPERBLOCK_SIZE(f->shared->sblock->super_vers, f);
/* Set the superblock extension size */
if(super_ext_size) {
17571: remove broken links in datetime.py docstring.Ezio Melotti2013-04-131-15/+3 * | Issue #17516: use comment syntax for comments, instead of multiline stringVictor Stinner2013-03-261-195/+195 |/ * Closes #15973: fix a segmentation fault when comparing timezone objects.Georg Brandl2012-09-221-0/+2 * Issue #9527: tm_gmtoff has 'correct' sign.Alexander Belopolsky2012-06-221-3/+3 * Issue #9527: datetime.astimezone() method will now supply a classAlexander Belopolsky2012-06-221-2/+2 * Issue #9527: datetime.astimezone() method will now supply a classAlexander Belopolsky2012-06-221-2/+26 * Issue #15006: Allow equality comparison between naive and aware timeAlexander Belopolsky2012-06-161-8/+14 * Removed redundant codeAlexander Belopolsky2012-06-151-4/+2 * Issue #2736: Added datetime.timestamp() method.Alexander Belopolsky2012-06-081-1/+10 * Close #14180: Factorize code to convert a number of seconds to time_t, timeva...Victor Stinner2012-03-131-2/+2 * Merge with 3.2.Ezio Melotti2011-10-191-1/+1 |\ | * Remove duplication.Ezio Melotti2011-10-191-1/+1 * | Issue #11930: Remove year >= 1000 limitation from datetime.strftime.Alexander Belopolsky2011-05-02