diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-02-28 16:43:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-02-28 16:43:38 (GMT) |
| commit | a49bd13da3feed72cc4e2650d71a224d0cbaad73 (patch) | |
| tree | f0b7da5910d5ce1525b9bf0a536042a8d425c4c6 /src/H5Cprivate.h | |
| parent | dfad2e1b079ca690ea144ff4a0fa006ea05ede3e (diff) | |
| parent | cf932610999de00867c0a0bb3a08ee3bbf39a158 (diff) | |
| download | hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.zip hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.tar.gz hdf5-a49bd13da3feed72cc4e2650d71a224d0cbaad73.tar.bz2 | |
Merge pull request #316 in HDFFV/hdf5 from merge_page_buffering_05 to develop
* commit 'cf932610999de00867c0a0bb3a08ee3bbf39a158':
Correct issues from pull request reviews.
Corrected version of 4b5e05c084f93c35dae946c2c9e814d565a613b0: Fix some more signed -> unsigned value issues with cache data structures, also misc. style cleanups. All to align w/incoming page_buffering changes.
Revert "Fix some more signed -> unsigned value issues with cache data structures, also"
Diffstat (limited to 'src/H5Cprivate.h')
| -rw-r--r-- | src/H5Cprivate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index 9696cc0..30a7745 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -1661,8 +1661,8 @@ typedef struct H5C_cache_entry_t { * JRM - 8/5/15 * * magic: Unsigned 32 bit integer that must always be set to - * H5C_IMAGE_ENTRY_T_MAGIC when the entry is valid. - * The field must be set to H5C_IMAGE_ENTRY_T_BAD_MAGIC + * H5C__IMAGE_ENTRY_T_MAGIC when the entry is valid. + * The field must be set to H5C__IMAGE__ENTRY_T_BAD_MAGIC * just before the entry is freed. * * addr: Base address of the cache entry on disk. @@ -2284,7 +2284,7 @@ H5_DLL herr_t H5C_apply_candidate_list(H5F_t *f, hid_t dxpl_id, H5_DLL herr_t H5C_construct_candidate_list__clean_cache(H5C_t *cache_ptr); H5_DLL herr_t H5C_construct_candidate_list__min_clean(H5C_t *cache_ptr); H5_DLL herr_t H5C_clear_coll_entries(H5C_t * cache_ptr, hbool_t partial); -H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t *f, hid_t dxpl_id, int32_t ce_array_len, +H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t *f, hid_t dxpl_id, unsigned ce_array_len, haddr_t *ce_array_ptr); #endif /* H5_HAVE_PARALLEL */ |