fortran: PR feedback

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/bindings/bindings.py

@@ -33,20 +33,18 @@ def main():
     parser_fortran = subparsers.add_parser('fortran', help='subcommand for generating Fortran code')
     parser_fortran.add_argument('--generate-ts-suffix', action="store_true",
                                 help='generate ts suffixes for appropriate routines')
+    parser_fortran.add_argument('--fort-std', choices=('f90', 'f08'),
+                             help='fortran standard to use for fortran module and code generation')
     # Handler for generating actual code
     subparsers_fortran = parser_fortran.add_subparsers()
     parser_code = subparsers_fortran.add_parser('code', help='generate binding code')
     parser_code.set_defaults(handler=lambda args, out: fortran.generate_code(args, out))
-    parser_code.add_argument('--lang', choices=('fortran', 'c', 'f90'),
+    parser_code.add_argument('--lang', choices=('fortran', 'c'),
                              help='language to generate (only for code subparser)')
-    parser_code.add_argument('--fort-std', choices=('f90', 'f08'),
-                             help='fortran standard to use for fortran module generation')
     # Handler for generating the Fortran interface files
     parser_interface = subparsers_fortran.add_parser('interface',
                                                      help='generate Fortran interface specifications')
     parser_interface.set_defaults(handler=lambda args, out: fortran.generate_interface(args, out))
-    parser_interface.add_argument('--fort-std', choices=('f90', 'f08'),
-                             help='fortran standard to use for fortran module generation')
     # The prototype files argument must come last and be specified for both subparsers
     for f_subparser in [parser_code, parser_interface]:
         f_subparser.add_argument('--prototype-files', nargs='+', help='prototype files to generate code for')

ompi/mpi/fortran/mpif-h/request_get_status_some_f.c

@@ -116,7 +116,7 @@ void ompi_request_get_status_some_f(MPI_Fint *incount, MPI_Fint *array_of_reques
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
     if (MPI_SUCCESS == c_ierr) {
-        OMPI_SINGLE_INT_2_FINT(outcount);
+        OMPI_SINGLE_INT_2_FINT(*outcount);
         OMPI_ARRAY_INT_2_FINT(array_of_indices, *incount);
 
         /* Increment indexes by one for fortran conventions */

ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am

@@ -93,8 +93,8 @@ mpi-f08-interfaces-generated.h: $(template_files)
 	    --output $(abs_builddir)/$@ \
 	    fortran \
 	    $(gen_ts) \
-	    interface \
 	    --fort-std f08 \
+	    interface \
 	    --prototype-files $(template_files)
 
 # Delete generated file on maintainer-clean

ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am

@@ -148,8 +148,8 @@ mpi-ignore-tkr-interfaces-generated.h: $(template_files)
 	    --output $(abs_builddir)/$@ \
 	    fortran \
 	    $(gen_ts) \
-	    interface \
 	    --fort-std f90 \
+	    interface \
 	    --prototype-files $(template_files)
 
 #