summaryrefslogtreecommitdiffstats
path: root/src/H5Cprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-06 15:00:43 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-06 15:00:43 (GMT)
commit809a91fad6dbeb1fe08c4e8a194b31e2d50a800e (patch)
treeb0575bacfcb4a7732a7b34c23e6cc950ce97894c /src/H5Cprivate.h
parent5b2226efc3156536e262a2b24c78386eacdf0b73 (diff)
downloadhdf5-809a91fad6dbeb1fe08c4e8a194b31e2d50a800e.zip
hdf5-809a91fad6dbeb1fe08c4e8a194b31e2d50a800e.tar.gz
hdf5-809a91fad6dbeb1fe08c4e8a194b31e2d50a800e.tar.bz2
[svn-r18725] Description:
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) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.6.3 (amazon) in debug mode Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5Cprivate.h')
-rw-r--r--src/H5Cprivate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index f6792ba..f836854 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -122,7 +122,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 {
@@ -1118,7 +1118,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);