mpi: mark MPI_COMBINER_{HVECTOR,HINDEXED,STRUCT}_INTEGER removed

unless configure'd with --enable-mpi1-compatibility

Thanks Lisandro Dalcin for reporting this.

BWB Note: This patch was originally applied directly to v4.0.x in
e2638db, but now needs to be added to master, as we are keeping
the 4.x mpi1-compat behavior.

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Signed-off-by: Brian Barrett <bbarrett@amazon.com>

Author: ggouaillardet

ompi/include/mpi.h.in

@@ -765,13 +765,25 @@ enum {
   MPI_COMBINER_DUP,
   MPI_COMBINER_CONTIGUOUS,
   MPI_COMBINER_VECTOR,
+#if (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
   MPI_COMBINER_HVECTOR_INTEGER,
+#else
+  OMPI_WAS_MPI_COMBINER_HVECTOR_INTEGER, /* preserve ABI compatibility */
+#endif
   MPI_COMBINER_HVECTOR,
   MPI_COMBINER_INDEXED,
+#if (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
   MPI_COMBINER_HINDEXED_INTEGER,
+#else
+  OMPI_WAS_MPI_COMBINER_HINDEXED_INTEGER, /* preserve ABI compatibility */
+#endif
   MPI_COMBINER_HINDEXED,
   MPI_COMBINER_INDEXED_BLOCK,
+#if (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
   MPI_COMBINER_STRUCT_INTEGER,
+#else
+  OMPI_WAS_MPI_COMBINER_STRUCT_INTEGER, /* preserve ABI compatibility */
+#endif
   MPI_COMBINER_STRUCT,
   MPI_COMBINER_SUBARRAY,
   MPI_COMBINER_DARRAY,
@@ -782,6 +794,20 @@ enum {
   MPI_COMBINER_HINDEXED_BLOCK
 };
 
+#if (OMPI_ENABLE_MPI1_COMPAT || OMPI_BUILDING)
+#else
+/* If not building or configured --enable-mpi1-compatibility, then
+ * we don't want these datatypes, instead we define MPI_COMBINER_*_INTEGER
+ * to our Static Assert message if the compiler supports
+ * that staticly assert with a nice message.
+ */
+#    if (OMPI_REMOVED_USE_STATIC_ASSERT)
+#        define MPI_COMBINER_HVECTOR_INTEGER THIS_SYMBOL_WAS_REMOVED_IN_MPI30(MPI_COMBINER_HVECTOR_INTEGER, MPI_COMBINER_HVECTOR);
+#        define MPI_COMBINER_HINDEXED_INTEGER THIS_SYMBOL_WAS_REMOVED_IN_MPI30(MPI_COMBINER_HINDEXED_INTEGER, MPI_COMBINER_HINDEXED);
+#        define MPI_COMBINER_STRUCT_INTEGER THIS_SYMBOL_WAS_REMOVED_IN_MPI30(MPI_COMBINER_STRUCT_INTEGER, MPI_COMBINER_STRUCT);
+#    endif /* OMPI_REMOVED_USE_STATIC_ASSERT */
+#endif /* Removed datatypes */
+
 /*
  * Communicator split type constants.
  * Do not change the order of these without also modifying mpif.h.in