Commits

Ralph Castain committed e78730b Draft

Fixes #3520: Move --disable-mpi-io fix to v1.7

---svn-pre-commit-ignore-below---

r28097 [[BR]]
Fix --disable-mpi-io in the Fortran mpi-f08 interface.

Comments (0)

Files changed (2)

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

 ! -*- f90 -*-
 !
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2012      The University of Tennessee and The University
    INTEGER, VALUE, INTENT(IN) :: str_len
 end subroutine ompi_error_string_f
 
+#if OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine ompi_file_call_errhandler_f(fh,errorcode,ierror) &
    BIND(C, name="ompi_file_call_errhandler_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine ompi_file_set_errhandler_f
 
+#endif ! OMPI_PROFILE_MPI_FILE_INTERFACE
+
 subroutine ompi_finalize_f(ierror) &
    BIND(C, name="ompi_finalize_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine ompi_status_set_elements_f
 
+#if OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine ompi_file_close_f(fh,ierror) &
    BIND(C, name="ompi_file_close_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine ompi_file_write_shared_f
 
+#endif ! OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine ompi_register_datarep_f(datarep,read_conversion_fn, &
                                    write_conversion_fn,dtype_file_extent_fn, &
                                    extra_state,ierror,datarep_len) &

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

 ! -*- f90 -*-
 !
-! Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+! Copyright (c) 2009-2013 Cisco Systems, Inc.  All rights reserved.
 ! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
 !                         All rights reserved.
 ! Copyright (c) 2012      The University of Tennessee and The University
    INTEGER, VALUE, INTENT(IN) :: str_len
 end subroutine pompi_error_string_f
 
+#if OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine pompi_file_call_errhandler_f(fh,errorcode,ierror) &
    BIND(C, name="pompi_file_call_errhandler_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine pompi_file_set_errhandler_f
 
+#endif ! OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine pompi_finalize_f(ierror) &
    BIND(C, name="pompi_finalize_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine pompi_status_set_elements_f
 
+#if OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine pompi_file_close_f(fh,ierror) &
    BIND(C, name="pompi_file_close_f")
    implicit none
    INTEGER, INTENT(OUT) :: ierror
 end subroutine pompi_file_write_shared_f
 
+#endif ! OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 subroutine pompi_register_datarep_f(datarep,read_conversion_fn, &
                                    write_conversion_fn,dtype_file_extent_fn, &
                                    extra_state,ierror,datarep_len) &
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.