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 5fd8fc67f63a8c9a6134d069516f90e234339f67 (commit) via 4fc5c2057dabfe13cb345a61c6188ad7974ada36 (commit) from 2ce5a7e2786fd07ffb13dc4650fc231b7e9ef829 (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/5fd8fc67f63a8c9a6134d069516f90e234... commit 5fd8fc67f63a8c9a6134d069516f90e234339f67 Author: Michael Blocksome <[email protected]> Date: Wed Jan 8 16:22:08 2014 -0600 gcc 4.4.6 warning cleanup. Signed-off-by: Su Huang <[email protected]> diff --git a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c index 4c52993..5a23e40 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c +++ b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c @@ -150,9 +150,9 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr, MPIU_Free(req); } else { - req->buffer = origin_addr + req->origin.dt.true_lb; + req->buffer = (void *) ((uintptr_t) origin_addr + req->origin.dt.true_lb); req->user_buffer = result_addr + req->origin.dt.true_lb; - req->compare_buffer = compare_addr + req->origin.dt.true_lb; + req->compare_buffer = (void *) ((uintptr_t) compare_addr + req->origin.dt.true_lb); pami_result_t rc; pami_task_t task = MPID_VCR_GET_LPID(win->comm_ptr->vcr, target_rank); diff --git a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c index a99a19e..7c64145 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c +++ b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c @@ -342,7 +342,7 @@ int MPID_Fetch_and_op(const void *origin_addr, void *result_addr, req->op = op; req->pami_datatype = pami_type; /* MPI_Fetch_and_op only supports predefined datatype */ - req->buffer = origin_addr + req->origin.dt.true_lb; + req->buffer = (void *) ((uintptr_t) origin_addr + req->origin.dt.true_lb); req->user_buffer = result_addr + req->origin.dt.true_lb; pami_result_t rc; diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index 129d5c8..a9350c2 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -163,7 +163,7 @@ MPID_Rget(void *origin_addr, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int -MPID_Raccumulate(const void *origin_addr, +MPID_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index 8604bb5..85804b1 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -207,7 +207,7 @@ typedef struct /** \todo make sure that the extra fields are removed */ -typedef struct _mpidi_win_request +typedef struct MPIDI_Win_request { MPID_Win *win; MPIDI_Win_requesttype_t type; @@ -255,7 +255,7 @@ typedef struct _mpidi_win_request void *compare_buffer; /* anchor of compare buffer for compare and swap */ uint32_t buffer_free; void *buffer; - struct _mpidi_win_request *next; + struct MPIDI_Win_request *next; MPI_Op op; int result_num_contig; http://git.mpich.org/mpich.git/commitdiff/4fc5c2057dabfe13cb345a61c6188ad797... commit 4fc5c2057dabfe13cb345a61c6188ad7974ada36 Author: Michael Blocksome <[email protected]> Date: Wed Jan 8 16:26:42 2014 -0600 fix missing const for MPID_Accumulate and MPID_Put functions. Signed-off-by: Su Huang <[email protected]> Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/include/mpiimpl.h b/src/include/mpiimpl.h index 5f1bfc8..bfbd450 100644 --- a/src/include/mpiimpl.h +++ b/src/include/mpiimpl.h @@ -3338,11 +3338,11 @@ int MPID_Win_create(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); int MPID_Win_free(MPID_Win **); -int MPID_Put(void *, int, MPI_Datatype, int, MPI_Aint, int, +int MPID_Put(const void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPID_Win *); int MPID_Get(void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPID_Win *); -int MPID_Accumulate(void *, int, MPI_Datatype, int, MPI_Aint, int, +int MPID_Accumulate(const void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Op, MPID_Win *); int MPID_Win_fence(int, MPID_Win *); diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index 2d04091..e328d30 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -159,7 +159,7 @@ MPIDI_Accumulate(pami_context_t context, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int -MPID_Accumulate(void *origin_addr, +MPID_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, @@ -265,7 +265,7 @@ MPID_Accumulate(void *origin_addr, if (req->origin.dt.contig) { req->buffer_free = 0; - req->buffer = origin_addr + req->origin.dt.true_lb; + req->buffer = (void *) ((uintptr_t) origin_addr + req->origin.dt.true_lb); } else { diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index 110f294..b98a99d 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -216,7 +216,7 @@ MPIDI_Put_use_pami_put(pami_context_t context, MPIDI_Win_request * req,int *fr #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int -MPID_Put(void *origin_addr, +MPID_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, @@ -303,7 +303,7 @@ MPID_Put(void *origin_addr, if (req->origin.dt.contig) { req->buffer_free = 0; - req->buffer = origin_addr + req->origin.dt.true_lb; + req->buffer = (void *) ((uintptr_t) origin_addr + req->origin.dt.true_lb); } else { ----------------------------------------------------------------------- Summary of changes: src/include/mpiimpl.h | 4 ++-- src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 4 ++-- .../pamid/src/onesided/mpid_win_compare_and_swap.c | 4 ++-- .../pamid/src/onesided/mpid_win_fetch_and_op.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_put.c | 4 ++-- src/mpid/pamid/src/onesided/mpid_win_reqops.c | 2 +- src/mpid/pamid/src/onesided/mpidi_onesided.h | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- MPICH primary repository