Skip to content

Commit

Permalink
f08: do not BIND(C) to subroutines with LOGICAL parameters
Browse files Browse the repository at this point in the history 
Thanks Paul Romano for reporting this issue.
  • Loading branch information
@ggouaillardet
ggouaillardet committed Jan 26, 2016
1 parent 53185e7 commit 704f14f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions ompi/mpi/fortran/use-mpi-f08/attr-fn-f08-callback-interfaces.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2013 Los Alamos National Security, LLC. All rights
! reserved.
! Copyright (c) 2015 Research Organization for Information Science
! Copyright (c) 2015-2016 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! $COPYRIGHT$
!
Expand Down Expand Up @@ -45,7 +45,7 @@ interface

subroutine MPI_COMM_NULL_COPY_FN( comm, comm_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_comm_null_copy_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Comm) :: comm
Expand All @@ -57,7 +57,7 @@ interface

subroutine MPI_COMM_DUP_FN( comm, comm_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_comm_dup_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Comm) :: comm
Expand All @@ -68,7 +68,7 @@ interface
end subroutine MPI_COMM_DUP_FN

subroutine MPI_COMM_NULL_DELETE_FN(comm, comm_keyval, attribute_val_out, &
extra_state, ierr ) BIND(C,name="ompi_comm_null_delete_fn_f")
extra_state, ierr )
use mpi_f08_types
implicit none
type(MPI_Comm) :: comm
Expand All @@ -81,7 +81,7 @@ interface

subroutine MPI_TYPE_NULL_COPY_FN( type, type_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_type_null_copy_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Datatype) :: type
Expand All @@ -93,7 +93,7 @@ interface

subroutine MPI_TYPE_DUP_FN( type, type_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_type_dup_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Datatype) :: type
Expand All @@ -104,7 +104,7 @@ interface
end subroutine MPI_TYPE_DUP_FN

subroutine MPI_TYPE_NULL_DELETE_FN( type, type_keyval, attribute_val_out, &
extra_state, ierr ) BIND(C,name="ompi_type_null_delete_fn_f")
extra_state, ierr )
use mpi_f08_types
implicit none
type(MPI_Datatype) :: type
Expand All @@ -117,7 +117,7 @@ interface

subroutine MPI_WIN_NULL_COPY_FN( window, win_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_win_null_copy_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Win) :: window
Expand All @@ -129,7 +129,7 @@ interface

subroutine MPI_WIN_DUP_FN( window, win_keyval, extra_state, &
attribute_val_in, attribute_val_out, &
flag, ierr ) BIND(C,name="ompi_win_dup_fn_f")
flag, ierr )
use mpi_f08_types
implicit none
type(MPI_Win) :: window
Expand All @@ -140,7 +140,7 @@ interface
end subroutine MPI_WIN_DUP_FN

subroutine MPI_WIN_NULL_DELETE_FN( window, win_keyval, attribute_val_out, &
extra_state, ierr ) BIND(C,name="ompi_win_null_delete_fn_f")
extra_state, ierr )
use mpi_f08_types
implicit none
type(MPI_Win) :: window
Expand Down
14 changes: 7 additions & 7 deletions ompi/mpi/fortran/use-mpi-f08/mpi-f08-interfaces-callbacks.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
! Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved.
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
! All rights reserved.
! Copyright (c) 2015 Research Organization for Information Science
! Copyright (c) 2015-2016 Research Organization for Information Science
! and Technology (RIST). All rights reserved.
! $COPYRIGHT$

Expand Down Expand Up @@ -66,7 +66,7 @@ SUBROUTINE MPI_User_function(invec, inoutvec, len, datatype)

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Comm_copy_attr_function(oldcomm,comm_keyval,extra_state, &
attribute_val_in,attribute_val_out,flag,ierror) BIND(C)
attribute_val_in,attribute_val_out,flag,ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Comm) :: oldcomm
Expand All @@ -78,7 +78,7 @@ SUBROUTINE MPI_Comm_copy_attr_function(oldcomm,comm_keyval,extra_state, &

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Comm_delete_attr_function(comm,comm_keyval, &
attribute_val, extra_state, ierror) BIND(C)
attribute_val, extra_state, ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Comm) :: comm
Expand All @@ -89,7 +89,7 @@ SUBROUTINE MPI_Comm_delete_attr_function(comm,comm_keyval, &

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Win_copy_attr_function(oldwin,win_keyval,extra_state, &
attribute_val_in,attribute_val_out,flag,ierror) BIND(C)
attribute_val_in,attribute_val_out,flag,ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Win) :: oldwin
Expand All @@ -101,7 +101,7 @@ SUBROUTINE MPI_Win_copy_attr_function(oldwin,win_keyval,extra_state, &

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Win_delete_attr_function(win,win_keyval,attribute_val, &
extra_state,ierror) BIND(C)
extra_state,ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Win) :: win
Expand All @@ -112,7 +112,7 @@ SUBROUTINE MPI_Win_delete_attr_function(win,win_keyval,attribute_val, &

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Type_copy_attr_function(oldtype,type_keyval,extra_state, &
attribute_val_in,attribute_val_out,flag,ierror) BIND(C)
attribute_val_in,attribute_val_out,flag,ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Datatype) :: oldtype
Expand All @@ -124,7 +124,7 @@ SUBROUTINE MPI_Type_copy_attr_function(oldtype,type_keyval,extra_state, &

OMPI_ABSTRACT INTERFACE
SUBROUTINE MPI_Type_delete_attr_function(datatype,type_keyval, &
attribute_val,extra_state,ierror) BIND(C)
attribute_val,extra_state,ierror)
USE mpi_f08_types
IMPLICIT NONE
TYPE(MPI_Datatype) :: datatype
Expand Down

0 comments on commit 704f14f

Please sign in to comment.