diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-09-18 21:50:48 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-09-18 21:50:48 (GMT) |
| commit | 2fb996a960dc4a9c61f6a21662862d0a42cb5378 (patch) | |
| tree | 6bbef9e4ce691ed6df83f40e56a79de9cddc325d /src/H5public.h | |
| parent | 421a0c350c3e5b2dc5c544d2c83eae4cd44a9848 (diff) | |
| parent | fa71f922472f3fb79fa2242728f8bc200091b4b9 (diff) | |
| download | hdf5-2fb996a960dc4a9c61f6a21662862d0a42cb5378.zip hdf5-2fb996a960dc4a9c61f6a21662862d0a42cb5378.tar.gz hdf5-2fb996a960dc4a9c61f6a21662862d0a42cb5378.tar.bz2 | |
Merge pull request #1933 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_8_minor_pr to hdf5_1_8
* commit 'fa71f922472f3fb79fa2242728f8bc200091b4b9':
Merged HDFFV-10893 (inappropriate MPI C++ linkage) to 1.8.
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5public.h b/src/H5public.h index 20c611a..d9d7449 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -56,6 +56,9 @@ # include <stddef.h> #endif #ifdef H5_HAVE_PARALLEL +/* Don't link against MPI C++ bindings */ +# define MPICH_SKIP_MPICXX 1 +# define OMPI_SKIP_MPICXX 1 # include <mpi.h> #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ # include <mpio.h> |