diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:56:57 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-08 17:56:57 (GMT) |
| commit | ab2ff6eda496173e038d97685f96dd2de9e3df29 (patch) | |
| tree | 14c6e9b0f608eacfb3a6e22ea73cc4effcf34968 /src/H5Pocpl.c | |
| parent | 416af901799f3ab85b1578696ece3c319877add1 (diff) | |
| download | hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.zip hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.gz hdf5-ab2ff6eda496173e038d97685f96dd2de9e3df29.tar.bz2 | |
[svn-r16280] Description:
Bring revision 16278 back from revise_chunks branch:
Update layout information in DCPL to unify all information in one
underlying property and switch to using H5O_layout_t for storing it, which
simplifies things considerably.
Also, fix many compiler warnings.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(Original patch tested on many machines)
Diffstat (limited to 'src/H5Pocpl.c')
| -rwxr-xr-x | src/H5Pocpl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index b947bef..a28eeb3 100755 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -275,11 +275,11 @@ H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags") /* Mask off previous attribute creation order flag settings */ - ohdr_flags &= ~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED); + ohdr_flags &= (uint8_t)~(H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED); /* Update with new attribute creation order flags */ - ohdr_flags |= (crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0; - ohdr_flags |= (crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0; + ohdr_flags |= (uint8_t)((crt_order_flags & H5P_CRT_ORDER_TRACKED) ? H5O_HDR_ATTR_CRT_ORDER_TRACKED : 0); + ohdr_flags |= (uint8_t)((crt_order_flags & H5P_CRT_ORDER_INDEXED) ? H5O_HDR_ATTR_CRT_ORDER_INDEXED : 0); /* Set object header flags */ if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0) @@ -382,10 +382,10 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags") /* Mask off previous time tracking flag settings */ - ohdr_flags &= ~H5O_HDR_STORE_TIMES; + ohdr_flags &= (uint8_t)~H5O_HDR_STORE_TIMES; /* Update with new time tracking flag */ - ohdr_flags |= track_times ? H5O_HDR_STORE_TIMES : 0; + ohdr_flags |= (uint8_t)(track_times ? H5O_HDR_STORE_TIMES : 0); /* Set object header flags */ if(H5P_set(plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0) @@ -430,7 +430,7 @@ H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object header flags") /* Set track times flag to return */ - *track_times = (ohdr_flags & H5O_HDR_STORE_TIMES) ? TRUE : FALSE; + *track_times = (hbool_t)((ohdr_flags & H5O_HDR_STORE_TIMES) ? TRUE : FALSE); } /* end if */ done: |