abi: fix problems with error handler converters

Fix problem with the abi -> ompi and ompi -> abi
converters for errhandler handles.

Also fix the bindings code where the original problem
was.  We aren't using the bindings framework now to
generate the converters but we may possibly return
to that approach at some point so fix that code in
this commit.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/ompi_bindings/consts.py

@@ -194,6 +194,9 @@
 
 RESERVED_ERRHANDLERS = [
     'MPI_ERRHANDLER_NULL',
+    'MPI_ERRHANDLER_ARE_FATAL',
+    'MPI_ERRHANDLER_ABORT',
+    'MPI_ERRHANDLER_RETURN',
 ]
 
 IGNORED_STATUS_HANDLES = [

ompi/mpi/c/abi_converters.h

@@ -433,13 +433,25 @@ __opal_attribute_always_inline__ static inline MPI_Errhandler ompi_convert_abi_e
 {
     if (MPI_ERRHANDLER_NULL_ABI_INTERNAL == errorhandler) {
         return MPI_ERRHANDLER_NULL;
+    } else if (MPI_ERRORS_ARE_FATAL_ABI_INTERNAL == errorhandler) {
+        return MPI_ERRORS_ARE_FATAL;
+    } else if (MPI_ERRORS_ABORT_ABI_INTERNAL == errorhandler) {
+        return MPI_ERRORS_ABORT;
+    } else  if (MPI_ERRORS_RETURN_ABI_INTERNAL == errorhandler) {
+        return MPI_ERRORS_RETURN;
     }
     return (MPI_Errhandler) errorhandler;
 }
 __opal_attribute_always_inline__ static inline MPI_Errhandler_ABI_INTERNAL ompi_convert_intern_errorhandler_abi_errorhandler(MPI_Errhandler errorhandler)
 {
     if (MPI_ERRHANDLER_NULL == errorhandler) {
         return MPI_ERRHANDLER_NULL_ABI_INTERNAL;
+    } else if (MPI_ERRORS_ARE_FATAL == errorhandler) {
+        return MPI_ERRORS_ARE_FATAL_ABI_INTERNAL;
+    } else if (MPI_ERRORS_ABORT == errorhandler) {
+        return MPI_ERRORS_ABORT_ABI_INTERNAL;
+    } else  if (MPI_ERRORS_RETURN == errorhandler) {
+        return MPI_ERRORS_RETURN_ABI_INTERNAL;
     }
     return (MPI_Errhandler_ABI_INTERNAL) errorhandler;
 }