diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2000-10-10 20:55:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2000-10-10 20:55:54 (GMT) |
| commit | 64b8f7fd738aec5c4683cdd457fbbf334c0b7bba (patch) | |
| tree | 6d3e6b39b1550241071c338ee01d1124a22e96b1 /src/H5Farray.c | |
| parent | 46434499668593bb2421a58365700e53c128cb10 (diff) | |
| download | hdf5-64b8f7fd738aec5c4683cdd457fbbf334c0b7bba.zip hdf5-64b8f7fd738aec5c4683cdd457fbbf334c0b7bba.tar.gz hdf5-64b8f7fd738aec5c4683cdd457fbbf334c0b7bba.tar.bz2 | |
[svn-r2657]
Purpose:
Parallel Bug Fixes
Description:
Was out of sync with header file re-arrangements I checked in last night.
Solution:
Fixed to use new header files, etc.
Platforms tested:
O2K (modi4)
Diffstat (limited to 'src/H5Farray.c')
| -rw-r--r-- | src/H5Farray.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Farray.c b/src/H5Farray.c index 798be54..aeb4c03 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -149,7 +149,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, H5FD_mpio_xfer_t xfer_mode=H5FD_MPIO_INDEPENDENT; #endif #ifdef COALESCE_READS - H5F_xfer_t *xfer_parms; /*transfer property list*/ + H5D_xfer_t *xfer_parms; /*transfer property list*/ #endif FUNC_ENTER(H5F_arr_read, FAIL); @@ -169,7 +169,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, #ifdef H5_HAVE_PARALLEL { /* Get the transfer mode */ - H5F_xfer_t *dxpl; + H5D_xfer_t *dxpl; H5FD_mpio_dxpl_t *dx; if (H5P_DEFAULT!=dxpl_id && (dxpl=H5I_object(dxpl_id)) && H5FD_MPIO==dxpl->driver_id && (dx=dxpl->driver_info) && @@ -281,7 +281,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, #ifdef COALESCE_READS /* Get the dataset transfer property list */ if (H5P_DEFAULT == dxpl_id) { - xfer_parms = &H5F_xfer_dflt; + xfer_parms = &H5D_xfer_dflt; } else if (H5P_DATA_XFER != H5P_get_class (dxpl_id) || NULL == (xfer_parms = H5I_object (dxpl_id))) { HRETURN_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms"); @@ -385,7 +385,7 @@ printf("%s: feature_flags=%lx\n",FUNC,(unsigned long)f->shared->lf->feature_flag * * Robb Matzke, 1998-09-28 * Added `xfer' argument, removed `xfer_mode' argument since it - * is a member of H5F_xfer_t. + * is a member of H5D_xfer_t. * * Robb Matzke, 1999-08-02 * Data transfer properties are passed by ID since that's how @@ -434,7 +434,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const struct H5O_layout_t *layout, #ifdef H5_HAVE_PARALLEL { /* Get the transfer mode */ - H5F_xfer_t *dxpl; + H5D_xfer_t *dxpl; H5FD_mpio_dxpl_t *dx; if (H5P_DEFAULT!=dxpl_id && (dxpl=H5I_object(dxpl_id)) && H5FD_MPIO==dxpl->driver_id && (dx=dxpl->driver_info) && |