diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:19:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:19:28 (GMT) |
| commit | b95c7d1879120c542490c031c70b88f6e5fa7eaa (patch) | |
| tree | a5f2c84b23c43eb342220d811d2b9d4f69fb738b /src/H5Cprivate.h | |
| parent | 2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f (diff) | |
| download | hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.zip hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.tar.gz hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.tar.bz2 | |
[svn-r18722] Description:
Bring r18721 from trunk to 1.8 branch:
Bring r18720 from metadata journaling merging branch to trunk:
Bring changes from metadata journaling branch to 'merging' branch:
Rename H5[A]C_mark_pinned_or_protected_entry_dirty() to
H5[A]C_mark_entry_dirty() and get rid of H5[A]C_mark_pinned_entry_dirty().
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Cprivate.h')
| -rw-r--r-- | src/H5Cprivate.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index e1b9d19..60fbaff 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -278,10 +278,10 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr, * * This field is set to FALSE in the protect call, and may * be set to TRUE by the - * H5C_mark_pinned_or_protected_entry_dirty() + * H5C_mark_entry_dirty() * call at an time prior to the unprotect call. * - * The H5C_mark_pinned_or_protected_entry_dirty() call exists + * The H5C_mark_entry_dirty() call exists * as a convenience function for the fractal heap code which * may not know if an entry is protected or pinned, but knows * that is either protected or pinned. The dirtied field was @@ -1061,11 +1061,7 @@ H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t * f, int32_t ce_array_len, haddr_t *ce_array_ptr); -H5_DLL herr_t H5C_mark_pinned_entry_dirty(void * thing, - hbool_t size_changed, - size_t new_size); - -H5_DLL herr_t H5C_mark_pinned_or_protected_entry_dirty(void *thing); +H5_DLL herr_t H5C_mark_entry_dirty(void *thing); H5_DLL herr_t H5C_rename_entry(H5C_t * cache_ptr, const H5C_class_t * type, |