summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-09-27 21:50:00 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-09-27 21:50:00 (GMT)
commit279a3f915b6ddad529553ab9dd91e968ff7244e7 (patch)
tree3a16a351b36bdf23f7b5468db95c1d821739c8b1
parenta19de0ec83487963316085e0ea6bcea38aa2f0ae (diff)
parenta8a55f3c4863b500c4d0e5a2982d3e2b5a05b3cc (diff)
downloadhdf5-279a3f915b6ddad529553ab9dd91e968ff7244e7.zip
hdf5-279a3f915b6ddad529553ab9dd91e968ff7244e7.tar.gz
hdf5-279a3f915b6ddad529553ab9dd91e968ff7244e7.tar.bz2
Merge pull request #1956 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'a8a55f3c4863b500c4d0e5a2982d3e2b5a05b3cc': Corrected missing parallel #ifdefs.
-rw-r--r--src/H5VLnative_file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5VLnative_file.c b/src/H5VLnative_file.c
index bb77822..1cb7533 100644
--- a/src/H5VLnative_file.c
+++ b/src/H5VLnative_file.c
@@ -789,6 +789,7 @@ H5VL__native_file_optional(void *obj, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR
break;
}
+#ifdef H5_HAVE_PARALLEL
/* H5Fget_mpi_atomicity */
case H5VL_NATIVE_FILE_GET_MPI_ATOMICITY:
{
@@ -806,6 +807,7 @@ H5VL__native_file_optional(void *obj, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR
HGOTO_ERROR(H5E_FILE, H5E_CANTSET, FAIL, "cannot set MPI atomicity");
break;
}
+#endif /* H5_HAVE_PARALLEL */
default:
HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "invalid optional operation")