summaryrefslogtreecommitdiffstats
path: root/src/H5Edefin.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/H5Edefin.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/H5Edefin.h')
-rw-r--r--src/H5Edefin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
index 16e922a..b871396 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -108,6 +108,7 @@ hid_t H5E_CANTDELETE_g = FAIL; /* Can't delete message */
hid_t H5E_BADITER_g = FAIL; /* Iteration failed */
hid_t H5E_CANTPACK_g = FAIL; /* Can't pack messages */
hid_t H5E_CANTRESET_g = FAIL; /* Can't reset object */
+hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename object */
/* System level errors */
hid_t H5E_SYSERRSTR_g = FAIL; /* System error message */
@@ -156,7 +157,6 @@ hid_t H5E_PROTECT_g = FAIL; /* Protected metadata error */
hid_t H5E_NOTCACHED_g = FAIL; /* Metadata not currently cached */
hid_t H5E_SYSTEM_g = FAIL; /* Internal error detected */
hid_t H5E_CANTINS_g = FAIL; /* Unable to insert metadata into cache */
-hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename metadata */
hid_t H5E_CANTPROTECT_g = FAIL; /* Unable to protect metadata */
hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */
hid_t H5E_CANTPIN_g = FAIL; /* Unable to pin cache entry */
@@ -173,7 +173,7 @@ hid_t H5E_CANTNOTIFY_g = FAIL; /* Unable to notify object about action
hid_t H5E_TRAVERSE_g = FAIL; /* Link traversal failure */
hid_t H5E_NLINKS_g = FAIL; /* Too many soft links in path */
hid_t H5E_NOTREGISTERED_g = FAIL; /* Link class not registered */
-hid_t H5E_CANTMOVE_g = FAIL; /* Move callback returned error */
+hid_t H5E_CANTMOVE_g = FAIL; /* Can't move object */
hid_t H5E_CANTSORT_g = FAIL; /* Can't sort objects */
/* Parallel MPI errors */