diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 22:47:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 22:47:56 (GMT) |
| commit | 93170b425a30c328c3db0183d8870c6e535c9d7c (patch) | |
| tree | b329e021fddcf8544e8f928eae0401eac8796752 /src/H5HGdbg.c | |
| parent | f0ecd713070b869c0d89d2ff0c991ade04852177 (diff) | |
| download | hdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.zip hdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.tar.gz hdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.tar.bz2 | |
[svn-r18716] Description:
Bring r18715 from metadata journaling merging branch to trunk:
Changes to further align trunk with state of metadata journaling branch.
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/H5HGdbg.c')
| -rw-r--r-- | src/H5HGdbg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c index 1fc0133..38b7047 100644 --- a/src/H5HGdbg.c +++ b/src/H5HGdbg.c @@ -73,8 +73,8 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, HDassert(indent >= 0); HDassert(fwidth >= 0); - if(NULL == (h = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, f, H5AC_READ))) - HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load global heap collection"); + if(NULL == (h = H5HG_protect(f, dxpl_id, addr, H5AC_READ))) + HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap collection"); fprintf(stream, "%*sGlobal Heap Collection...\n", indent, ""); fprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, |