just set the fortran flag, if we do not set a predefined error handler
This commit was SVN r2861.
Этот коммит содержится в:
родитель
40c0b6b12d
Коммит
f41337cb8f
@ -7,6 +7,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mpi.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "mpi/f77/bindings.h"
|
||||
|
||||
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
|
||||
@ -56,4 +57,8 @@ void mpi_comm_set_errhandler_f(MPI_Fint *comm, MPI_Fint *errhandler,
|
||||
c_errhandler = MPI_Errhandler_f2c(*errhandler);
|
||||
|
||||
*ierr = OMPI_INT_2_FINT(MPI_Comm_set_errhandler(c_comm, c_errhandler));
|
||||
if ( MPI_SUCCESS == *ierr &&
|
||||
OMPI_ERRHANDLER_TYPE_PREDEFINED != c_errhandler->eh_mpi_object_type ) {
|
||||
c_errhandler->eh_fortran_function = true ;
|
||||
}
|
||||
}
|
||||
|
@ -56,7 +56,8 @@ void mpi_errhandler_set_f(MPI_Fint *comm, MPI_Fint *errhandler, MPI_Fint *ierr)
|
||||
c_errhandler = MPI_Errhandler_f2c(*errhandler);
|
||||
|
||||
*ierr = OMPI_INT_2_FINT(MPI_Errhandler_set(c_comm, c_errhandler));
|
||||
if (MPI_SUCCESS == *ierr) {
|
||||
if (MPI_SUCCESS == *ierr &&
|
||||
OMPI_ERRHANDLER_TYPE_PREDEFINED != c_errhandler->eh_mpi_object_type ) {
|
||||
c_errhandler->eh_fortran_function = true;
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mpi.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "mpi/f77/bindings.h"
|
||||
|
||||
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
|
||||
@ -53,4 +54,8 @@ void mpi_file_set_errhandler_f(MPI_Fint *fh, MPI_Fint *errhandler,
|
||||
MPI_Errhandler c_err = MPI_Errhandler_f2c(*errhandler);
|
||||
|
||||
*ierr = OMPI_INT_2_FINT(MPI_File_set_errhandler(c_fh, c_err));
|
||||
if ( MPI_SUCCESS == *ierr &&
|
||||
OMPI_ERRHANDLER_TYPE_PREDEFINED != c_err->eh_mpi_object_type ) {
|
||||
c_err->eh_fortran_function = true ;
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mpi.h"
|
||||
#include "errhandler/errhandler.h"
|
||||
#include "mpi/f77/bindings.h"
|
||||
|
||||
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
|
||||
@ -53,4 +54,8 @@ void mpi_win_set_errhandler_f(MPI_Fint *win, MPI_Fint *errhandler,
|
||||
MPI_Errhandler c_err = MPI_Errhandler_f2c(*errhandler);
|
||||
|
||||
*ierr = OMPI_INT_2_FINT(MPI_Win_set_errhandler(c_win, c_err));
|
||||
if ( MPI_SUCCESS == *ierr &&
|
||||
OMPI_ERRHANDLER_TYPE_PREDEFINED != c_err->eh_mpi_object_type ) {
|
||||
c_err->eh_fortran_function = true ;
|
||||
}
|
||||
}
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user