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/H5Fmpi.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/H5Fmpi.c')
| -rw-r--r-- | src/H5Fmpi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c index 4d3ca34..39b8dfa 100644 --- a/src/H5Fmpi.c +++ b/src/H5Fmpi.c @@ -208,8 +208,8 @@ H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") /* Check VFD */ - if(!IS_H5FD_MPIO(file)) - HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, must use MPI-I/O driver") + if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI)) + HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode") /* set atomicity value */ if (H5FD_set_mpio_atomicity (file->shared->lf, flag) < 0) @@ -248,8 +248,8 @@ H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID") /* Check VFD */ - if(!IS_H5FD_MPIO(file)) - HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, must use MPI-I/O driver") + if(!H5F_HAS_FEATURE(file, H5FD_FEAT_HAS_MPI)) + HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "incorrect VFL driver, does not support MPI atomicity mode") /* get atomicity value */ if (H5FD_get_mpio_atomicity (file->shared->lf, flag) < 0) |