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/H5Edefin.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/H5Edefin.h')
| -rw-r--r-- | src/H5Edefin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Edefin.h b/src/H5Edefin.h index 5638305..9ca9371 100644 --- a/src/H5Edefin.h +++ b/src/H5Edefin.h @@ -106,6 +106,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 */ @@ -154,7 +155,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 */ @@ -168,7 +168,7 @@ hid_t H5E_CANTRESIZE_g = FAIL; /* Unable to resize a metadata cache ent 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 */ |