1
1

Move common code to ompi/mpi/fortran/base.

The attribute and conversion callback subroutine interfaces
are used by all 3 modules, and belong in the fortran/base directory,
not the directory of a specific module.

Also clean up some comments.

cmr=v1.7.4:ticket=4162

This commit was SVN r30378.

The following Trac tickets were found above:
  Ticket 4162 --> https://svn.open-mpi.org/trac/ompi/ticket/4162
Этот коммит содержится в:
Jeff Squyres 2014-01-23 01:28:04 +00:00
родитель 19617394f0
Коммит aa0ceaa78b
5 изменённых файлов: 13 добавлений и 26 удалений

Просмотреть файл

@ -11,13 +11,6 @@
! $HEADER$
!
! Note about these declarations: these are "external" functions in
! mpif-common.h. However, if we don't declare them here, compilers will add
! them to the "mpi" module namespace, and result in linker errors if MPI
! F90 applications try to use them. Because the implementations of
! these functions are not in the MPI module namespace -- they're the F77
! functions.
interface
subroutine mpi_type_null_delete_fn( type, type_keyval, attribute_val_out, &

Просмотреть файл

@ -36,14 +36,12 @@ module mpi_f08
#include "mpi-f-interfaces-bind.h"
#include "pmpi-f-interfaces-bind.h"
! The MPI attribute callback functions need to be explictly called out
! so that they don't end up in the MPI namespace. See a longer
! explanation in attr_fn-f90-interfaces.h.
!
! include "ompi/mpi/fortran/use-mpi/attr_fn-f90-interfaces.h"
! The MPI attribute callback functions
! Similarly, we need the MPI_CONVERSION_FN_NULL function
!
! include "ompi/mpi/fortran/use-mpi/conversion_fn_null-f90-interface.h"
include "ompi/mpi/fortran/base/attr_fn-f90-interfaces.h"
! The MPI_CONVERSION_FN_NULL function
include "ompi/mpi/fortran/base/conversion_fn_null-f90-interface.h"
end module mpi_f08

Просмотреть файл

@ -31,15 +31,13 @@ module mpi
#endif
include "mpif-sentinels.h"
! The MPI attribute callback functions need to be explictly called out
! so that they don't end up in the MPI namespace. See a longer
! explanation in attr_fn-f90-interfaces.h.
! The MPI attribute callback functions
include "ompi/mpi/fortran/use-mpi-tkr/attr_fn-f90-interfaces.h"
include "ompi/mpi/fortran/base/attr_fn-f90-interfaces.h"
! Similarly, we need the MPI_CONVERSION_FN_NULL function
include "ompi/mpi/fortran/use-mpi-tkr/conversion_fn_null-f90-interface.h"
include "ompi/mpi/fortran/base/conversion_fn_null-f90-interface.h"
! The ignore-TKR version of the MPI interfaces

Просмотреть файл

@ -31,15 +31,13 @@ module mpi
#endif
include "mpif-sentinels.h"
! The MPI attribute callback functions need to be explictly called out
! so that they don't end up in the MPI namespace. See a longer
! explanation in attr_fn-f90-interfaces.h.
! The MPI attribute callback functions
include "attr_fn-f90-interfaces.h"
include "ompi/mpi/fortran/base/attr_fn-f90-interfaces.h"
! Similarly, we need the MPI_CONVERSION_FN_NULL function
! The MPI_CONVERSION_FN_NULL function
include "conversion_fn_null-f90-interface.h"
include "ompi/mpi/fortran/base/conversion_fn_null-f90-interface.h"
! This file is generated, and is *huge*. Its size is directly related
! to the --with-f90-max-array-dim configure parameter.