diff options
author | Quincey Koziol <koziol@lbl.gov> | 2019-02-15 20:12:16 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@lbl.gov> | 2019-02-15 20:12:16 (GMT) |
commit | e1046db0e68f8188df4edc20ddc364a50500ad77 (patch) | |
tree | 51cccf82b843dfe30ea64951fbf45330b7ec5b83 /src/H5Sprivate.h | |
parent | 81687043d4647e4ddb3ed9282663bc78799abf5d (diff) | |
parent | 320eaf91b9adb36bb0fed9264d460e4a808200b7 (diff) | |
download | hdf5-e1046db0e68f8188df4edc20ddc364a50500ad77.zip hdf5-e1046db0e68f8188df4edc20ddc364a50500ad77.tar.gz hdf5-e1046db0e68f8188df4edc20ddc364a50500ad77.tar.bz2 |
Merge pull request #1548 in HDFFV/hdf5 from merge_hyperslab_updates_04 to develop
* commit '320eaf91b9adb36bb0fed9264d460e4a808200b7':
More changes to align with incoming selection improvements.
Diffstat (limited to 'src/H5Sprivate.h')
-rw-r--r-- | src/H5Sprivate.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 24db889..f4e0006 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -58,7 +58,7 @@ typedef struct H5S_hyper_dim_t { /* Point selection iteration container */ typedef struct { - H5S_pnt_node_t *curr; /* Pointer to next node to output */ + H5S_pnt_node_t *curr; /* Pointer to next node to output */ } H5S_point_iter_t; /* Hyperslab selection iteration container */ @@ -286,9 +286,6 @@ H5_DLL herr_t H5S_hyper_add_span_element(H5S_t *space, unsigned rank, const hsize_t *coords); H5_DLL herr_t H5S_hyper_reset_scratch(H5S_t *space); H5_DLL herr_t H5S_hyper_convert(H5S_t *space); -#ifdef LATER -H5_DLL htri_t H5S_hyper_intersect (H5S_t *space1, H5S_t *space2); -#endif /* LATER */ H5_DLL htri_t H5S_hyper_intersect_block(H5S_t *space, const hsize_t *start, const hsize_t *end); H5_DLL herr_t H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset); H5_DLL htri_t H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset); @@ -304,7 +301,8 @@ H5_DLL hsize_t H5S_hyper_get_first_inc_block(const H5S_t *space, hsize_t clip_size, hbool_t *partial); /* Operations on selection iterators */ -H5_DLL herr_t H5S_select_iter_init(H5S_sel_iter_t *iter, const H5S_t *space, size_t elmt_size); +H5_DLL herr_t H5S_select_iter_init(H5S_sel_iter_t *iter, const H5S_t *space, + size_t elmt_size); H5_DLL herr_t H5S_select_iter_coords(const H5S_sel_iter_t *sel_iter, hsize_t *coords); H5_DLL hsize_t H5S_select_iter_nelmts(const H5S_sel_iter_t *sel_iter); H5_DLL herr_t H5S_select_iter_next(H5S_sel_iter_t *sel_iter, size_t nelem); |