diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-08-31 21:58:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-08-31 21:58:15 (GMT) |
| commit | db8e289abe67b506d2a1096d1a39151aca0935e9 (patch) | |
| tree | 2fb45f2f3c1f9f8717bc00a07a55831689aa382c /src/H5Spkg.h | |
| parent | 2c91cbecc6460d1a319bfb2303e228ea6f6d6e4d (diff) | |
| download | hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.zip hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.tar.gz hdf5-db8e289abe67b506d2a1096d1a39151aca0935e9.tar.bz2 | |
[svn-r27632] Description:
Revert changes to pass file pointer to selection serialize/deserialize
routines. Also patch back in some changes that were merged out in the
previous merge w/trunk.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Spkg.h')
| -rw-r--r-- | src/H5Spkg.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5Spkg.h b/src/H5Spkg.h index f719201..b4210c2 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -141,13 +141,12 @@ typedef herr_t (*H5S_sel_release_func_t)(H5S_t *space); /* Method to determine if current selection is valid for dataspace */ typedef htri_t (*H5S_sel_is_valid_func_t)(const H5S_t *space); /* Method to determine number of bytes required to store current selection */ -typedef hssize_t (*H5S_sel_serial_size_func_t)(const H5F_t *f, const H5S_t *space); +typedef hssize_t (*H5S_sel_serial_size_func_t)(const H5S_t *space); /* Method to store current selection in "serialized" form (a byte sequence suitable for storing on disk) */ -typedef herr_t (*H5S_sel_serialize_func_t)(const H5F_t *f, const H5S_t *space, - uint8_t **p); +typedef herr_t (*H5S_sel_serialize_func_t)(const H5S_t *space, uint8_t **p); /* Method to create selection from "serialized" form (a byte sequence suitable for storing on disk) */ -typedef herr_t (*H5S_sel_deserialize_func_t)(const H5F_t *f, H5S_t *space, - uint32_t version, uint8_t flags, const uint8_t **p); +typedef herr_t (*H5S_sel_deserialize_func_t)(H5S_t *space, uint32_t version, uint8_t flags, + const uint8_t **p); /* Method to determine smallest n-D bounding box containing the current selection */ typedef herr_t (*H5S_sel_bounds_func_t)(const H5S_t *space, hsize_t *start, hsize_t *end); /* Method to determine linear offset of initial element in selection within dataspace */ |