diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 15:39:23 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 15:39:23 (GMT) |
commit | abd749619d15cf7a3e927232ac2ad7ed1c726dd2 (patch) | |
tree | c722e8827c02f11e97b1106e2cb016c65b1b6eb5 /src/H5Cprivate.h | |
parent | b95c7d1879120c542490c031c70b88f6e5fa7eaa (diff) | |
download | hdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.zip hdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.tar.gz hdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.tar.bz2 |
[svn-r18726] Description:
Bring r18725 from trunk to 1.8 branch:
Bring r18724 from metadata journaling 'merging' branch to trunk:
Rename H5[A]C_rename to H5[A]C_move_entry.
Tested on:
FreeBSD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5Cprivate.h')
-rw-r--r-- | src/H5Cprivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index 60fbaff..83e4f92 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -119,7 +119,7 @@ typedef struct H5C_t H5C_t; #define H5C_CALLBACK__NO_FLAGS_SET 0x0 #define H5C_CALLBACK__SIZE_CHANGED_FLAG 0x1 -#define H5C_CALLBACK__RENAMED_FLAG 0x2 +#define H5C_CALLBACK__MOVED_FLAG 0x2 /* Actions that can be reported to 'notify' client callback */ typedef enum H5C_notify_action_t { @@ -1063,7 +1063,7 @@ H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t * f, H5_DLL herr_t H5C_mark_entry_dirty(void *thing); -H5_DLL herr_t H5C_rename_entry(H5C_t * cache_ptr, +H5_DLL herr_t H5C_move_entry(H5C_t * cache_ptr, const H5C_class_t * type, haddr_t old_addr, haddr_t new_addr); |