From fa71f922472f3fb79fa2242728f8bc200091b4b9 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 18 Sep 2019 14:31:39 -0700 Subject: Merged HDFFV-10893 (inappropriate MPI C++ linkage) to 1.8. --- release_docs/RELEASE.txt | 12 ++++++++++++ src/H5public.h | 3 +++ 2 files changed, 15 insertions(+) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 261d872..21538cb 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -228,6 +228,18 @@ Bug Fixes since HDF5-1.8.21 (ADB - 2018/09/05, HDFFV-9059) + - Inappropriate linking with deprecated MPI C++ libraries + + HDF5 does not define *_SKIP_MPICXX in the public headers, so applications + can inadvertently wind up linking to the deprecated MPI C++ wrappers. + + MPICH_SKIP_MPICXX and OMPI_SKIP_MPICXX have both been defined in H5public.h + so this should no longer be an issue. HDF5 makes no use of the deprecated + MPI C++ wrappers. + + (DER - 2019/09/17, HDFFV-10893) + + Parallel Library ---------------- - None 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 #endif #ifdef H5_HAVE_PARALLEL +/* Don't link against MPI C++ bindings */ +# define MPICH_SKIP_MPICXX 1 +# define OMPI_SKIP_MPICXX 1 # include #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ # include -- cgit v0.12