[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a1-6-g333610f

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  333610f04ec4a6eda2f23779fd98f97e18408815 (commit)
      from  b293734ddfd76c34eea26794fda4acbb5cfee34a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/333610f04ec4a6eda2f23779fd98f97e18408815

commit 333610f04ec4a6eda2f23779fd98f97e18408815
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Tue Sep 9 15:30:27 2014 -0500

    Fix F77/90 binding errors in MPI_Pcontrol
    
    MPI_Pcontrol does not have the ierror argument.
    
    Fixes #2173
    
    Signed-off-by: William Gropp <wgropp at illinois.edu>

diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface
index c9c0577..3324821 100755
--- a/src/binding/fortran/mpif_h/buildiface
+++ b/src/binding/fortran/mpif_h/buildiface
@@ -4185,21 +4185,30 @@ sub build_specials {
     &ReplaceIfDifferent( $filename, $filename . ".new" );
     &AddPrototype( $out_prefix, "init_thread", $args );
 
+    # MPI_Pcontrol does not have the ierror argument.
     $OUTFD = "PCONTROLFFD";
     $filename = "pcontrolf.c";
     open( $OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n";
     $files[$#files+1] = $filename;
-    $args = "int";
-    &print_header( "mpi_", "MPI_Pcontrol", "pcontrol", $args );
+    $returnType = "void";
+    &set_weak_decl( "MPI_Pcontrol", "MPI_Fint *", "void" );
+    &set_weak_decl( "PMPI_Pcontrol", "MPI_Fint *", "void" );
+    &print_header( "mpi_", "MPI_Pcontrol", "pcontrol", "");
     &print_routine_type_decl( $OUTFD, $out_prefix, "pcontrol" );
-    &print_args( $OUTFD, $args, 0, "pcontrol" );
-    #&print_attr;
+    print $OUTFD "(MPI_Fint *v1)\n";
     print $OUTFD "{\n";
-    print $OUTFD "    *ierr = MPI_Pcontrol( (int)*v1 );\n";
+    print $OUTFD "    int ierr;\n";
+    print $OUTFD "    ierr = MPI_Pcontrol( (int)*v1 );\n";
     print $OUTFD "}\n";
     close ($OUTFD);
     &ReplaceIfDifferent( $filename, $filename . ".new" );
-    &AddPrototype( $out_prefix, "pcontrol", $args );
+    if ($build_prototypes) {
+        print PROTOFD "extern ";
+        &print_routine_type_decl( PROTOFD, $out_prefix, "pcontrol" );
+        print PROTOFD "( MPI_Fint * )";
+        &print_attr( PROTOFD, $out_prefix."pcontrol_" );
+        print PROTOFD ";\n";
+    }
 
     $OUTFD = "ADDRESSFFD";
     $filename = "addressf.c";

-----------------------------------------------------------------------

Summary of changes:
 src/binding/fortran/mpif_h/buildiface |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository