diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-12-02 20:25:14 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-12-02 20:25:14 (GMT) |
| commit | 2990a638d2edb84c4f189638b8d6a64e20720d81 (patch) | |
| tree | f69bcb0ff762cd816b7363565f682d36f629d2d1 | |
| parent | a0d3801251c45ec3918e2ad9367c6f85022ef997 (diff) | |
| parent | e1026bd354443ae9c4e0cf197feb7191920c9f13 (diff) | |
| download | hdf5-2990a638d2edb84c4f189638b8d6a64e20720d81.zip hdf5-2990a638d2edb84c4f189638b8d6a64e20720d81.tar.gz hdf5-2990a638d2edb84c4f189638b8d6a64e20720d81.tar.bz2 | |
Merge pull request #184 in HDFFV/hdf5 from ~KOZIOL/hdf5:develop_swmr_merge_02 to develop
Merged minor fixes from revise_chunks.
* commit 'e1026bd354443ae9c4e0cf197feb7191920c9f13':
Correct oversight in Java test and remove direct VFD from SWMR supported drivers.
| -rw-r--r-- | java/test/TestH5Pfapl.java | 1 | ||||
| -rw-r--r-- | src/H5FDtest.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/test/TestH5Pfapl.java b/java/test/TestH5Pfapl.java index 8f15648..e888e20 100644 --- a/java/test/TestH5Pfapl.java +++ b/java/test/TestH5Pfapl.java @@ -16,6 +16,7 @@ package test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/src/H5FDtest.c b/src/H5FDtest.c index 9d2f2e9..fc9188b 100644 --- a/src/H5FDtest.c +++ b/src/H5FDtest.c @@ -109,8 +109,7 @@ H5FD_supports_swmr_test(const char *vfd_name) if(!vfd_name || !HDstrcmp(vfd_name, "")) ret_value = TRUE; else - ret_value = !HDstrcmp(vfd_name, "direct") - || !HDstrcmp(vfd_name, "log") + ret_value = !HDstrcmp(vfd_name, "log") || !HDstrcmp(vfd_name, "sec2"); FUNC_LEAVE_NOAPI(ret_value) |