[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-2-g23c3ed3

[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  23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5 (commit)
      from  1beada6b2ef4f6b1db7bdd380d57e471fd4d03e4 (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/23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5

commit 23c3ed3a1ab18a95006889ddd33cf1441e4f8ce5
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Mon Nov 17 20:41:17 2014 -0600

    Fix a typo for MPI_TYPE_NULL
    
    It should be MPI_DATATYPE_NULL. MPI does not have MPI_TYPE_NULL.
    
    Signed-off-by: Huiwei Lu <huiweilu at mcs.anl.gov>

diff --git a/src/mpid/common/sched/mpid_sched.c b/src/mpid/common/sched/mpid_sched.c
index 2fab4d6..21082d1 100644
--- a/src/mpid/common/sched/mpid_sched.c
+++ b/src/mpid/common/sched/mpid_sched.c
@@ -19,7 +19,7 @@
 #endif
 
 /* helper macros to improve code readability */
-/* we pessimistically assume that MPI_TYPE_NULL may be passed as a "valid" type
+/* we pessimistically assume that MPI_DATATYPE_NULL may be passed as a "valid" type
  * for send/recv when MPI_PROC_NULL is the destination/src */
 #define dtype_add_ref_if_not_builtin(datatype_)                    \
     do {                                                           \
diff --git a/test/mpi/f08/ext/ctypesinf90.f90 b/test/mpi/f08/ext/ctypesinf90.f90
index 815d9b0..131761f 100644
--- a/test/mpi/f08/ext/ctypesinf90.f90
+++ b/test/mpi/f08/ext/ctypesinf90.f90
@@ -31,11 +31,11 @@
       errs = errs + f2ctype( MPI_LONG_INT, 14 )
       errs = errs + f2ctype( MPI_SHORT_INT, 15 )
       errs = errs + f2ctype( MPI_2INT, 16 )
-      if (MPI_LONG_DOUBLE .ne. MPI_TYPE_NULL) then
+      if (MPI_LONG_DOUBLE .ne. MPI_DATATYPE_NULL) then
           errs = errs + f2ctype( MPI_LONG_DOUBLE, 17 )
           errs = errs + f2ctype( MPI_LONG_DOUBLE_INT, 21 )
       endif
-      if (MPI_LONG_LONG .ne. MPI_TYPE_NULL) then
+      if (MPI_LONG_LONG .ne. MPI_DATATYPE_NULL) then
           errs = errs + f2ctype( MPI_LONG_LONG_INT, 18 )
           errs = errs + f2ctype( MPI_LONG_LONG, 19 )
           errs = errs + f2ctype( MPI_UNSIGNED_LONG_LONG, 20 )
diff --git a/test/mpi/f77/ext/ctypesinf.f b/test/mpi/f77/ext/ctypesinf.f
index f4d8ccb..5ee8d8c 100644
--- a/test/mpi/f77/ext/ctypesinf.f
+++ b/test/mpi/f77/ext/ctypesinf.f
@@ -31,11 +31,11 @@ C
       errs = errs + f2ctype( MPI_LONG_INT, 14 )
       errs = errs + f2ctype( MPI_SHORT_INT, 15 )
       errs = errs + f2ctype( MPI_2INT, 16 )
-      if (MPI_LONG_DOUBLE .ne. MPI_TYPE_NULL) then
+      if (MPI_LONG_DOUBLE .ne. MPI_DATATYPE_NULL) then
           errs = errs + f2ctype( MPI_LONG_DOUBLE, 17 )
           errs = errs + f2ctype( MPI_LONG_DOUBLE_INT, 21 )
       endif
-      if (MPI_LONG_LONG .ne. MPI_TYPE_NULL) then
+      if (MPI_LONG_LONG .ne. MPI_DATATYPE_NULL) then
           errs = errs + f2ctype( MPI_LONG_LONG_INT, 18 )
           errs = errs + f2ctype( MPI_LONG_LONG, 19 )
           errs = errs + f2ctype( MPI_UNSIGNED_LONG_LONG, 20 )

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

Summary of changes:
 src/mpid/common/sched/mpid_sched.c |    2 +-
 test/mpi/f08/ext/ctypesinf90.f90   |    4 ++--
 test/mpi/f77/ext/ctypesinf.f       |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
MPICH primary repository