diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-21 19:51:32 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-21 19:51:32 (GMT) |
| commit | f22b7d2e1268549e343e141206ab143b88da25ed (patch) | |
| tree | eb22bac6752b7212cf2138cbb44caf70cc141d5b /src/H5Ocopy.c | |
| parent | fb1937371d160d267c6d18c88f49b59b67b663d9 (diff) | |
| download | hdf5-f22b7d2e1268549e343e141206ab143b88da25ed.zip hdf5-f22b7d2e1268549e343e141206ab143b88da25ed.tar.gz hdf5-f22b7d2e1268549e343e141206ab143b88da25ed.tar.bz2 | |
[svn-r21646] Port r21603 to 1.8 branch
Purpose: Add generic skip list implementation
Description:
Added new H5SL_TYPE_GENERIC skip list type, which uses void *'s as keys and a
client-supplied callback for key comparison. This was added to support the
upcoming "merge named datatype" feature for H5Ocopy, but may be used in other
places as well. Also added testing.
Also fixed a potential bug with the H5SL_TYPE_OBJ implementation, and added
testing for that.
Tested: jam, koala, heiwa (h5committest), durandal
Diffstat (limited to 'src/H5Ocopy.c')
| -rw-r--r-- | src/H5Ocopy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 184bf74..9fe3d5e 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -960,7 +960,7 @@ H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, cpy_info.preserve_null = TRUE; /* Create a skip list to keep track of which objects are copied */ - if((cpy_info.map_list = H5SL_create(H5SL_TYPE_OBJ)) == NULL) + if((cpy_info.map_list = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL) HGOTO_ERROR(H5E_SLIST, H5E_CANTCREATE, FAIL, "cannot make skip list") /* copy the object from the source file to the destination file */ |