Skip to content

Commit fc69c0b

Browse files
committed
mpi_f08: fix MPI_BUFFER_DETACH binding
1 parent 91d3b5f commit fc69c0b

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

ompi/mpi/fortran/use-mpi-f08/buffer_detach_f08.F90

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! $COPYRIGHT$
@@ -9,8 +9,9 @@
99

1010
subroutine MPI_Buffer_detach_f08(buffer_addr,size,ierror)
1111
use :: mpi_f08, only : ompi_buffer_detach_f
12+
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
1213
implicit none
13-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer_addr
14+
TYPE(C_PTR), INTENT(OUT) :: buffer_addr
1415
INTEGER, INTENT(OUT) :: size
1516
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
1617
integer :: c_ierror

ompi/mpi/fortran/use-mpi-f08/mpi-f-interfaces-bind.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,9 @@ end subroutine ompi_buffer_attach_f
191191

192192
subroutine ompi_buffer_detach_f(buffer_addr,size,ierror) &
193193
BIND(C, name="ompi_buffer_detach_f")
194+
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
194195
implicit none
195-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer_addr
196+
TYPE(C_PTR), INTENT(OUT) :: buffer_addr
196197
INTEGER, INTENT(OUT) :: size
197198
INTEGER, INTENT(OUT) :: ierror
198199
end subroutine ompi_buffer_detach_f

ompi/mpi/fortran/use-mpi-f08/mpi-f08-interfaces.F90

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2015 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! Copyright (c) 2012 The University of Tennessee and The University
@@ -71,13 +71,9 @@ end subroutine MPI_Buffer_attach_f08
7171

7272
interface MPI_Buffer_detach
7373
subroutine MPI_Buffer_detach_f08(buffer_addr,size,ierror)
74+
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
7475
implicit none
75-
!DEC$ ATTRIBUTES NO_ARG_CHECK :: buffer_addr
76-
!GCC$ ATTRIBUTES NO_ARG_CHECK :: buffer_addr
77-
!$PRAGMA IGNORE_TKR buffer_addr
78-
!DIR$ IGNORE_TKR buffer_addr
79-
!IBM* IGNORE_TKR buffer_addr
80-
OMPI_FORTRAN_IGNORE_TKR_TYPE :: buffer_addr
76+
TYPE(C_PTR), INTENT(OUT) :: buffer_addr
8177
INTEGER, INTENT(OUT) :: size
8278
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
8379
end subroutine MPI_Buffer_detach_f08

ompi/mpi/fortran/use-mpi-f08/profile/pbuffer_detach_f08.F90

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
! -*- f90 -*-
22
!
3-
! Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
3+
! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
44
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
55
! All rights reserved.
66
! $COPYRIGHT$
77

88
#include "ompi/mpi/fortran/configure-fortran-output.h"
99

1010
subroutine PMPI_Buffer_detach_f08(buffer_addr,size,ierror)
11+
USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR
1112
use :: mpi_f08, only : ompi_buffer_detach_f
1213
implicit none
13-
OMPI_FORTRAN_IGNORE_TKR_TYPE, INTENT(IN) :: buffer_addr
14+
TYPE(C_PTR), INTENT(OUT) :: buffer_addr
1415
INTEGER, INTENT(OUT) :: size
1516
INTEGER, OPTIONAL, INTENT(OUT) :: ierror
1617
integer :: c_ierror

0 commit comments

Comments
 (0)