ompi/errhandler: silence warnings

ISO C forbids mixing object pointer and function pointer

(cherry picked from commit b95e243)

Author: ggouaillardet

ompi/errhandler/errhandler.h

@@ -15,6 +15,8 @@
  * Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -94,7 +96,7 @@ struct ompi_errhandler_t;
  * C++ invocation function signature
  */
 typedef void (ompi_errhandler_cxx_dispatch_fn_t)(void *handle, int *err_code,
-                                                 const char *message, void *fn);
+                                                 const char *message, ompi_errhandler_generic_handler_fn_t *fn);
 
 /**
  * Back-end type for MPI_Errorhandler.

ompi/errhandler/errhandler_invoke.c

@@ -14,6 +14,8 @@
  * Copyright (c) 2012      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2016      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -58,7 +60,7 @@ int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
 
         case OMPI_ERRHANDLER_LANG_CXX:
             errhandler->eh_cxx_dispatch_fn(&comm, &err_code, message,
-                                           errhandler->eh_comm_fn);
+                                           (ompi_errhandler_generic_handler_fn_t *)errhandler->eh_comm_fn);
             break;
 
         case OMPI_ERRHANDLER_LANG_FORTRAN:
@@ -78,7 +80,7 @@ int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
 
         case OMPI_ERRHANDLER_LANG_CXX:
             errhandler->eh_cxx_dispatch_fn(&win, &err_code, message,
-                                           errhandler->eh_win_fn);
+                                           (ompi_errhandler_generic_handler_fn_t *)errhandler->eh_win_fn);
             break;
 
         case OMPI_ERRHANDLER_LANG_FORTRAN:
@@ -98,7 +100,7 @@ int ompi_errhandler_invoke(ompi_errhandler_t *errhandler, void *mpi_object,
 
         case OMPI_ERRHANDLER_LANG_CXX:
             errhandler->eh_cxx_dispatch_fn(&file, &err_code, message,
-                                           errhandler->eh_file_fn);
+                                           (ompi_errhandler_generic_handler_fn_t *)errhandler->eh_file_fn);
             break;
 
         case OMPI_ERRHANDLER_LANG_FORTRAN:

ompi/mpi/cxx/cxx_glue.h

@@ -15,6 +15,7 @@
 #define OMPI_CXX_COMM_GLUE_H
 
 #include "ompi_config.h"
+#include "ompi/errhandler/errhandler.h"
 #include <stdlib.h>
 
 #include "mpi.h"
@@ -47,7 +48,7 @@ extern struct ompi_predefined_errhandler_t ompi_mpi_errors_throw_exceptions;
  * C++ invocation function signature
  */
 typedef void (ompi_errhandler_cxx_dispatch_fn_t)(void *handle, int *err_code,
-                                                 const char *message, void *fn);
+                                                 const char *message, ompi_errhandler_generic_handler_fn_t *fn);
 
 ompi_cxx_communicator_type_t ompi_cxx_comm_get_type (MPI_Comm comm);