diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
| commit | 173083e1a5c9696be01bd983dd8c9bb87eb5a433 (patch) | |
| tree | c8c4aa2dd961d18b48d0c734da3e16ea107e6c6f /src/H5Fquery.c | |
| parent | ec7ca0dea2fba8071ce57e4f61d685c3e4d0d111 (diff) | |
| download | hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.zip hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.gz hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.bz2 | |
[svn-r17365] Description:
Final merge of changes from sblock_mdc branch back to trunk. The superblock is now managed by the metadata cache.
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 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) 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-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Fquery.c')
| -rw-r--r-- | src/H5Fquery.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/H5Fquery.c b/src/H5Fquery.c index 564a088..93f2d6e 100644 --- a/src/H5Fquery.c +++ b/src/H5Fquery.c @@ -261,8 +261,9 @@ H5F_sym_leaf_k(const H5F_t *f) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); - FUNC_LEAVE_NOAPI(f->shared->sym_leaf_k) + FUNC_LEAVE_NOAPI(f->shared->sblock->sym_leaf_k) } /* end H5F_sym_leaf_k() */ @@ -292,9 +293,10 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); HDassert(type); - FUNC_LEAVE_NOAPI(f->shared->btree_k[type->id]) + FUNC_LEAVE_NOAPI(f->shared->sblock->btree_k[type->id]) } /* end H5F_Kvalue() */ @@ -413,8 +415,9 @@ H5F_get_base_addr(const H5F_t *f) HDassert(f); HDassert(f->shared); + HDassert(f->shared->sblock); - FUNC_LEAVE_NOAPI(f->shared->base_addr) + FUNC_LEAVE_NOAPI(f->shared->sblock->base_addr) } /* end H5F_get_base_addr() */ |