[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-140-g02241e2

[mysql vizuser]

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  02241e287c99d238a5407c2e186b00cb1b71ca2f (commit)
      from  4f97779716a487b66b301e16c2cb9b75dccdff8e (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/02241e287c99d238a5407c2e186b00cb1b71ca2f

commit 02241e287c99d238a5407c2e186b00cb1b71ca2f
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Tue Jan 7 10:06:17 2014 -0600

    Use ROMIO pointer-casting routines
    
    the code in glue_romio replicates a bit of pointer-size assertion logic.
    it's only used by ROMIO, though.  if mpitypedefs.h is not included (see
    recent standalone-romio cleanups) we will get an undefined symbol at
    link time (MPI_AINT_CAST_TO_VOID_PTR).  Use equivalent
    ADIOI_AINT_CAST_TO_VOID_PTR instead for this ROMIO-related code.
    
    Signed-off-by: Jed Brown <jedbrown at mcs.anl.gov>

diff --git a/src/include/glue_romio.h.in b/src/include/glue_romio.h.in
index 4d60ed2..f074353 100644
--- a/src/include/glue_romio.h.in
+++ b/src/include/glue_romio.h.in
@@ -42,9 +42,10 @@ extern int MPIR_Ext_dbg_romio_terse_enabled;
 extern int MPIR_Ext_dbg_romio_typical_enabled;
 extern int MPIR_Ext_dbg_romio_verbose_enabled;
 
-/* a copy of MPID_Ensure_Aint_fits_in_pointer for external use */
+/* a copy of MPID_Ensure_Aint_fits_in_pointer for external use, slightly
+ * modified to use ROMIO's version of the pointer-casting macro */
 #define MPIR_Ext_ensure_Aint_fits_in_pointer(aint) \
-  MPIR_Ext_assert((aint) == (MPI_Aint)(MPIR_Upint) MPI_AINT_CAST_TO_VOID_PTR(aint));
+  MPIR_Ext_assert((aint) == (MPI_Aint)(MPIR_Upint) ADIOI_AINT_CAST_TO_VOID_PTR(aint));
 
 /* to be called early by ROMIO's initialization process in order to setup init-time
  * glue code that cannot be initialized statically */

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

Summary of changes:
 src/include/glue_romio.h.in |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository