diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-07 23:22:23 (GMT) |
| commit | f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67 (patch) | |
| tree | 75db636de976919b35280e21cc13f5cf9070359e /src/H5C.c | |
| parent | 419b3d66495271b1eff9037e63b2f4bca235316d (diff) | |
| download | hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.zip hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.gz hdf5-f0623bdbeb7ddb2cfaa9bd47a0ee2975cfc71d67.tar.bz2 | |
[svn-r18073] Description:
Bring r18072 from trunk to 1.8 branch:
Bring r18071 from metadata journaling merge branch:
Refactor local heap routines with changes from metadata journaling
branch, along with other misc. changes as the changes on the metadata journaling
branch are being converged with the current state of the trunk.
Tested on:
Mac OS X/32 10.6.2 (amazon) debug & prod
Linux/64 2.6 (amani) prod
FreeBSD/64 (liberty) prod
Diffstat (limited to 'src/H5C.c')
| -rw-r--r-- | src/H5C.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -11002,9 +11002,9 @@ H5C_load_entry(H5F_t * f, * * with: * - * HDassert( ( entry_ptr->is_dirty == FALSE ) || ( type->id == 4 ) ); + * HDassert( ( entry_ptr->is_dirty == FALSE ) || ( type->id == 5 ) ); * - * Note that type id 4 is associated with object headers in the metadata + * Note that type id 5 is associated with object headers in the metadata * cache. * * When we get to using H5C for other purposes, we may wish to @@ -11012,7 +11012,7 @@ H5C_load_entry(H5F_t * f, * metadata cache. */ - HDassert( ( entry_ptr->is_dirty == FALSE ) || ( type->id == 4 ) ); + HDassert( ( entry_ptr->is_dirty == FALSE ) || ( type->id == 5 ) ); #ifndef NDEBUG entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_MAGIC; #endif /* NDEBUG */ |