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

[svn-r19099] Description:

Browse Source 
Fix const pointer issues for projection construction routine and also
bump time before alarm kicks in to terminate a test from 20 minutes to 30
minutes, to give the PGI compiler tests w/debugging enabled a chance to finish.

Tested on:
	Mac OS X/32 10.6.4 (amazon) w/debug
	Linux/32 2.6.18 (jam) w/PGI & debug
This commit is contained in:
Quincey Koziol 2010-07-19 12:53:10 -05:00
parent 5a1cb3c7a6
commit a67794b1bc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5Sprivate.h
View File

@ -221,7 +221,7 @@ H5_DLL herr_t H5S_select_copy(H5S_t *dst, const H5S_t *src, hbool_t share_select
H5_DLL htri_t H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2);
H5_DLL herr_t H5S_select_construct_projection(const H5S_t *base_space,
H5S_t **new_space_ptr, unsigned new_space_rank, const void *buf,
void **adj_buf_ptr, hsize_t element_size);
void const **adj_buf_ptr, hsize_t element_size);
H5_DLL herr_t H5S_select_release(H5S_t *ds);
H5_DLL herr_t H5S_select_get_seq_list(const H5S_t *space, unsigned flags,
H5S_sel_iter_t *iter, size_t maxseq, size_t maxbytes,

4
src/H5Sselect.c
View File

@ -1756,7 +1756,7 @@ done:
--------------------------------------------------------------------------*/
herr_t
H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
unsigned new_space_rank, const void *buf, void **adj_buf_ptr, hsize_t element_size)
unsigned new_space_rank, const void *buf, void const **adj_buf_ptr, hsize_t element_size)
{
H5S_t * new_space = NULL; /* New dataspace constructed */
hsize_t base_space_dims[H5S_MAX_RANK]; /* Current dimensions of base dataspace */
@ -1944,7 +1944,7 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
* value to the type cast buf pointer, cast the result back
* to a pointer to void, and assign the result to *adj_buf_ptr.
*/
*adj_buf_ptr = (void *)(((const uint8_t *)buf) +
*adj_buf_ptr = (const void *)(((const uint8_t *)buf) +
((size_t)(projected_space_element_offset * element_size)));
} /* end if */
else

2
test/h5test.h
View File

@ -118,7 +118,7 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */
/*
* Alarm definitions to wait up (terminate) a test that runs too long.
*/
#define alarm_seconds 1200 /* default is 20 minutes */
#define alarm_seconds 1800 /* default is 30 minutes */
#define ALARM_ON HDalarm(alarm_seconds)
#define ALARM_OFF HDalarm(0)
/* set alarms to N seconds if N > 0, else use default alarm_seconds. */