diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-12 17:22:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-12 17:22:29 (GMT) |
| commit | e2c3ecd82527f17b08a2b2b5b11404fecfb3645e (patch) | |
| tree | a1a76b0f600d7b1267a03de15fc30915d262ab45 /src/H5Pdxpl.c | |
| parent | a8a8652ebd5de474abc1b4afd4f7ea0834636ec7 (diff) | |
| download | hdf5-e2c3ecd82527f17b08a2b2b5b11404fecfb3645e.zip hdf5-e2c3ecd82527f17b08a2b2b5b11404fecfb3645e.tar.gz hdf5-e2c3ecd82527f17b08a2b2b5b11404fecfb3645e.tar.bz2 | |
[svn-r24785] Description:
Bring r24769 & r24772 from trunk to 1.8 branch:
Check in Mohamad's changes to support collective I/O on point selections,
along with some other minor cleanups.
Correct some dynamically sized arrays that fail on Windows.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/parallel
(And has been through the daily test regime on the trunk)
Diffstat (limited to 'src/H5Pdxpl.c')
| -rw-r--r-- | src/H5Pdxpl.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index b142e22..9e25a59 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -135,7 +135,7 @@ #define H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF 0 #define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_SIZE sizeof(hsize_t *) #define H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF NULL -#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE sizeof(size_t) +#define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_SIZE sizeof(uint32_t) #define H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF 0 /******************/ @@ -188,6 +188,11 @@ const H5P_libclass_t H5P_CLS_DXFR[1] = {{ /*****************************/ +/***************************/ +/* Local Private Variables */ +/***************************/ + + /*------------------------------------------------------------------------- * Function: H5P__dxfr_reg_prop @@ -232,7 +237,7 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass) hbool_t direct_chunk_flag = H5D_XFER_DIRECT_CHUNK_WRITE_FLAG_DEF; /* Default value for the flag of direct chunk write */ uint32_t direct_chunk_filters = H5D_XFER_DIRECT_CHUNK_WRITE_FILTERS_DEF; /* Default value for the filters of direct chunk write */ hsize_t *direct_chunk_offset = H5D_XFER_DIRECT_CHUNK_WRITE_OFFSET_DEF; /* Default value for the offset of direct chunk write */ - size_t direct_chunk_datasize = H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF; /* Default value for the datasize of direct chunk write */ + uint32_t direct_chunk_datasize = H5D_XFER_DIRECT_CHUNK_WRITE_DATASIZE_DEF; /* Default value for the datasize of direct chunk write */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -362,8 +367,6 @@ done: } /* end H5P__dxfr_reg_prop() */ - - /*------------------------------------------------------------------------- * Function: H5P_dxfr_xform_del * @@ -1098,8 +1101,9 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle, H5TRACE4("e", "iddd", plist_id, left, middle, right); /* Check arguments */ - if(left < 0.0 || left > 1.0 || middle < 0.0 || middle > 1.0 || - right < 0.0 || right > 1.0) + if(left < (double)0.0f || left > (double)1.0f + || middle < (double)0.0f || middle > (double)1.0f + || right < (double)0.0f || right > (double)1.0f) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "split ratio must satisfy 0.0<=X<=1.0") /* Get the plist structure */ |