diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-19 13:48:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-19 13:48:02 (GMT) |
| commit | 1d147ef21f7e690ba89176029eadafc380a15408 (patch) | |
| tree | 590f2f077dc3a45a4d9401d1f3a2cce46f2eeef0 /src | |
| parent | efaf7dea67a8c861123952c37e5cf6ac210116e9 (diff) | |
| parent | fb05ff4c4a392d38a45e79fe461bc690dea6f325 (diff) | |
| download | hdf5-1d147ef21f7e690ba89176029eadafc380a15408.zip hdf5-1d147ef21f7e690ba89176029eadafc380a15408.tar.gz hdf5-1d147ef21f7e690ba89176029eadafc380a15408.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'fb05ff4c4a392d38a45e79fe461bc690dea6f325':
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> |