diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 21:00:22 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-01-21 21:00:22 (GMT) |
| commit | 4b9ee6b88b3415baa684c9a2d0fb9379f7687768 (patch) | |
| tree | e0542599f2be5c9f804108fabeb7d1c4d05322e3 /src/H5Dmpio.c | |
| parent | e8e06cbca06eba0ff1107caf7f4cbeb1f0f835c6 (diff) | |
| download | hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.zip hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.tar.gz hdf5-4b9ee6b88b3415baa684c9a2d0fb9379f7687768.tar.bz2 | |
[svn-r25996] - merge changes from trunk to eliminate usage of IS_H5FD_MPI Macro.
- add 2 missing feature flags for VFDs: H5FD_FEAT_HAS_MPI & H5FD_FEAT_ALLOCATE_EARLY and use them as appropriate.
tested with h5commitest
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 88c6075..58bcc04 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -474,7 +474,7 @@ H5D__contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_ FUNC_ENTER_PACKAGE /* Sanity check */ - HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file)); + HDassert(H5FD_MPIO == H5F_DRIVER_ID(io_info->dset->oloc.file)); HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER)); /* Call generic internal collective I/O routine */ @@ -521,7 +521,7 @@ H5D__contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type FUNC_ENTER_PACKAGE /* Sanity check */ - HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file)); + HDassert(H5FD_MPIO == H5F_DRIVER_ID(io_info->dset->oloc.file)); HDassert(TRUE == H5P_isa_class(io_info->dxpl_id, H5P_DATASET_XFER)); /* Call generic internal collective I/O routine */ |