summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5Sprivate.h20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 9e9038f..ac43f9f 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -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 */