diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-09-18 20:02:04 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-09-18 20:02:04 (GMT) |
| commit | fb05ff4c4a392d38a45e79fe461bc690dea6f325 (patch) | |
| tree | e5052cb7b1428f2cdccef587e82a94dc9eb3a0c8 /src | |
| parent | 2ca63e3890ebdaee7dc835e5d995ff03a182940f (diff) | |
| parent | 71c80267ba0db1c1b439d39e4bd7c27b82510c92 (diff) | |
| download | hdf5-fb05ff4c4a392d38a45e79fe461bc690dea6f325.zip hdf5-fb05ff4c4a392d38a45e79fe461bc690dea6f325.tar.gz hdf5-fb05ff4c4a392d38a45e79fe461bc690dea6f325.tar.bz2 | |
Merge pull request #1928 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_minor_pr to hdf5_1_10
* commit '71c80267ba0db1c1b439d39e4bd7c27b82510c92':
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')
| -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 4067b39..baf5e10 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> |