diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-12-24 03:38:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-12-24 03:38:00 (GMT) |
| commit | 8a2c76ed6904f1b9a20560dc6d4835f17133f053 (patch) | |
| tree | 3ceacf7f0e3823647dd9fdd85ba416f29c028a5f | |
| parent | 02a90afcdcd9b6a41455a198799bc8033bf56485 (diff) | |
| download | hdf5-8a2c76ed6904f1b9a20560dc6d4835f17133f053.zip hdf5-8a2c76ed6904f1b9a20560dc6d4835f17133f053.tar.gz hdf5-8a2c76ed6904f1b9a20560dc6d4835f17133f053.tar.bz2 | |
[svn-r14359] Description:
Corrected a compiler warning in the local heap code.
Fixed the shared message flag symbols from the recent switchover.
Tested on:
FreeBSD 6.2/32 (duty)
| -rw-r--r-- | examples/h5_shared_mesg.c | 12 | ||||
| -rw-r--r-- | src/H5HL.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c index 2548350..68340e0 100644 --- a/examples/h5_shared_mesg.c +++ b/examples/h5_shared_mesg.c @@ -112,7 +112,7 @@ int main(void) * it holds. For the simple case, we'll put every message that could be * shared in this single index. */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40); if(ret < 0) goto error; /* The other property that can be set for shared messages is the @@ -148,7 +148,7 @@ int main(void) * will be about the same size as a normal file (with just a little extra * overhead). */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 1000); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 1000); if(ret < 0) goto error; ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id); @@ -159,7 +159,7 @@ int main(void) * attributes (which might make sense if we were going to use committed * datatypes). We could change the flags on the index: */ - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_SDSPACE_FLAG | H5O_MESG_ATTR_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_ATTR_FLAG, 40); if(ret < 0) goto error; ret = create_standard_file("only_dspaces_and_attrs_file.h5", fcpl_id); @@ -172,9 +172,9 @@ int main(void) */ ret = H5Pset_shared_mesg_nindexes(fcpl_id, 2); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_DTYPE_FLAG | H5O_MESG_SDSPACE_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_SDSPACE_FLAG, 40); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_MESG_ATTR_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40); if(ret < 0) goto error; ret = create_standard_file("separate_indexes_file.h5", fcpl_id); @@ -187,7 +187,7 @@ int main(void) */ ret = H5Pset_shared_mesg_nindexes(fcpl_id, 1); if(ret < 0) goto error; - ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_MESG_ALL_FLAG, 40); + ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_ALL_FLAG, 40); if(ret < 0) goto error; ret = H5Pset_shared_mesg_phase_change(fcpl_id, 5, 0); @@ -1159,7 +1159,7 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size) * if an error occurs -QAK) */ if(H5AC_mark_pinned_or_protected_entry_dirty(f, heap) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, (size_t)(-1), "unable to mark heap as dirty") + HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap as dirty") /* * Check if this chunk can be prepended or appended to an already |