diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 15:00:43 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 15:00:43 (GMT) |
| commit | 809a91fad6dbeb1fe08c4e8a194b31e2d50a800e (patch) | |
| tree | b0575bacfcb4a7732a7b34c23e6cc950ce97894c /src/H5ACprivate.h | |
| parent | 5b2226efc3156536e262a2b24c78386eacdf0b73 (diff) | |
| download | hdf5-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/H5ACprivate.h')
| -rw-r--r-- | src/H5ACprivate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 818a616..47c6306 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -129,7 +129,7 @@ typedef enum { #define H5AC_CALLBACK__NO_FLAGS_SET H5C_CALLBACK__NO_FLAGS_SET #define H5AC_CALLBACK__SIZE_CHANGED_FLAG H5C_CALLBACK__SIZE_CHANGED_FLAG -#define H5AC_CALLBACK__RENAMED_FLAG H5C_CALLBACK__RENAMED_FLAG +#define H5AC_CALLBACK__MOVED_FLAG H5C_CALLBACK__MOVED_FLAG /* Aliases for 'notify action' type & values */ typedef H5C_notify_action_t H5AC_notify_action_t; @@ -338,7 +338,7 @@ H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id, void *thing, unsigned flags); H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5AC_mark_entry_dirty(void *thing); -H5_DLL herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, +H5_DLL herr_t H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr); H5_DLL herr_t H5AC_dest(H5F_t *f, hid_t dxpl_id); |