[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-374-gb7e3457

[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  b7e3457f0fa560152ea19afefa5f419e422fcda6 (commit)
      from  26fbb71011da8e90b25ebdcb66d78abec8dcb7af (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/b7e3457f0fa560152ea19afefa5f419e422fcda6

commit b7e3457f0fa560152ea19afefa5f419e422fcda6
Author: Edric Ellis <Edric.Ellis at mathworks.co.uk>
Date:   Mon Aug 1 10:17:30 2016 -0500

    mpi/comm: Fix compilation issue
    
    Make sure MPIR objects do not end up in libmpi when building separate
    MPI/PMPI libraries.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpi/comm/comm_agree.c b/src/mpi/comm/comm_agree.c
index 3c19c94..0475f5f 100644
--- a/src/mpi/comm/comm_agree.c
+++ b/src/mpi/comm/comm_agree.c
@@ -25,7 +25,6 @@ int MPIX_Comm_agree(MPI_Comm comm, int *flag) __attribute__((weak,alias("PMPIX_C
 #ifndef MPICH_MPI_FROM_PMPI
 #undef MPIX_Comm_agree
 #define MPIX_Comm_agree PMPIX_Comm_agree
-#endif
 
 #undef FUNCNAME
 #define FUNCNAME MPIR_Comm_agree
@@ -106,6 +105,8 @@ int MPIR_Comm_agree(MPIR_Comm *comm_ptr, int *flag)
     goto fn_exit;
 }
 
+#endif /* !defined(MPICH_MPI_FROM_PMPI) */
+
 #undef FUNCNAME
 #define FUNCNAME MPIX_Comm_agree
 #undef FCNAME
diff --git a/src/mpi/comm/comm_shrink.c b/src/mpi/comm/comm_shrink.c
index 61cce4a..d5d55ca 100644
--- a/src/mpi/comm/comm_shrink.c
+++ b/src/mpi/comm/comm_shrink.c
@@ -39,7 +39,6 @@ int MPIX_Comm_shrink(MPI_Comm comm, MPI_Comm *newcomm) __attribute__((weak,alias
 #ifndef MPICH_MPI_FROM_PMPI
 #undef MPIX_Comm_shrink
 #define MPIX_Comm_shrink PMPIX_Comm_shrink
-#endif
 
 #undef FUNCNAME
 #define FUNCNAME MPIR_Comm_shrink
@@ -109,6 +108,8 @@ int MPIR_Comm_shrink(MPIR_Comm *comm_ptr, MPIR_Comm **newcomm_ptr)
     goto fn_exit;
 }
 
+#endif /* !defined(MPICH_MPI_FROM_PMPI) */
+
 #undef FUNCNAME
 #define FUNCNAME MPIX_Comm_shrink
 #undef FCNAME

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

Summary of changes:
 src/mpi/comm/comm_agree.c  |    3 ++-
 src/mpi/comm/comm_shrink.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository