[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-45-g65945a4

[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  65945a437838d8716da01ea12a9c58e664ee8bf8 (commit)
      from  fd32dce74ddaa62ae537dc7a88e43a02a9db11a0 (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/65945a437838d8716da01ea12a9c58e664ee8bf8

commit 65945a437838d8716da01ea12a9c58e664ee8bf8
Author: Junchao Zhang <jczhang at mcs.anl.gov>
Date:   Tue May 26 09:24:39 2015 -0500

    Code cleanup to remove USE_POINTER_FOR_BOTTOM
    
    The configure test was dropped long time ago in MPICH, and to keep ABI compatible,
    we don't want to restore it.
    
    Refs #1877
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/binding/fortran/mpif_h/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h
index a28f84c..799c9f7 100644
--- a/src/binding/fortran/mpif_h/mpi_fortimpl.h
+++ b/src/binding/fortran/mpif_h/mpi_fortimpl.h
@@ -160,11 +160,6 @@ typedef MPI_Aint MPI_FAint;
 #include "mpi_fortlogical.h"
 
 
-/* If Cray-style pointers are supported, we don't need to check for a 
-   "special" address. */
-#ifdef USE_POINTER_FOR_BOTTOM
-#define MPIR_F_PTR(a) (a)
-#else
 /* MPIR_F_MPI_BOTTOM is the address of the Fortran MPI_BOTTOM value */
 extern FORT_DLL_SPEC int  MPIR_F_NeedInit;
 extern FORT_DLL_SPEC void *MPIR_F_MPI_BOTTOM;
@@ -200,8 +195,6 @@ extern FORT_DLL_SPEC void *MPI_F_ARGVS_NULL;
 /* Provide a prototype for the mpirinitf function */
 extern void mpirinitf_( void );
 
-#endif
-
 /*  
  * These are hooks for Fortran characters.
  * MPID_FCHAR_T is the type of a Fortran character argument
diff --git a/src/binding/fortran/mpif_h/setbot.c.in b/src/binding/fortran/mpif_h/setbot.c.in
index da4a91c..faf193c 100644
--- a/src/binding/fortran/mpif_h/setbot.c.in
+++ b/src/binding/fortran/mpif_h/setbot.c.in
@@ -51,7 +51,6 @@ const MPI_Fint MPIR_F_FALSE=F77_FALSE_VALUE;
     # MPI-2, section 4.12.5, on the declaration of MPI_F_STATUS_IGNORE
     # MPI_F_STATUSES_IGNORE as global variables in mpi.h (!)
 */
-#ifndef USE_POINTER_FOR_BOTTOM
 int  MPIR_F_NeedInit        = 1;
 void *MPIR_F_MPI_BOTTOM     = 0;
 void *MPIR_F_MPI_IN_PLACE   = 0;
@@ -65,7 +64,6 @@ void *MPI_F_STATUSES_IGNORE = 0;
 MPI_Fint  *MPI_F_ERRCODES_IGNORE = 0;
 void *MPI_F_ARGVS_NULL      = 0;
 void *MPIR_F_MPI_WEIGHTS_EMPTY = 0;
-#endif
 
 FORT_DLL_SPEC void FORT_CALL mpirinitc_( void *si, void *ssi,
                                          void *bt, void *ip, 

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

Summary of changes:
 src/binding/fortran/mpif_h/mpi_fortimpl.h |    7 -------
 src/binding/fortran/mpif_h/setbot.c.in    |    2 --
 2 files changed, 0 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
MPICH primary repository