mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r1569] Changes since 19990810

Browse Source 
----------------------

./src/H5Sprivate.h
	Fixed merge conflicts that I missed earlier.
This commit is contained in:
Robb Matzke 1999-08-10 15:28:15 -05:00
parent cbf68fc824
commit 5ef0237e2f
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/H5Sprivate.h
View File

@ -357,12 +357,8 @@ __DLL__ herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ herr_t H5S_point_bounds(H5S_t *space, hsize_t *start, hsize_t *end);
__DLL__ htri_t H5S_point_select_contiguous(const H5S_t *space);
__DLL__ herr_t H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space,
<<<<<<< H5Sprivate.h
H5D_operator_t operator,
H5D_operator_t op,
void *operator_data);
=======
H5D_operator_t op, void *operator_data);
>>>>>>> 1.53
/* "All" select functions */
__DLL__ herr_t H5S_all_release(H5S_t *space);
@ -383,12 +379,7 @@ __DLL__ herr_t H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout,
hid_t dxpl_id, const void *buf,
hbool_t *must_convert/*out*/);
__DLL__ herr_t H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space,
<<<<<<< H5Sprivate.h
H5D_operator_t operator,
void *operator_data);
=======
H5D_operator_t op, void *operator_data);
>>>>>>> 1.53
H5D_operator_t op, void *operator_data);
/* Hyperslab selection functions */
__DLL__ herr_t H5S_hyper_add(H5S_t *space, const hssize_t *start,
@ -418,12 +409,7 @@ __DLL__ herr_t H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space,
__DLL__ herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf);
__DLL__ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ herr_t H5S_none_select_iterate(void *buf, hid_t type_id, H5S_t *space,
<<<<<<< H5Sprivate.h
H5D_operator_t operator,
void *operator_data);
=======
H5D_operator_t op, void *operator_data);
>>>>>>> 1.53
H5D_operator_t op, void *operator_data);
#ifdef HAVE_PARALLEL
/* MPI-IO function to read directly from app buffer to file rky980813 */