diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 20:03:12 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-26 20:03:12 (GMT) |
commit | 0728b38ddd4d0c31269f26f5b600f4e569670f6f (patch) | |
tree | dc6495de1a103f179a3cdae43ce6410468c1cee1 /src/H5Oainfo.c | |
parent | 0ea9a38644765aa4045b9110e86c5e50a5f24dac (diff) | |
download | hdf5-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/H5Oainfo.c')
-rw-r--r-- | src/H5Oainfo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index 8a146c4..fb68958 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -196,7 +196,7 @@ H5O_ainfo_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void /* The flags for the attribute indices */ flags = ainfo->track_corder ? H5O_AINFO_TRACK_CORDER : 0; - flags |= ainfo->index_corder ? H5O_AINFO_INDEX_CORDER : 0; + flags = (unsigned char)(flags | (ainfo->index_corder ? H5O_AINFO_INDEX_CORDER : 0)); *p++ = flags; /* Max. creation order value for the object */ @@ -284,12 +284,12 @@ H5O_ainfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg) FUNC_ENTER_NOAPI_NOINIT_NOERR /* Set return value */ - ret_value = 1 /* Version */ + ret_value = (size_t)(1 /* Version */ + 1 /* Index flags */ + (ainfo->track_corder ? 2 : 0) /* Curr. max. creation order value */ + H5F_SIZEOF_ADDR(f) /* Address of fractal heap to store "dense" attributes */ + H5F_SIZEOF_ADDR(f) /* Address of v2 B-tree for indexing names of attributes */ - + (ainfo->index_corder ? H5F_SIZEOF_ADDR(f) : 0); /* Address of v2 B-tree for indexing creation order values of attributes */ + + (ainfo->index_corder ? H5F_SIZEOF_ADDR(f) : 0)); /* Address of v2 B-tree for indexing creation order values of attributes */ FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_ainfo_size() */ |