[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-10-g1dd0cc4

[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  1dd0cc4ba6db6a079e4285f1f3146bfd184c8b0e (commit)
      from  52316da7628b94ebf493492a6e4192f6bb4e7f04 (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/1dd0cc4ba6db6a079e4285f1f3146bfd184c8b0e

commit 1dd0cc4ba6db6a079e4285f1f3146bfd184c8b0e
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Fri Jun 5 15:12:52 2015 -0500

    Increase MAX_F90_TYPES to 64
    
    64 is big enough to include 32-bit, 64-bit, and possilbe 128-bit
    floating point or integer data types.
    
    Also, fixed a bug. We need to return an error when we need to add a new
    data type but nAlloc is already >= MAX_F90_TYPES
    
    Fixes #2265
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/binding/fortran/use_mpi/create_f90_util.c b/src/binding/fortran/use_mpi/create_f90_util.c
index 4050025..956a118 100644
--- a/src/binding/fortran/use_mpi/create_f90_util.c
+++ b/src/binding/fortran/use_mpi/create_f90_util.c
@@ -17,7 +17,7 @@
 
 /* This gives the maximum number of distinct types returned by any one of the
    MPI_Type_create_f90_xxx routines */
-#define MAX_F90_TYPES 16
+#define MAX_F90_TYPES 64
 typedef struct { int combiner; int r, p;
     MPI_Datatype d; } F90Predefined;
 static int nAlloc = 0;
@@ -57,7 +57,7 @@ int MPIR_Create_unnamed_predefined( MPI_Datatype old, int combiner,
     }
 
     /* Create a new type and remember it */
-    if (nAlloc > MAX_F90_TYPES) {
+    if (nAlloc >= MAX_F90_TYPES) {
 	return MPIR_Err_create_code( MPI_SUCCESS, MPIR_ERR_RECOVERABLE, 
 				     "MPIF_Create_unnamed_predefined", __LINE__,
 				     MPI_ERR_INTERN, "**f90typetoomany", 0 );

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

Summary of changes:
 src/binding/fortran/use_mpi/create_f90_util.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository