From 7223334d4dc1225d49cd2c63714870c3a04ad953 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 28 Sep 2018 07:39:55 -0700 Subject: [PATCH] mpi.h: remove MPI_UB/MPI_LB when not enabling MPI-1 compat When --enable-mpi1-compatibility was specified, the ompi_mpi_ub/lb symbols were #if'ed out of mpi.h. But the #defines for MPI_UB/LB still remained. This commit also #if's out the MPI_UB/LB macros when --enable-mpi1-compatibility is specified. Signed-off-by: Jeff Squyres --- ompi/include/mpi.h.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in index f4f3004bc1..7dd97cf7ec 100644 --- a/ompi/include/mpi.h.in +++ b/ompi/include/mpi.h.in @@ -1088,8 +1088,13 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_ub __mpi_interfa #define MPI_LONG_INT OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_long_int) #define MPI_SHORT_INT OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_short_int) #define MPI_2INT OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_2int) +#if !OMPI_OMIT_MPI1_COMPAT_DECLS +/* + * Removed datatypes + */ #define MPI_UB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_ub) #define MPI_LB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_lb) +#endif #define MPI_WCHAR OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_wchar) #if OPAL_HAVE_LONG_LONG #define MPI_LONG_LONG_INT OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_long_long_int)