summaryrefslogtreecommitdiffstats
path: root/src/H5public.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-09-17 19:07:00 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-09-17 19:07:00 (GMT)
commitab52a0effa605ad6d75cb77cf708bba795cba641 (patch)
treeaf69481dd77ac3c731b9dd264e451b940f7f54c9 /src/H5public.h
parent046e6e8770212dc020279aba1d7a5c9aa5ec5913 (diff)
parentf5a84c9856888446e329dd36bff842e5a2db708c (diff)
downloadhdf5-ab52a0effa605ad6d75cb77cf708bba795cba641.zip
hdf5-ab52a0effa605ad6d75cb77cf708bba795cba641.tar.gz
hdf5-ab52a0effa605ad6d75cb77cf708bba795cba641.tar.bz2
Merge pull request #1927 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit 'f5a84c9856888446e329dd36bff842e5a2db708c': Added MPICH_SKIP_MPICXX and OMPI_SKIP_CXX to H5public.h to avoid inadvertant linking to the deprecated MPI C++ wrappers. Fixes HDFFV-10893.
Diffstat (limited to 'src/H5public.h')
-rw-r--r--src/H5public.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/H5public.h b/src/H5public.h
index a7e21f6..b79fcfb 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -57,6 +57,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>