From f7520c906258636b4b8b24d3b0cd175f653c74ad Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 15 Jan 2008 17:25:42 -0500 Subject: [svn-r14423] Description: Change the 'coord' parameter for H5Sselect_elements() from 'hsize_t **' to 'hsize_t *' in this branch also. Tested on: Mac OS X/32 10.5.1 (amazon) --- c++/examples/writedata.cpp | 2 +- c++/src/H5DataSpace.cpp | 2 +- c++/src/H5DataSpace.h | 2 +- examples/h5_select.c | 3 +-- fortran/src/H5Sf.c | 2 +- src/H5D.c | 2 +- src/H5Dio.c | 4 ++-- src/H5Spoint.c | 13 ++++++------ src/H5Sprivate.h | 2 +- src/H5Spublic.h | 3 +-- test/dsets.c | 8 ++++---- test/tcoords.c | 4 ++-- test/trefer.c | 4 ++-- test/tselect.c | 48 ++++++++++++++++++++++---------------------- testpar/t_mdset.c | 2 +- tools/h5diff/h5diffgentest.c | 2 +- tools/h5dump/h5dumpgentest.c | 2 +- 17 files changed, 51 insertions(+), 54 deletions(-) diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp index 2b1feae..d6ddc80 100644 --- a/c++/examples/writedata.cpp +++ b/c++/examples/writedata.cpp @@ -171,7 +171,7 @@ int main (void) coord[2][0] = 3; coord[2][1] = 5; coord[3][0] = 5; coord[3][1] = 6; - fspace.selectElements( H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord); + fspace.selectElements( H5S_SELECT_SET, NPOINTS, coord); /* * Write new selection of points to the dataset. diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp index 9cdd74c..e5ef816 100644 --- a/c++/src/H5DataSpace.cpp +++ b/c++/src/H5DataSpace.cpp @@ -454,7 +454,7 @@ void DataSpace::getSelectBounds ( hsize_t* start, hsize_t* end ) const /// ../RM_H5S.html#Dataspace-SelectElements // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void DataSpace::selectElements ( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord[ ] ) const +void DataSpace::selectElements ( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const { herr_t ret_value; ret_value = H5Sselect_elements( id, op, num_elements, coord ); diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h index a46f486..e1c5ba4 100644 --- a/c++/src/H5DataSpace.h +++ b/c++/src/H5DataSpace.h @@ -86,7 +86,7 @@ class H5_DLLCPP DataSpace : public IdComponent { // Selects array elements to be included in the selection for // this dataspace. - void selectElements( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord[ ] ) const; + void selectElements( H5S_seloper_t op, const size_t num_elements, const hsize_t *coord) const; // Selects a hyperslab region to add to the current selected region. void selectHyperslab( H5S_seloper_t op, const hsize_t *count, const hsize_t *start, const hsize_t *stride = NULL, const hsize_t *block = NULL ) const; diff --git a/examples/h5_select.c b/examples/h5_select.c index 249f2ba..95117e9 100644 --- a/examples/h5_select.c +++ b/examples/h5_select.c @@ -170,8 +170,7 @@ main (void) coord[2][0] = 3; coord[2][1] = 5; coord[3][0] = 5; coord[3][1] = 6; - ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, - (const hsize_t **)coord); + ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, coord); /* * Write new selection of points to the dataset. diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index 690d548..d1e548a 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -884,7 +884,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsi } c_nelements = *nelements; - status = H5Sselect_elements(c_space_id, c_op, c_nelements, (const hsize_t **)c_coord); + status = H5Sselect_elements(c_space_id, c_op, c_nelements, c_coord); if ( status >= 0 ) ret_value = 0; HDfree(c_coord); return ret_value; diff --git a/src/H5D.c b/src/H5D.c index 5735c06..687b292 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -3677,7 +3677,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, unsigned UNUSED ndim, co HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "can't resize tbuf") /* Select point to read in */ - if(H5Sselect_elements(vlen_bufsize->fspace_id, H5S_SELECT_SET, 1, (const hsize_t **)point)<0) + if(H5Sselect_elements(vlen_bufsize->fspace_id, H5S_SELECT_SET, 1, point)<0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCREATE, FAIL, "can't select point") /* Read in the point (with the custom VL memory allocator) */ diff --git a/src/H5Dio.c b/src/H5Dio.c index b963d78..6bf8dd1 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -3060,7 +3060,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const coords_in_chunk[u]=coords[u]%fm->layout->u.chunk.dim[u]; /* Add point to file selection for chunk */ - if(H5S_select_elements(chunk_info->fspace,H5S_SELECT_APPEND,1,(const hsize_t **)coords_in_chunk)<0) + if(H5S_select_elements(chunk_info->fspace,H5S_SELECT_APPEND,1,coords_in_chunk)<0) HGOTO_ERROR (H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element") /* Increment the number of elemented selected in chunk */ @@ -3137,7 +3137,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const /* Add point to memory selection for chunk */ if(fm->msel_type==H5S_SEL_POINTS) { - if(H5S_select_elements(chunk_info->mspace,H5S_SELECT_APPEND,1,(const hsize_t **)coords_in_mem)<0) + if(H5S_select_elements(chunk_info->mspace,H5S_SELECT_APPEND,1,coords_in_mem)<0) HGOTO_ERROR (H5E_DATASPACE, H5E_CANTSELECT, FAIL, "unable to select element") } /* end if */ else { diff --git a/src/H5Spoint.c b/src/H5Spoint.c index dd644d8..d62b5a6 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -378,10 +378,9 @@ H5S_point_iter_release (H5S_sel_iter_t UNUSED * iter) REVISION LOG --------------------------------------------------------------------------*/ static herr_t -H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t **_coord) +H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *coord) { H5S_pnt_node_t *top, *curr, *new_node; /* Point selection nodes */ - const hsize_t *coord=(const hsize_t *)_coord; /* Pointer to the actual coordinates */ unsigned i; /* Counter */ herr_t ret_value=SUCCEED; /* Return value */ @@ -503,7 +502,7 @@ H5S_point_release (H5S_t *space) hid_t dsid; IN: Dataspace ID of selection to modify H5S_seloper_t op; IN: Operation to perform on current selection size_t num_elem; IN: Number of elements in COORD array. - const hsize_t **coord; IN: The location of each element selected + const hsize_t *coord; IN: The location of each element selected RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -525,7 +524,7 @@ H5S_point_release (H5S_t *space) --------------------------------------------------------------------------*/ herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, - const hsize_t **coord) + const hsize_t *coord) { herr_t ret_value=SUCCEED; /* return value */ @@ -1204,7 +1203,7 @@ H5S_point_is_regular(const H5S_t *space) hid_t dsid; IN: Dataspace ID of selection to modify H5S_seloper_t op; IN: Operation to perform on current selection size_t num_elem; IN: Number of elements in COORD array. - const hsize_t **coord; IN: The location of each element selected + const hsize_t *coord; IN: The location of each element selected RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -1226,13 +1225,13 @@ H5S_point_is_regular(const H5S_t *space) --------------------------------------------------------------------------*/ herr_t H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem, - const hsize_t **coord) + const hsize_t *coord) { H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value; /* return value */ FUNC_ENTER_API(H5Sselect_elements, FAIL); - H5TRACE4("e","iSsz**h",spaceid,op,num_elem,coord); + H5TRACE4("e","iSsz*h",spaceid,op,num_elem,coord); /* Check args */ if (NULL == (space=H5I_object_verify(spaceid, H5I_DATASPACE))) diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index 172489d..2c3670b 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -247,7 +247,7 @@ H5_DLL herr_t H5S_select_none(H5S_t *space); /* Operations on point selections */ H5_DLL herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, - size_t num_elem, const hsize_t **coord); + size_t num_elem, const hsize_t *coord); /* Operations on hyperslab selections */ H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hsize_t start[], diff --git a/src/H5Spublic.h b/src/H5Spublic.h index b7d23ed..c992064 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -112,8 +112,7 @@ H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t count[], const hsize_t _block[]); H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, - size_t num_elemn, - const hsize_t **coord); + size_t num_elem, const hsize_t *coord); H5_DLL H5S_class_t H5Sget_simple_extent_type(hid_t space_id); H5_DLL herr_t H5Sset_extent_none(hid_t space_id); H5_DLL herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id); diff --git a/test/dsets.c b/test/dsets.c index d7f2de2..0f98845 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -3956,7 +3956,7 @@ test_random_chunks(void) if ((m = H5Screate_simple(1, msize, NULL))<0) TEST_ERROR; /* Select the random points for writing */ - if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord)<0) TEST_ERROR; + if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord)<0) TEST_ERROR; /* Write into dataset */ if (H5Dwrite(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, wbuf)<0) TEST_ERROR; @@ -3981,7 +3981,7 @@ test_random_chunks(void) if ((m = H5Screate_simple(1, msize, NULL))<0) TEST_ERROR; /* Select the random points for reading */ - if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord)<0) TEST_ERROR; + if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord)<0) TEST_ERROR; /* Read from dataset */ if (H5Dread(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, rbuf)<0) TEST_ERROR; @@ -4048,7 +4048,7 @@ test_random_chunks(void) if ((m = H5Screate_simple(1, msize, NULL))<0) TEST_ERROR; /* Select the random points for writing */ - if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord)<0) TEST_ERROR; + if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord)<0) TEST_ERROR; /* Write into dataset */ if (H5Dwrite(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, wbuf)<0) TEST_ERROR; @@ -4073,7 +4073,7 @@ test_random_chunks(void) if ((m = H5Screate_simple(1, msize, NULL))<0) TEST_ERROR; /* Select the random points for reading */ - if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, (const hsize_t **)coord)<0) TEST_ERROR; + if (H5Sselect_elements (s, H5S_SELECT_SET, NPOINTS, coord)<0) TEST_ERROR; /* Read from dataset */ if (H5Dread(d, H5T_NATIVE_INT, m, s, H5P_DEFAULT, rbuf)<0) TEST_ERROR; diff --git a/test/tcoords.c b/test/tcoords.c index 90f77db..880c3f4 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -113,7 +113,7 @@ static void test_single_end(hid_t file) CHECK(did, FAIL, "H5Dopen"); /* Select the elements in the dataset */ - ret = H5Sselect_elements(sid, H5S_SELECT_SET, (const size_t)12, (const hsize_t**)da_elmts1); + ret = H5Sselect_elements(sid, H5S_SELECT_SET, (const size_t)12, da_elmts1); CHECK(ret, FAIL, "H5Sselect_elements"); msid = H5Screate_simple(4, mem1_dims, mem1_dims); @@ -143,7 +143,7 @@ static void test_single_end(hid_t file) CHECK(did, FAIL, "H5Dopen"); /* Select the elements in the dataset */ - ret = H5Sselect_elements(sid, H5S_SELECT_SET, (const size_t)6, (const hsize_t**)da_elmts2); + ret = H5Sselect_elements(sid, H5S_SELECT_SET, (const size_t)6, da_elmts2); CHECK(ret, FAIL, "H5Sselect_elements"); msid = H5Screate_simple(4, mem2_dims, mem2_dims); diff --git a/test/trefer.c b/test/trefer.c index 8c01526..c538701 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -423,7 +423,7 @@ test_reference_region(void) coord1[7][0]=9; coord1[7][1]=0; coord1[8][0]=7; coord1[8][1]=1; coord1[9][0]=3; coord1[9][1]=3; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); ret = (int)H5Sget_select_npoints(sid2); @@ -695,7 +695,7 @@ test_reference_region_1D(void) coord1[7][0]=89; coord1[8][0]=97; coord1[9][0]=03; - ret = H5Sselect_elements(sid3,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid3,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); ret = (int)H5Sget_select_npoints(sid3); diff --git a/test/tselect.c b/test/tselect.c index 5b6c0c5..3483526 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -423,7 +423,7 @@ test_select_point(hid_t xfer_plist) coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4; coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6; coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8; - ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -448,7 +448,7 @@ test_select_point(hid_t xfer_plist) coord1[7][0]=1; coord1[7][1]=14; coord1[7][2]= 6; coord1[8][0]=2; coord1[8][1]= 2; coord1[8][2]= 5; coord1[9][0]=0; coord1[9][1]= 6; coord1[9][2]=13; - ret = H5Sselect_elements(sid1,H5S_SELECT_APPEND,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid1,H5S_SELECT_APPEND,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -473,7 +473,7 @@ test_select_point(hid_t xfer_plist) coord2[7][0]=29; coord2[7][1]= 4; coord2[8][0]= 8; coord2[8][1]= 8; coord2[9][0]=19; coord2[9][1]=17; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord2); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord2); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -502,7 +502,7 @@ test_select_point(hid_t xfer_plist) coord2[7][0]=12; coord2[7][1]= 2; coord2[8][0]=21; coord2[8][1]=12; coord2[9][0]= 9; coord2[9][1]=18; - ret = H5Sselect_elements(sid2,H5S_SELECT_PREPEND,POINT1_NPOINTS,(const hsize_t **)coord2); + ret = H5Sselect_elements(sid2,H5S_SELECT_PREPEND,POINT1_NPOINTS,coord2); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -544,7 +544,7 @@ test_select_point(hid_t xfer_plist) coord3[7][0]= 1; coord3[7][1]=22; coord3[8][0]=12; coord3[8][1]=21; coord3[9][0]=11; coord3[9][1]= 6; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord3); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord3); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -568,7 +568,7 @@ test_select_point(hid_t xfer_plist) coord3[7][0]= 9; coord3[7][1]=16; coord3[8][0]=12; coord3[8][1]=22; coord3[9][0]=13; coord3[9][1]= 9; - ret = H5Sselect_elements(sid2,H5S_SELECT_APPEND,POINT1_NPOINTS,(const hsize_t **)coord3); + ret = H5Sselect_elements(sid2,H5S_SELECT_APPEND,POINT1_NPOINTS,coord3); CHECK(ret, FAIL, "H5Sselect_elements"); /* Verify correct elements selected */ @@ -921,7 +921,7 @@ test_select_combo(void) coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4; coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6; coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8; - ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Select 1x10 hyperslab for writing memory dataset */ @@ -1756,7 +1756,7 @@ test_select_point_copy(void) coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4; coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6; coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8; - ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Select sequence of ten points for write dataset */ @@ -1770,7 +1770,7 @@ test_select_point_copy(void) coord2[7][0]=29; coord2[7][1]= 4; coord2[8][0]= 8; coord2[8][1]= 8; coord2[9][0]=19; coord2[9][1]=17; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord2); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord2); CHECK(ret, FAIL, "H5Sselect_elements"); /* Make a copy of the dataspace to write */ @@ -1814,7 +1814,7 @@ test_select_point_copy(void) coord3[7][0]= 1; coord3[7][1]=22; coord3[8][0]=12; coord3[8][1]=21; coord3[9][0]=11; coord3[9][1]= 6; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord3); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord3); CHECK(ret, FAIL, "H5Sselect_elements"); /* Make a copy of the dataspace to read */ @@ -2203,7 +2203,7 @@ test_select_point_offset(void) coord1[7][0]=1; coord1[7][1]= 0; coord1[7][2]= 4; coord1[8][0]=2; coord1[8][1]= 1; coord1[8][2]= 6; coord1[9][0]=0; coord1[9][1]= 3; coord1[9][2]= 8; - ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + ret = H5Sselect_elements(sid1,H5S_SELECT_SET,POINT1_NPOINTS,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Check a valid offset */ @@ -2238,7 +2238,7 @@ test_select_point_offset(void) coord2[7][0]=23; coord2[7][1]= 4; coord2[8][0]= 8; coord2[8][1]= 8; coord2[9][0]=19; coord2[9][1]=17; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord2); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord2); CHECK(ret, FAIL, "H5Sselect_elements"); /* Choose a valid offset for the memory dataspace */ @@ -2274,7 +2274,7 @@ test_select_point_offset(void) coord3[7][0]= 1; coord3[7][1]=22; coord3[8][0]=12; coord3[8][1]=21; coord3[9][0]=11; coord3[9][1]= 6; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord3); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord3); CHECK(ret, FAIL, "H5Sselect_elements"); /* Read selection from disk */ @@ -3873,7 +3873,7 @@ test_select_point_chunk(void) points[6][1]=1; points[7][0]=6; /* In same chunk as point #3, but "earlier" in chunk */ points[7][1]=6; - ret = H5Sselect_elements(pnt1_space,H5S_SELECT_SET,SPACE7_NPOINTS,(const hsize_t **)points); + ret = H5Sselect_elements(pnt1_space,H5S_SELECT_SET,SPACE7_NPOINTS,points); CHECK(ret, FAIL, "H5Sselect_elements"); /* Create 1st hyperslab selection */ @@ -3909,7 +3909,7 @@ test_select_point_chunk(void) points[6][1]=2; points[7][0]=7; /* In same chunk as point #3, but "earlier" in chunk */ points[7][1]=7; - ret = H5Sselect_elements(pnt2_space,H5S_SELECT_SET,SPACE7_NPOINTS,(const hsize_t **)points); + ret = H5Sselect_elements(pnt2_space,H5S_SELECT_SET,SPACE7_NPOINTS,points); CHECK(ret, FAIL, "H5Sselect_elements"); /* Create 2nd hyperslab selection */ @@ -4664,7 +4664,7 @@ test_select_fill_point(hssize_t *offset) CHECK(sid1, FAIL, "H5Screate_simple"); /* Select "point" selection */ - ret = H5Sselect_elements(sid1, H5S_SELECT_SET,num_points,(const hsize_t **)points); + ret = H5Sselect_elements(sid1, H5S_SELECT_SET,num_points,points); CHECK(ret, FAIL, "H5Sselect_elements"); if(offset!=NULL) { @@ -5202,7 +5202,7 @@ test_scalar_select(void) /* Select one element in memory with a point selection */ coord1[0]=0; coord1[1]= 2; - ret = H5Sselect_elements(sid2,H5S_SELECT_SET,1,(const hsize_t **)&coord1); + ret = H5Sselect_elements(sid2,H5S_SELECT_SET,1,&coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Write single point to disk */ @@ -5321,7 +5321,7 @@ test_scalar_select2(void) /* Select one element in memory with a point selection */ coord1[0]=0; H5E_BEGIN_TRY { - ret = H5Sselect_elements(sid,H5S_SELECT_SET,1,(const hsize_t **)&coord1); + ret = H5Sselect_elements(sid,H5S_SELECT_SET,1,&coord1); } H5E_END_TRY; VERIFY(ret, FAIL, "H5Sselect_elements"); @@ -5408,7 +5408,7 @@ test_shape_same(void) /* Select sequence of ten points for multiple point selection */ coord1[0][0]=2; coord1[0][1]=2; - ret = H5Sselect_elements(single_pt_sid,H5S_SELECT_SET,1,(const hsize_t **)coord1); + ret = H5Sselect_elements(single_pt_sid,H5S_SELECT_SET,1,coord1); CHECK(ret, FAIL, "H5Sselect_elements"); /* Create dataspace for multiple point selection */ @@ -5426,7 +5426,7 @@ test_shape_same(void) coord2[7][0]=1; coord2[7][1]=0; coord2[8][0]=5; coord2[8][1]=1; coord2[9][0]=9; coord2[9][1]=3; - ret = H5Sselect_elements(mult_pt_sid,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord2); + ret = H5Sselect_elements(mult_pt_sid,H5S_SELECT_SET,POINT1_NPOINTS,coord2); CHECK(ret, FAIL, "H5Sselect_elements"); /* Create dataspace for single hyperslab selection */ @@ -5783,7 +5783,7 @@ test_shape_same(void) for(v=1; v<(SPACE9_DIM2-1); v++) { coord2[v-1][0]=u; coord2[v-1][1]=v; } /* end for */ - ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,(SPACE9_DIM2-2),(const hsize_t **)coord2); + ret = H5Sselect_elements(tmp_sid,H5S_SELECT_APPEND,(SPACE9_DIM2-2),coord2); CHECK(ret, FAIL, "H5Sselect_elements"); } /* end for */ @@ -5889,7 +5889,7 @@ test_shape_same(void) for(v=0; v= 0 ), "H5Sselect_elements() failed"); diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index c056277..f73330e 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -2325,7 +2325,7 @@ void gen_datareg(hid_t fid, coord[3][0]=2; coord[3][1]=5; coord[4][0]=1; coord[4][1]=7; } - H5Sselect_elements(sid1,H5S_SELECT_SET,5,(const hsize_t **)coord); + H5Sselect_elements(sid1,H5S_SELECT_SET,5,coord); H5Sget_select_npoints(sid1); /* store second dataset region */ diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 4415bd7..216a38d 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -1735,7 +1735,7 @@ static void gent_datareg(void) coord1[7][0]=9; coord1[7][1]=0; coord1[8][0]=7; coord1[8][1]=1; coord1[9][0]=3; coord1[9][1]=3; - H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,(const hsize_t **)coord1); + H5Sselect_elements(sid2,H5S_SELECT_SET,POINT1_NPOINTS,coord1); H5Sget_select_npoints(sid2); -- cgit v0.12