diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-19 00:01:55 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-19 00:01:55 (GMT) |
| commit | 02eab2eb72a18fa685545ba7c7c5ac7715693d1b (patch) | |
| tree | e3e544b36e7eb3900b78e0dbd0f6a574aef7ca97 /test/h5test.c | |
| parent | 99ceb100fe1d24ccd7a01b8b3139aa5efadab4b1 (diff) | |
| download | hdf5-02eab2eb72a18fa685545ba7c7c5ac7715693d1b.zip hdf5-02eab2eb72a18fa685545ba7c7c5ac7715693d1b.tar.gz hdf5-02eab2eb72a18fa685545ba7c7c5ac7715693d1b.tar.bz2 | |
[svn-r25328] Bring revisions #24851 - 24948 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
Diffstat (limited to 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/h5test.c b/test/h5test.c index 3b7bfbe..9fe05ae 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -273,7 +273,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) char *ptr, last = '\0'; size_t i, j; hid_t driver = -1; - int isppdriver = 0; /* if the driver is MPI parallel */ + int isppdriver = 0; /* if the driver is MPI parallel */ if (!base_name || !fullname || size < 1) return NULL; @@ -294,7 +294,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size) /* Must first check fapl is not H5P_DEFAULT (-1) because H5FD_XXX * could be of value -1 if it is not defined. */ - isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO==driver || H5FD_MPIPOSIX==driver); + isppdriver = H5P_DEFAULT != fapl && (H5FD_MPIO==driver); /* Check HDF5_NOCLEANUP environment setting. * (The #ifdef is needed to prevent compile failure in case MPI is not @@ -863,7 +863,7 @@ h5_get_file_size(const char *filename, hid_t fapl) /* Check for simple cases */ if(driver == H5FD_SEC2 || driver == H5FD_STDIO || driver == H5FD_CORE || #ifdef H5_HAVE_PARALLEL - driver == H5FD_MPIO || driver == H5FD_MPIPOSIX || + driver == H5FD_MPIO || #endif /* H5_HAVE_PARALLEL */ #ifdef H5_HAVE_WINDOWS driver == H5FD_WINDOWS || |