diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-02 18:21:05 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-02 18:21:05 (GMT) |
| commit | 177cbf2b9bf6e0083f78e8493be88918ab9c3504 (patch) | |
| tree | 9e5dab5482f5cebf188f7b740629193f89a0f46f /src/H5HFhuge.c | |
| parent | bb455ebd6f14901e6888586b8209abc277cf128d (diff) | |
| download | hdf5-177cbf2b9bf6e0083f78e8493be88918ab9c3504.zip hdf5-177cbf2b9bf6e0083f78e8493be88918ab9c3504.tar.gz hdf5-177cbf2b9bf6e0083f78e8493be88918ab9c3504.tar.bz2 | |
[svn-r22239] Description:
Bring r22233 from trunk to 1.8 branch:
Correct several errors in fractal heap code: root indirect block was
getting pinned/protected more than once, "single" free space sections weren't
getting "re-parented" correctly when the heap transitioned between having a
root indirect block and a root direct block, and several related issues. Also
cleaned up some warnings in library/tests.
Tested on:
FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode
FreeBSD/64 8.2 (freedom) w/gcc4.6, 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 (koala) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'src/H5HFhuge.c')
| -rw-r--r-- | src/H5HFhuge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c index 3bbd137..6f0b48e 100644 --- a/src/H5HFhuge.c +++ b/src/H5HFhuge.c @@ -899,7 +899,7 @@ done: herr_t H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id) { - H5HF_huge_remove_ud1_t udata; /* User callback data for v2 B-tree remove call */ + H5HF_huge_remove_ud_t udata; /* User callback data for v2 B-tree remove call */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -1072,7 +1072,7 @@ done: herr_t H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id) { - H5HF_huge_remove_ud1_t udata; /* User callback data for v2 B-tree remove call */ + H5HF_huge_remove_ud_t udata; /* User callback data for v2 B-tree remove call */ H5B2_remove_t op; /* Callback for v2 B-tree removal */ herr_t ret_value = SUCCEED; /* Return value */ |