[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-43-g3333743

[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  33337436f8f435e34acf4bd7897ec873f2dbd64e (commit)
      from  0d61a1032115c1a380d967c46d9e39c1bfcda2e1 (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/33337436f8f435e34acf4bd7897ec873f2dbd64e

commit 33337436f8f435e34acf4bd7897ec873f2dbd64e
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date:   Mon Mar 10 09:45:49 2014 -0500

    Fixes inconsistent definition of parameters
    
    In MPID_Win_allocate and MPID_Win_allocate_shared, baseptr are defined
    as void * and void ** separately, while in MPIDI_Win_fns, both
    MPID_Win_allocate and MPID_Win_allocate_shared are registered as
    MPIDI_CH3U_Win_allocate, where baseptr is defined as void *.
    
    Fixes #1995
    
    Signed-off-by: Junchao Zhang <jczhang at mcs.anl.gov>

diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h
index a4745aa..ccbe9a7 100644
--- a/src/include/mpiimpl.h
+++ b/src/include/mpiimpl.h
@@ -3360,7 +3360,7 @@ int MPID_Win_unlock(int dest, MPID_Win *win_ptr);
 int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info,
                       MPID_Comm *comm, void *baseptr, MPID_Win **win);
 int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPID_Comm *comm_ptr,
-                             void **base_ptr, MPID_Win **win_ptr);
+                             void *base_ptr, MPID_Win **win_ptr);
 int MPID_Win_shared_query(MPID_Win *win, int rank, MPI_Aint *size, int *disp_unit,
                           void *baseptr);
 int MPID_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win);
diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c
index 69d20aa..8183a71 100644
--- a/src/mpid/ch3/src/mpid_rma.c
+++ b/src/mpid/ch3/src/mpid_rma.c
@@ -205,7 +205,7 @@ int MPID_Free_mem( void *ptr )
 #undef FCNAME
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
 int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr,
-                             void **base_ptr, MPID_Win **win_ptr)
+                             void *base_ptr, MPID_Win **win_ptr)
 {
     int mpi_errno=MPI_SUCCESS;
 
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
index d0f687b..d7dbc27 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -374,7 +374,7 @@ MPID_Win_allocate_shared(MPI_Aint     size,
                          int          disp_unit,
                          MPID_Info  * info,
                          MPID_Comm  * comm_ptr,
-                         void **base_ptr,
+                         void *base_ptr,
                          MPID_Win  ** win_ptr)
 {
   int mpi_errno  = MPI_SUCCESS;

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

Summary of changes:
 src/include/mpiimpl.h                              |    2 +-
 src/mpid/ch3/src/mpid_rma.c                        |    2 +-
 .../pamid/src/onesided/mpid_win_allocate_shared.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository