ompi: remove C++ bindings

The C++ bindings were removed from the MPI standard in MPI-3.0 back in
2012. This commit removes them but leaves the glue necessary to build
mpicxx. Additional cleanup is probably needed.

Signed-off-by: Nathan Hjelm <[email protected]>

Author: hjelmn

Makefile.ompi-rules

@@ -9,9 +9,6 @@
 #
 
 TRIM_OPTIONS=
-if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
-    TRIM_OPTIONS += --nocxx
-endif
 if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
     TRIM_OPTIONS += --nofortran
 endif

config/ompi_setup_cxx.m4

@@ -58,10 +58,6 @@ AC_DEFUN([OMPI_SETUP_CXX],[
     _OMPI_CXX_CHECK_BUILTIN
 
     _OMPI_CXX_CHECK_2D_CONST_CAST
-
-    AM_CONDITIONAL(OMPI_BUILD_MPI_CXX_BINDINGS, [test "$WANT_MPI_CXX_SUPPORT" = 1])
-    AC_DEFINE_UNQUOTED(OMPI_BUILD_CXX_BINDINGS, $WANT_MPI_CXX_SUPPORT,
-        [Whether we want MPI C++ support or not])
 ])
 
 # _OMPI_SETUP_CXX_COMPILER()

config/opal_setup_cxx.m4

@@ -189,18 +189,6 @@ EOF
          AC_MSG_ERROR([C and C++ compilers are not link compatible.  Can not continue.])])
     fi
 
-    # If we are on HP-UX, ensure that we're using aCC
-    case "$host" in
-    *hpux*)
-        if test "$BASECXX" = "CC"; then
-            AC_MSG_WARN([*** You will probably have problems compiling the MPI 2])
-            AC_MSG_WARN([*** C++ bindings with the HP-UX CC compiler.  You should])
-            AC_MSG_WARN([*** probably be using the aCC compiler.  Re-run configure])
-            AC_MSG_WARN([*** with the environment variable "CXX=aCC".])
-        fi
-        ;;
-    esac
-
     # Note: gcc-imperonating compilers accept -O3
     if test "$WANT_DEBUG" = "1"; then
         OPTFLAGS=

configure.ac

@@ -534,9 +534,6 @@ OPAL_CHECK_OFFSETOF
 # OPAL...?  Shrug.
 m4_ifdef([project_ompi], [OPAL_SETUP_CXX
                           OMPI_SETUP_CXX])
-# Used in Makefile.ompi-rules
-AM_CONDITIONAL(MAN_PAGE_BUILD_MPI_CXX_BINDINGS,
-               [test "$WANT_MPI_CXX_SUPPORT" = 1])
 
 ##################################
 # Only after setting up both

ompi/Makefile.am

@@ -85,7 +85,6 @@ SUBDIRS = \
         $(MCA_ompi_FRAMEWORKS_SUBDIRS) \
         $(MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
         . \
-        mpi/cxx \
         $(OMPI_MPIEXT_MPIFH_DIRS) \
         mpi/fortran/mpif-h \
         $(OMPI_MPIEXT_USEMPI_DIR) \
@@ -114,7 +113,6 @@ DIST_SUBDIRS = \
         etc \
         mpi/c \
         mpi/tool \
-        mpi/cxx \
         mpi/fortran/base \
         mpi/fortran/mpif-h \
         mpi/fortran/use-mpi-tkr \

ompi/include/mpi.h.in

@@ -160,15 +160,6 @@
 /* type to use for ptrdiff_t, if it does not exist, set to ptrdiff_t if it does exist */
 #undef ptrdiff_t
 
-/* Whether we want MPI cxx support or not */
-#undef OMPI_BUILD_CXX_BINDINGS
-
-/* do we want to try to work around C++ bindings SEEK_* issue? */
-#undef OMPI_WANT_MPI_CXX_SEEK
-
-/* Whether a const_cast on a 2-d array will work with the C++ compiler */
-#undef OMPI_CXX_SUPPORTS_2D_CONST_CAST
-
 /* Whether OMPI was built with parameter checking or not */
 #undef OMPI_PARAM_CHECK
 
@@ -177,9 +168,6 @@
 #undef OMPI_WANT_MPI_INTERFACE_WARNING
 #endif
 
-/* Whether or not we have compiled with C++ exceptions support */
-#undef OMPI_HAVE_CXX_EXCEPTION_SUPPORT
-
 /* Major, minor, and release version of Open MPI */
 #undef OMPI_MAJOR_VERSION
 #undef OMPI_MINOR_VERSION
@@ -247,10 +235,7 @@
  * only relevant if we're not building Open MPI (i.e., we're compiling an
  * MPI application).
  */
-#if !(OMPI_BUILDING || \
-      (defined(OMPI_BUILDING_CXX_BINDINGS_LIBRARY) && \
-       OMPI_BUILDING_CXX_BINDINGS_LIBRARY))
-
+#if !OMPI_BUILDING
      /*
       * Figure out which compiler is being invoked (in order to compare if
       * it was different than what OMPI was built with).
@@ -2568,18 +2553,4 @@ OMPI_DECLSPEC  int MPI_T_enum_get_item(MPI_T_enum enumtype, int index, int *valu
 }
 #endif
 
-/*
- * Conditional MPI 2 C++ bindings support.  Include if:
- *   - The user does not explicitly request us to skip it (when a C++ compiler
- *       is used to compile C code).
- *   - We want C++ bindings support
- *   - We are not building OMPI itself
- *   - We are using a C++ compiler
- */
-#if !defined(OMPI_SKIP_MPICXX) && OMPI_BUILD_CXX_BINDINGS && !OMPI_BUILDING
-#if defined(c_plusplus) || defined(__cplusplus)
-#include "openmpi/ompi/mpi/cxx/mpicxx.h"
-#endif
-#endif
-
 #endif /* OMPI_MPI_H */