Skip to content

Commit f7d64df

Browse files
committed
osc/pt2pt: fix warnings
(cherry picked from commit open-mpi/ompi@f690fc8) Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 389828a commit f7d64df

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

ompi/mca/osc/pt2pt/osc_pt2pt_active_target.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,7 @@ int ompi_osc_pt2pt_complete (ompi_win_t *win)
339339
for (size_t i = 0 ; i < group_size ; ++i) {
340340
ompi_osc_pt2pt_header_complete_t complete_req;
341341
int rank = peers[i]->rank;
342-
ompi_proc_t *proc = ompi_comm_peer_lookup (module->comm, rank);
343-
342+
344343
if (my_rank == rank) {
345344
/* shortcut for self */
346345
osc_pt2pt_incoming_complete (module, rank, 0);
@@ -349,12 +348,14 @@ int ompi_osc_pt2pt_complete (ompi_win_t *win)
349348

350349
complete_req.base.type = OMPI_OSC_PT2PT_HDR_TYPE_COMPLETE;
351350
complete_req.base.flags = OMPI_OSC_PT2PT_HDR_FLAG_VALID;
352-
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT && OPAL_ENABLE_DEBUG
351+
complete_req.frag_count = module->epoch_outgoing_frag_count[rank];
352+
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
353+
#if OPAL_ENABLE_DEBUG
353354
complete_req.padding[0] = 0;
354355
complete_req.padding[1] = 0;
355356
#endif
356-
complete_req.frag_count = module->epoch_outgoing_frag_count[rank];
357-
osc_pt2pt_hton(&complete_req, proc);
357+
osc_pt2pt_hton(&complete_req, ompi_comm_peer_lookup (module->comm, rank));
358+
#endif
358359

359360
ompi_osc_pt2pt_peer_t *peer = ompi_osc_pt2pt_peer_lookup (module, rank);
360361

ompi/mca/osc/pt2pt/osc_pt2pt_sync.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ OBJ_CLASS_INSTANCE(ompi_osc_pt2pt_sync_t, opal_free_list_item_t,
3434
ompi_osc_pt2pt_sync_t *ompi_osc_pt2pt_sync_allocate (struct ompi_osc_pt2pt_module_t *module)
3535
{
3636
ompi_osc_pt2pt_sync_t *sync;
37-
#pragma unused (module)
37+
38+
/* module is not used yet */
39+
(void) module;
40+
3841
sync = OBJ_NEW (ompi_osc_pt2pt_sync_t);
3942
if (OPAL_UNLIKELY(NULL == sync)) {
4043
return NULL;

0 commit comments

Comments
 (0)